Commit Graph

2833 Commits

Author SHA1 Message Date
Raphaël MARQUES
8ce2b309d8 Complying with request for changes 2017-07-04 09:15:43 +02:00
Kyle Shockey
60701962b8 Nullify Schemes selector in OAS3 2017-07-03 19:03:53 -07:00
Kyle Shockey
1970b2c410 Disable Online Validation badge for OAS3 2017-07-03 19:02:03 -07:00
Owen Conti
03961ad189 Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/3309-required-file-inputs 2017-07-03 18:57:41 -06:00
shockey
54f0c067b8 Merge branch 'master' into feature/apisSorter 2017-07-03 17:39:03 -07:00
shockey
69420d8559 Merge pull request #3324 from kogalex/orderTagsProperly
fixing tag order to be in the same order as definition file
2017-07-03 17:36:47 -07:00
Owen Conti
718658e837 Fix for non-required inputs 2017-07-03 18:12:39 -06:00
Owen Conti
dd1b87e3d7 Fixes #3309 - Add same styles as regular input elements to file inputs. Add test for validating file type. 2017-07-03 18:04:49 -06:00
Kyle Shockey
4bfb392e49 Undo changed defaults 2017-07-03 16:41:10 -07:00
Owen Conti
6fd5839103 Fix PropTypes in model-collapse component 2017-07-03 16:27:47 -06:00
Owen Conti
15e105c931 Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/3102-unguarded-expressions
# Conflicts:
#	src/core/components/model.jsx
#	src/core/components/models.jsx
2017-07-03 16:12:31 -06:00
Kyle Shockey
109027935f Hide main Responses ContentType picker for OAS3 2017-07-02 23:16:26 -07:00
Kyle Shockey
1e40a20e07 Add switching logic for each Response Code to have its own content types 2017-07-02 23:02:44 -07:00
Alexander Kogan
0b4cef3ca8 fixing tag order to be in the same order as definition file 2017-07-02 19:59:20 +03:00
RVKen
a3249f0d6f Merge branch 'master' into issue-1334
* master: (50 commits)
  update NoErrorsPlugin to NoEmitOnErrorsPlugin
  Undo change to `swagger-client` dependency
  trigger setScheme when a new set of schemes come in
  fix eslint issues
  pin yams version
  update dist
  revert dependencies
  minify bundle css
  migrate webpack to v2.6.1
  #3110 - Fix models down arrow icon in firefox
  Fixes #3299 - export validateNumber and validateInteger for easy reuse and testing. Broke validateParam required check onto multiple lines. Added tests for validateNumber, validateInteger, and validateParam
  Improve README with more information about `urls`
  Rename variable: "selectedName" -> "primaryName"
  "name" -> "urls.primaryName"
  Update selectedIndex when a new URL is loaded
  Use select value to avoid react warning
  Properly added name config Now access it through getConfigs Documented it in README
  Add displayRequestDuration configuration option.
  Fix for #2947 - Display property names for non-object models
  #3256 - Remove unnecessary JSON.stringify call on example values that are already strings
  ...

# Conflicts:
#	dist/swagger-ui-bundle.js
#	dist/swagger-ui-bundle.js.map
#	dist/swagger-ui-standalone-preset.js
#	dist/swagger-ui-standalone-preset.js.map
#	dist/swagger-ui.css
#	dist/swagger-ui.css.map
#	dist/swagger-ui.js
#	dist/swagger-ui.js.map
#	make-webpack-config.js
#	package.json
#	webpack-dist.config.js
#	webpack-hot-dev-server.config.js
2017-06-30 23:24:43 +02:00
RVKen
8324486b27 write mechanism to provide local spec JSON to SwaggerUIBundle 2017-06-30 23:11:34 +02:00
Raphaël MARQUES
cb9ca7d4bf Merge branch 'master' into feature/apisSorter 2017-06-30 09:01:28 +02:00
Kyle Shockey
50c0d39418 MOAR alignment 2017-06-29 23:26:33 -07:00
Kyle Shockey
61de35d69c Render request bodies correctly (minus Example Value + editable functionality) 2017-06-29 23:16:54 -07:00
shockey
b2b9e84e11 Merge pull request #3312 from RVKen/webpack-migration-2.x
migrate webpack to v2.6.1
2017-06-29 19:26:24 -07:00
RVKen
8a86ed4e6f update NoErrorsPlugin to NoEmitOnErrorsPlugin 2017-06-30 04:01:31 +02:00
shockey
b72aa3a7c8 Merge branch 'master' into webpack-migration-2.x 2017-06-29 18:23:36 -07:00
shockey
34a5dc721e Undo change to swagger-client dependency 2017-06-29 18:21:31 -07:00
shockey
20ab734edf Merge pull request #3294 from owenconti/bug/3072-error-response-fixes
#3072 - Body and headers on error responses
2017-06-29 17:27:45 -07:00
shockey
afaa5619bb Merge branch 'master' into bug/3072-error-response-fixes 2017-06-29 17:20:09 -07:00
shockey
2f07a61e0c Merge pull request #3292 from owenconti/ft/3135-request-duration
#3135 - Add request duration to response details
2017-06-29 17:18:05 -07:00
shockey
a69ed71f47 Merge branch 'master' into ft/3135-request-duration 2017-06-29 17:10:46 -07:00
shockey
55d94d40e3 Merge pull request #3298 from owenconti/bug/2947-model-display-for-non-objects
#2947 - Display property names for non-object models
2017-06-29 15:53:49 -07:00
shockey
07568aba3e Merge branch 'master' into bug/2947-model-display-for-non-objects 2017-06-29 15:49:40 -07:00
shockey
2fe3bfdf09 Merge pull request #3306 from owenconti/bug/3299-integer-parameter-validation
Fixes #3299 - default required integer validation
2017-06-29 15:49:32 -07:00
shockey
65ef596db1 Merge branch 'master' into bug/3299-integer-parameter-validation 2017-06-29 15:45:04 -07:00
shockey
4d52c30b53 Merge pull request #3295 from owenconti/bug/3136-operation-scheme-update
Bug fix for #3136 - Update state when scheme options change
2017-06-29 15:43:38 -07:00
shockey
5da71296e9 Merge branch 'master' into bug/3299-integer-parameter-validation 2017-06-29 15:43:31 -07:00
shockey
0a67efd964 Merge branch 'master' into bug/3136-operation-scheme-update 2017-06-29 15:39:11 -07:00
shockey
57373e4fbb Merge pull request #3317 from shockey/bug/3166-incorrect-schemes
Trigger setScheme when a new set of schemes come in
2017-06-29 13:36:25 -07:00
Kyle Shockey
3484b83d1f trigger setScheme when a new set of schemes come in 2017-06-29 13:22:58 -07:00
Owen Conti
d27cae0085 Work on #3102. Moved all the components out of model.jsx into their own files so they can be grabbed via getComponent() 2017-06-28 22:07:07 -06:00
RVKen
86482f8458 Merge branch 'master' into webpack-migration-2.x
* master:
  #3110 - Fix models down arrow icon in firefox
2017-06-29 04:40:28 +02:00
RVKen
d36f0a6dbd fix eslint issues 2017-06-29 04:37:19 +02:00
Kyle Shockey
2b37e7c2e4 Render markdown more normally 2017-06-28 19:28:30 -07:00
Owen Conti
beb7999cb8 Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/2947-model-display-for-non-objects 2017-06-28 18:06:32 -06:00
Raphaël MARQUES
e5aa285547 Merge branch 'master' into feature/apisSorter 2017-06-28 23:45:47 +02:00
shockey
a26250f50a Merge pull request #3307 from owenconti/bug/3110-firefox-models-svg-icon
#3110 - Fix Models down arrow icon in firefox
2017-06-28 14:20:10 -07:00
RVKen
cdea835bf6 pin yams version 2017-06-28 20:45:49 +02:00
RVKen
683d6bf751 update dist 2017-06-28 20:11:58 +02:00
RVKen
10dc2460be revert dependencies 2017-06-28 20:07:49 +02:00
RVKen
ef65d78d92 minify bundle css 2017-06-28 19:47:32 +02:00
RVKen
4b85dc55d3 Merge branch 'master' into webpack-migration-2.x
# Conflicts:
#	dist/swagger-ui-bundle.js
#	dist/swagger-ui-bundle.js.map
#	dist/swagger-ui-standalone-preset.js
#	dist/swagger-ui-standalone-preset.js.map
#	dist/swagger-ui.js
#	dist/swagger-ui.js.map
#	package.json
#	webpack-dist.config.js
#	webpack-hot-dev-server.config.js
2017-06-28 18:40:52 +02:00
RVKen
e81eee00aa migrate webpack to v2.6.1 2017-06-28 18:13:41 +02:00
Raphaël MARQUES
ca9161a159 Merge branch 'master' into feature/apisSorter 2017-06-28 09:53:06 +02:00