Commit Graph

1074 Commits

Author SHA1 Message Date
shockey
3d79fcf79f Merge branch 'master' into bug/3405-default-scheme-change 2017-07-18 21:40:34 -07:00
Kyle Shockey
2ef7b2ad8d Remove path translator 2017-07-18 20:32:09 -07:00
Owen Conti
c10702d24e Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/3405-default-scheme-change 2017-07-18 19:59:11 -06:00
Owen Conti
2c35ba2c8f Fixes #3405 - Changed logic for schemes.jsx component to select default scheme when there is no selected scheme. Added test for functionality. 2017-07-18 19:58:02 -06:00
Owen Conti
b1605a0177 Merge branch 'master' into bug/3329-duplicate-css
# Conflicts:
#	make-webpack-config.js
2017-07-17 18:49:19 -06:00
Will Marshall
1d9e71ff3e parseSeach -> parseSearch in index.js 2017-07-17 13:39:06 -07:00
Will Marshall
7363776079 parseSeach -> parseSearch 2017-07-17 13:35:26 -07:00
shockey
0d2c457153 Merge branch 'master' into include-apis-preset-by-default 2017-07-15 09:27:27 -07:00
Kyle Shockey
830bafe9dc Remove animated from Models collapse
This solves a stack overflow problem in Models->Collapse->Collapse->Motion.
2017-07-14 21:15:36 -07:00
Kyle Shockey
7d01a5a8ac Fix external documentation styling 2017-07-14 18:22:01 -07:00
Kyle Shockey
4c6b765fe0 Render external documentation description as Markdown 2017-07-14 18:21:43 -07:00
shockey
79cc31bd95 Merge branch 'master' into feature/2926-click-model-name-to-toggle 2017-07-14 17:46:33 -07:00
shockey
cbe1680c6d Merge branch 'master' into bug/3078-newlines-in-markdown 2017-07-14 17:29:10 -07:00
shockey
6ec7006c21 Update markdown.jsx 2017-07-14 17:28:36 -07:00
shockey
b941882df7 Merge branch 'master' into bug/3361-non-required-integers 2017-07-14 16:52:40 -07:00
Kyle Shockey
abfad69e93 Disable deep linking by default 2017-07-14 16:18:25 -07:00
shockey
ec33480c25 Merge branch 'master' into bug/3361-non-required-integers 2017-07-14 15:41:40 -07:00
shockey
e77c980ae8 Merge branch 'master' into ft/2884-operation-deep-linking 2017-07-14 15:40:20 -07:00
Kyle Shockey
0dccd48474 Add Api preset in constructor by default 2017-07-14 15:33:49 -07:00
Kyle Shockey
11c34d0348 Add docs 2017-07-14 03:25:10 -07:00
Kyle Shockey
66cb3ff2c0 Use swagger-client opId helper to generate layout keys for operations 2017-07-14 03:17:57 -07:00
Kyle Shockey
2906bdd699 Fire layout updates before attempting to scroll (improves docExpansion:none support) 2017-07-14 02:45:40 -07:00
Kyle Shockey
556e40e6d4 Don't place fragment links if deep linking is disabled 2017-07-14 01:50:49 -07:00
Kyle Shockey
73845907a3 Add anchors for tags and operations 2017-07-14 01:13:30 -07:00
Kyle Shockey
8851b138f9 Add config switch for deep linking 2017-07-14 00:51:26 -07:00
Kyle Shockey
41ecceed87 Rewire operation/tag DOM ids; implement hash scroll-to 2017-07-14 00:46:21 -07:00
Kyle Shockey
79f91b2e3e Rearrange isShownKey to make more sense
Tag then ID is closer to representing the underlying data structure
2017-07-14 00:19:02 -07:00
Kyle Shockey
d7f6355d85 add setHash helper 2017-07-14 00:08:47 -07:00
Kyle Shockey
617cf7c867 Update URL fragment when operations & tags are shown or hidden 2017-07-13 23:24:19 -07:00
Kyle Shockey
c051952081 Use operationIds from swagger-js if available, in layout triggers 2017-07-13 22:48:12 -07:00
shockey
f916e3c208 Topbar: Remove unused filter and layoutSelectors 2017-07-13 22:19:17 -07:00
shockey
2ae61e85b8 Update base.jsx 2017-07-13 22:00:16 -07:00
shockey
d698aef1cd "Filter Operations" -> "Filter by tag" 2017-07-13 21:57:49 -07:00
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
28912dded3 Update index.js 2017-07-13 21:14:56 -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
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
ff9e164d11 Merge branch 'master' into feature/3300-updated-version-info 2017-07-13 13:34:07 -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
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
7000c20765 Moved split-pane-mode.less file into a .scss file. Removed remaining unused .less files. Removed reference to less file in webpack config. Removed dependency on less-loader. Updated standalone and bundle builds to no longer compile any styles. 2017-07-11 20:17:06 -06:00
Owen Conti
bd31d3dedf Reimplemented changes after merge with master 2017-07-11 17:02:53 -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