Commit Graph

2637 Commits

Author SHA1 Message Date
shockey
d9b0bb7758 Merge branch 'master' into moved-filter 2017-07-13 21:52:56 -07:00
Minasokoni
d7c28912e0 updated input styling 2017-07-13 21:50:19 -07:00
Minasokoni
8b5c2cc409 moved filter search to layout 2017-07-13 21:48:20 -07:00
shockey
0eeb52b4b5 Merge pull request #3303 from Adrael/feature/apisSorter
Adding apisSorter options
2017-07-13 21:22:09 -07:00
shockey
28912dded3 Update index.js 2017-07-13 21:14:56 -07:00
shockey
e2b73ebf2a Update README.md 2017-07-13 21:10:48 -07:00
shockey
d8ba716da8 Merge branch 'master' into feature/apisSorter 2017-07-13 21:08:47 -07:00
Kyle Shockey
e6c8eb3c61 Pass tag names to tagsSorter instead of taggedOperations values 2017-07-13 21:02:37 -07:00
Kyle Shockey
1cdc4691f7 Add MDN link to Array.prototype.sort() documentation 2017-07-13 20:38:56 -07:00
Kyle Shockey
571d65a582 apisSorter -> tagsSorter
"tags", not "tag", because it sorts the tags themselves, not the content of each tag.
2017-07-13 20:36:08 -07:00
shockey
be7b2448b2 Merge pull request #3356 from owenconti/feature/3300-updated-version-info
Fixes #3300 - Updates to versions.swaggerUi information
2017-07-13 13:51:14 -07:00
shockey
ff9e164d11 Merge branch 'master' into feature/3300-updated-version-info 2017-07-13 13:34:07 -07:00
shockey
0ee9f956eb Merge pull request #3377 from owenconti/bug/3375-content-type-fix
Fixes #3375 - Change order of logic for selecting requestContentType
2017-07-13 13:17:39 -07:00
Owen Conti
991ae66b39 Fixes #3375 - Change order of logic for selecting requestContentType to prioritize consumes_value first 2017-07-12 19:56:11 -06:00
shockey
a5cab61d99 Merge pull request #3196 from gwynjudd/filter
Added maxRows and filter support
2017-07-11 22:14:38 -07:00
Kyle Shockey
66c8778a29 Remove obsolete prop from validation 2017-07-11 22:05:38 -07:00
Kyle Shockey
28f7a15fe9 Use state instead of component hand-down for managing filter 2017-07-11 21:54:56 -07:00
Kyle Shockey
cf12091d93 Add filter to layout state 2017-07-11 21:33:14 -07:00
shockey
7cfc7cb4fc Merge branch 'master' into filter 2017-07-11 21:20:22 -07:00
Owen Conti
bd31d3dedf Reimplemented changes after merge with master 2017-07-11 17:02:53 -06:00
Owen Conti
fce8b7275b Merge branch 'master' of github.com:swagger-api/swagger-ui into feature/2926-click-model-name-to-toggle
# Conflicts:
#	src/core/components/model.jsx
2017-07-11 16:58:17 -06:00
Raphaël MARQUES
d27962c0da Merge branch 'master' into feature/apisSorter 2017-07-11 21:13:45 +02:00
Raphaël MARQUES
297ee61038 Update index.js 2017-07-11 21:13:30 +02:00
Owen Conti
6beaaca6e6 Fixes #3361 - Check for null and undefined values in validateParam 2017-07-10 19:46:32 -06:00
shockey
4a66219782 Merge pull request #3331 from owenconti/bug/3102-unguarded-expressions
Separate model.jsx components to their own files
2017-07-10 18:45:45 -07:00
shockey
025ec662c0 Merge branch 'master' into bug/3102-unguarded-expressions 2017-07-10 18:42:18 -07:00
Owen Conti
914b21f228 Revert back to the 'breaks' fix for newlines in markdown content 2017-07-10 19:23:18 -06:00
Owen Conti
b11399a57e Revert original fix and implement fix from @1Map 2017-07-10 17:39:05 -06:00
Minasokoni
fe200f8616 styling updates 2017-07-11 09:46:44 +12:00
Gwyn Judd
c3f9c094d1 Added maxRows and filter support
Useful for the display of very large swagger specs. Can limit the number of operations to a smaller value and search
2017-07-11 09:38:20 +12:00
Owen Conti
d8400f8729 Fixes #3300 - Updates to versions.swaggerUi information 2017-07-09 14:17:18 -06:00
Owen Conti
14b63c5bf9 Fixes #2926 - Add optional title prop to Collapse so collapse elements can render titles to be clickable 2017-07-09 13:59:59 -06:00
Owen Conti
5d9ab6a0a2 Fixes #3078 - Added breaks: true to Remarkable so newlines are rendered as line breaks. Remove margin-top from <p> tags within .model elements to fix the alignment in the model's description text. 2017-07-08 10:48:52 -06:00
shockey
42efd8a60e Merge pull request #3351 from shockey/v/3.0.18
v3.0.18
2017-07-07 18:40:20 -07:00
Kyle Shockey
afa73040f3 Rebuild dist 2017-07-07 18:29:47 -07:00
Kyle Shockey
4acb95b659 v3.0.18 2017-07-07 18:24:06 -07:00
shockey
38cccf9670 Merge pull request #3346 from owenconti/bug/3271-fix-trim-with-non-json-parameters
Fixes #3271 - Trimming parameter values
2017-07-07 15:35:08 -07:00
Ron
fe9af65793 Merge branch 'master' into feature/apisSorter 2017-07-07 15:31:18 -07:00
shockey
0f961b7162 Merge branch 'master' into bug/3271-fix-trim-with-non-json-parameters 2017-07-07 15:31:14 -07:00
shockey
286160437c Merge pull request #3332 from owenconti/bug/3309-required-file-inputs
Fixes #3309 - Required File inputs
2017-07-07 15:16:00 -07:00
shockey
f5b299f4f5 Merge branch 'master' into bug/3309-required-file-inputs 2017-07-07 15:11:43 -07:00
Ron
3c5ad11d09 Merge branch 'master' into bug/3271-fix-trim-with-non-json-parameters 2017-07-07 15:10:49 -07:00
shockey
0f1b3cc78d Merge pull request #3350 from sharkpp/fix_non_ascii_char_class_name
fixing Non-ascii character class name
2017-07-07 14:17:41 -07:00
sharkpp
ff41b30171 fixing Non-ascii character class name
Fixed to LATIN SMALL LETTER A because class name contained CYRILLIC
SMALL LETTER A.
2017-07-08 01:19:03 +09:00
shockey
9a3df4a6bb Merge branch 'master' into bug/3309-required-file-inputs 2017-07-06 22:27:04 -07:00
shockey
896954c682 Merge pull request #3344 from owenconti/bug/3334-duplicate-arrows
Fixes #3334 - Add autoprefixer back to postcss plugins
2017-07-06 21:59:09 -07:00
Owen Conti
c1ffd9ee08 Fixes #3271 - Only trim parameter values if the parameter's content type is JSON. Change default value of parameter inputs to be '{}' only if the parameter's content type is JSON 2017-07-06 19:54:10 -06:00
Owen Conti
7b33f2a262 Fixes #3334 - Add autoprefixer back to postcss plugins 2017-07-05 17:34:54 -06:00
Raphaël MARQUES
ac3b12fd8b Merge branch 'master' into feature/apisSorter 2017-07-05 08:44:38 +02:00
Owen Conti
7e5e1e3093 Merge branch 'bug/3309-required-file-inputs' of github.com:owenconti/swagger-ui into bug/3309-required-file-inputs 2017-07-04 16:48:42 -06:00