Commit Graph

2368 Commits

Author SHA1 Message Date
Tony Tam
99c03cf3bb Merge pull request #3179 from franzwong/master
Copy swagger.json to nginx directory
2017-06-09 11:47:20 -07:00
Tony Tam
071307c61e Merge branch 'master' into master 2017-06-09 11:40:50 -07:00
Tony Tam
08c691894d extract basename from $SWAGGER_JSON file 2017-06-09 11:40:33 -07:00
Tony Tam
f6e921f101 Merge pull request #3053 from Yasami/docker-run.sh-eol-lf
Force line endings of docker-run.sh to Unix-style
2017-06-08 13:22:36 -07:00
Tony Tam
6defee4402 Merge branch 'master' into docker-run.sh-eol-lf 2017-06-08 13:16:29 -07:00
Ron
d980982942 Merge pull request #3210 from dylancwood/chore-swagger-ui-dist-docs
Documentation: clarify the two different npm packages available
2017-06-08 13:04:25 -07:00
Ron
30686d6975 Merge branch 'master' into chore-swagger-ui-dist-docs 2017-06-08 13:01:29 -07:00
Ron
07076d6064 Merge pull request #3125 from micmro/update-alpine
update Docker base-image to alpine 3.5
2017-06-08 12:57:05 -07:00
Tony Tam
5e6103f0cb Merge branch 'master' into update-alpine 2017-06-08 12:53:50 -07:00
Ron
5a1f824c21 Merge branch 'master' into docker-run.sh-eol-lf 2017-06-08 12:49:43 -07:00
Ron
284f187253 Merge branch 'master' into chore-swagger-ui-dist-docs 2017-06-08 12:24:01 -07:00
Dylan
531e5d1d73 clarify the two different npm packages available for this repo 2017-06-08 12:03:38 -07:00
Anna
60a9dc490f Merge pull request #3207 from bodnia/fix-3191
fixes #3191
2017-06-08 15:46:16 +03:00
Anna Bodnia
ee2e82390b fixes #3191 2017-06-08 15:41:06 +03:00
Anna
1dedd44324 Merge pull request #3206 from bodnia/fixes-3172
#3172 added Access-Control-Allow-Origin for auth requests
2017-06-08 14:14:06 +03:00
Anna Bodnia
bbf93c5e1f #3172 added Access-Control-Allow-Origin for auth requests 2017-06-08 14:06:30 +03:00
Anna
e2b2055b4b Merge pull request #3204 from bodnia/fix-3172
fixes #3172
2017-06-08 12:32:44 +03:00
Anna Bodnia
36b263e230 fixes #3172 2017-06-08 12:19:47 +03:00
shockey
e7975e7f3d Merge pull request #3200 from shockey/bug/3199-sanitization-escaping
Markdown quote double-escaping
2017-06-07 13:00:42 -07:00
Kyle Shockey
a9d4f5efde Add filter to un-double-escape quotation marks 2017-06-07 12:52:59 -07:00
Kyle Shockey
3189e6101b Fix eslint quotes rule 2017-06-07 12:52:50 -07:00
Kyle Shockey
8919661438 Add failing test 2017-06-07 12:52:35 -07:00
Ron
e8d84c02e6 Merge pull request #3195 from gwynjudd/model-expansion
Add support for docExpansion flag to models
2017-06-06 22:51:49 -07:00
shockey
4f7e75f443 Add propTypes validation for getConfig 2017-06-06 22:39:46 -07:00
Gwyn Judd
2d0c660d9f Add support for docExpansion flag to models
Show a more compressed view if docExpansion is set to "none"
2017-06-07 12:26:48 +12:00
shockey
4038b11d69 Merge pull request #3193 from shockey/operation-id-tweaks
CSS fixes for operationId display
2017-06-06 12:13:14 -07:00
Kyle Shockey
97ab51c354 CSS fixes for operationId display 2017-06-06 12:07:37 -07:00
shockey
0fdaeff5e8 Merge pull request #3152 from slate-studio/master
Add operationId to be shown for each operation
2017-06-06 11:36:48 -07:00
Artem
36aa568f0e Update README 2017-06-06 21:30:13 +03:00
shockey
c05b66f4d4 Remove displayOperationId as prop to Operations
This appears to be a mistake. Operations should get `displayOperationId` from `getConfigs`, not from a prop.
2017-06-06 11:28:27 -07:00
shockey
68974a95b2 Use destructuring synyax to get displayOperationId 2017-06-06 11:18:42 -07:00
shockey
c03210e7d4 Merge branch 'master' into master 2017-06-06 10:48:19 -07:00
Ron
e5a9571a72 Merge pull request #3190 from swagger-api/fix-readme
Update README.md
2017-06-06 09:14:56 -07:00
Ron
58acaf681d Update README.md 2017-06-06 09:06:12 -07:00
Artem
78af4e7f9f Merge branch 'operationId'
# Conflicts:
#	src/core/components/operation.jsx
2017-06-06 17:23:04 +03:00
Artem
e3f872ad63 Display operationId 2017-06-06 17:21:20 +03:00
Franz Wong
58797025c6 Merge branch 'master' into master 2017-06-06 19:45:35 +09:00
shockey
12dd90f748 Merge pull request #3159 from gwynjudd/doc-expansion
Added support for docExpansion config
2017-06-05 20:17:57 -07:00
Kyle Shockey
09148e478c Remove switching logic from spec specSelector 2017-06-05 20:04:52 -07:00
Kyle Shockey
a857e947de Add default value to config constructor 2017-06-05 20:04:35 -07:00
shockey
438546f923 Merge branch 'master' into doc-expansion 2017-06-05 16:12:14 -07:00
Ron
ea66055329 Merge pull request #3181 from scottohara/rename-pulse-animation
Use less generic pulse animation name (Fixes #3169)
2017-06-05 09:31:20 -07:00
Ron
2257836114 Merge branch 'master' into rename-pulse-animation 2017-06-05 09:28:33 -07:00
shockey
563a5643e7 Merge pull request #3182 from scottohara/remove-legacy-clear-class
Remove unused legacy clear class (Fixes #3167)
2017-06-05 09:00:29 -07:00
Scott O'Hara
af2c890e51 Use less generic pulse animation name (Fixes #3169) 2017-06-05 08:38:39 +10:00
Scott O'Hara
eed62339b2 Remove unused legacy clear class (Fixes #3167) 2017-06-05 08:36:49 +10:00
shockey
eec04f4ce2 Merge pull request #3180 from shockey/v/3.0.13
v/3.0.13
2017-06-03 00:41:15 -07:00
Kyle Shockey
58422825c9 Rebuild dist 2017-06-03 00:18:15 -07:00
Kyle Shockey
5952bb6cbf Bump fast-json-patch in lockfile 2017-06-03 00:16:44 -07:00
Kyle Shockey
b4cb0ce247 Rebuild dist 2017-06-03 00:11:32 -07:00