Commit Graph

2849 Commits

Author SHA1 Message Date
Artem
ed364d3562 Resolve conflicts 2017-05-31 18:43:47 +03:00
Anna
49705f3441 Merge pull request #3155 from bodnia/fix-3128
fix #3128
2017-05-31 18:18:21 +03:00
Artem
78fcf5f0ff Merge branch 'master' of https://github.com/slate-studio/swagger-ui 2017-05-31 17:50:16 +03:00
Artem
5eb006ee3d Refactor code 2017-05-31 17:50:11 +03:00
Anna Bodnia
5f2eaffbc3 fix #3128 2017-05-31 17:31:29 +03:00
Vincent Giersch
0ea14189c0 fix(info): font for title, li and table 2017-05-31 10:46:07 +02:00
Alexander Kravets
914f6991cd Merge branch 'master' into master 2017-05-31 08:47:48 +03:00
Anna
88df65533c Merge pull request #3148 from bodnia/master
typo in README
2017-05-30 14:49:07 +03:00
Anna Bodnia
8340f5d06c typo in README 2017-05-30 14:45:04 +03:00
Michael Mrowetz
6bced2ad48 Merge branch 'master' into update-alpine 2017-05-29 17:07:18 -07:00
Artem
2fd9d9ed25 Change operationId font size 2017-05-29 14:38:21 +03:00
Artem
20d9161e2b Add operationId 2017-05-29 13:31:38 +03:00
shockey
39501c8d82 Merge pull request #3140 from shockey/v/3.0.12
v3.0.12
2017-05-26 19:43:55 -07:00
Kyle Shockey
d68dd5f7d6 Rebuild dist 2017-05-26 19:38:03 -07:00
Kyle Shockey
2567e5168d v3.0.12 2017-05-26 19:36:30 -07:00
Minasokoni
66321c8f66 tabs added 2017-05-26 07:43:02 -07:00
shockey
bf6681c914 Merge pull request #3133 from shockey/ft/dist-npm-packaging
packaging: fix swagger-ui-dist entry point
2017-05-26 00:59:16 -07:00
Kyle Shockey
032c0a027f Basic request body 2017-05-26 00:24:53 -07:00
Michael Mrowetz
b9dbfccb8e Merge branch 'master' into update-alpine 2017-05-26 00:03:27 -07:00
Roman Bolshakov
b23c999d01 packaging: fix swagger-ui-dist entry point
Entry point was missing. This change allows importing SwaggerUIBundle
and SwaggerUIStandalonePreset directly from package. Correct entry point
is also needed for module bundlers like webpack to perform tree-shaking.
2017-05-25 17:45:01 -07:00
Anna
41d8089d0e Merge pull request #3130 from bodnia/fix-3067
Fix 3067
2017-05-25 18:30:12 +03:00
Anna Bodnia
c5d2faa3a2 build 2017-05-25 18:10:40 +03:00
Anna Bodnia
df4ea9b3d6 Merge remote-tracking branch 'upstream/master' into fix-3067 2017-05-25 18:06:07 +03:00
Anna Bodnia
62cb9ec581 Read me for modelPropertyMacro, changed for parameterMacro 2017-05-25 18:04:21 +03:00
Michael Mrowetz
494b99ebef update base-image to alpine 3.5 2017-05-25 10:55:38 +09:00
shockey
1db8e498b7 Merge pull request #3116 from Minasokoni/clickfix
Updated click area
2017-05-24 09:01:34 -07:00
Kyle Shockey
128b910d58 Reorganize wrapComponents, fix CommonMark 2017-05-23 19:39:54 -07:00
Kyle Shockey
31abbb7641 Finish rewiring Markdown provider 2017-05-23 15:29:58 -07:00
Kyle Shockey
88848d071b Extended getComponent: system availability 2017-05-23 14:55:28 -07:00
Anna Bodnia
918e0e46c0 read me for parameterMacro 2017-05-23 15:36:42 +03:00
Kyle Shockey
614c1ae7f6 basic wrapComponent 2017-05-22 23:10:16 -07:00
Robert Barnwell
760d1eba80 Merge branch 'master' into clickfix 2017-05-22 09:57:19 -07:00
Minasokoni
a2a2f76199 updated click area 2017-05-22 09:12:13 -07:00
Anna Bodnia
d5b9552a5a removed debugger 2017-05-22 17:13:31 +03:00
Kyle Shockey
2f527b1f66 Move system tests to directory 2017-05-20 13:07:00 -07:00
shockey
753134ec49 Merge pull request #3114 from shockey/v/3.0.11
v3.0.11
2017-05-19 20:25:59 -07:00
Kyle Shockey
612078ac8c Rebuild dist 2017-05-19 20:17:37 -07:00
Kyle Shockey
e45570b6c8 v3.0.11 2017-05-19 20:09:34 -07:00
shockey
daef38d2e3 Merge pull request #3092 from Minasokoni/wordwrapfix
Long single line responses wrapped with css
2017-05-19 18:46:28 -07:00
shockey
eb8a64a66f Merge branch 'master' into wordwrapfix 2017-05-19 18:43:27 -07:00
Anna Bodnia
edfe88d299 modelPropertyMacro, parameterMacro 2017-05-19 18:50:51 +03:00
shockey
c66436e7d5 Merge pull request #3108 from swagger-api/shockey-patch-3
Add custom namespace to config whitelist
2017-05-18 23:41:34 -07:00
shockey
b530ac8593 Default value for custom key 2017-05-18 23:35:02 -07:00
shockey
d30b3a9ba1 Add custom namespace to config whitelist 2017-05-18 23:33:12 -07:00
Kyle Shockey
3b62a93bb6 Create providers directory; Markdown provider 2017-05-18 17:05:49 -07:00
shockey
e326a99001 Merge pull request #3106 from shockey/ft/error-jump-to-line
Jump to Line
2017-05-18 15:32:44 -07:00
Kyle Shockey
a28dc13191 Merge branch 'master' of github.com:swagger-api/swagger-ui into ft/error-jump-to-line 2017-05-18 15:21:09 -07:00
Kyle Shockey
c942f382fb Rebuild dist 2017-05-18 15:15:01 -07:00
Kyle Shockey
b6bb1deab8 Rewire jump to line for Errors component 2017-05-18 15:13:04 -07:00
Kyle Shockey
60934107d3 Add base wrapSelectors for OAS3; implement definitions selector for OAS3 2017-05-17 18:42:34 -07:00