Commit Graph
2412 Commits
Author SHA1 Message Date
Kyle Shockey 6ccd037197 Merge branch 'bug/3163-markdown-xss' of github.com:shockey/swagger-ui into bug/3163-markdown-xss 2017-06-01 22:18:37 -07:00
Kyle Shockey af2b1e20f1 Sanitize Markdown inputs 2017-06-01 22:14:44 -07:00
Kyle Shockey 23b1a8aabd Finish rewiring Markdown provider 2017-06-01 21:41:28 -07:00
Kyle Shockey a2eed69ee7 Create providers directory; Markdown provider 2017-06-01 21:37:00 -07:00
Gwyn Judd eb929d3129 Added support for docExpansion config 2017-06-02 09:02:29 +12:00
shockey 6ae7eb4591 Merge branch 'master' into bug/3163-markdown-xss 2017-06-01 09:47:12 -07:00
Kyle Shockey df47e0e956 Disable HTML rendering in React-Markdown 2017-06-01 09:43:13 -07:00
shockey 5752ffcdab Merge pull request #3161 from shockey/ft/dev-server-watch
Dev server: remove 'watch' call, fix HMR
2017-05-31 23:53:38 -07:00
shockey 2bc6c45f83 Merge branch 'master' into ft/dev-server-watch 2017-05-31 18:54:38 -07:00
shockey 01124b07ad Merge pull request #3162 from swagger-api/readme-updates-0531
Update README.md
2017-05-31 18:15:33 -07:00
Kyle Shockey 1280abe737 Merge branch 'ft/dev-server-watch' of github.com:shockey/swagger-ui into ft/dev-server-watch 2017-05-31 18:14:30 -07:00
Kyle Shockey f4d1d28dd8 HMR for dev server 2017-05-31 18:13:43 -07:00
shockey 4dc966870d Update README.md 2017-05-31 17:25:51 -07:00
shockey 1d07a4b764 Merge branch 'master' into ft/dev-server-watch 2017-05-31 17:21:27 -07:00
shockey 65a4f9aaf2 Merge pull request #3160 from shockey/ft/package-lock
Add package-lock.json
2017-05-31 17:19:49 -07:00
shockey fa01f2b45d Merge branch 'master' into ft/package-lock 2017-05-31 17:16:55 -07:00
Kyle Shockey 1b7d94a54b Dev server: remove 'watch' call 2017-05-31 17:11:04 -07:00
Kyle Shockey f583469876 Add package-lock.json 2017-05-31 17:10:37 -07:00
Ron b242917e3e Merge pull request #2886 from gierschv/fix.info-font
fix(info): font for title, li and table
2017-05-31 12:35:02 -07:00
Ron d1c1b000bf Merge branch 'master' into fix.info-font 2017-05-31 12:31:00 -07:00
shockey fdcdb831eb Merge branch 'master' into master 2017-05-31 12:09:14 -07:00
Anna 8eb5461664 Merge pull request #3156 from bodnia/fix-3128-password
#3128 make request-body type default for aouth2 password flow
2017-05-31 18:58:09 +03:00
Anna Bodnia 676fd99960 #3128 make request-body type default for aouth2 password flow 2017-05-31 18:53:45 +03:00
Alexander Kravets adc09b6d5d Merge branch 'master' into master 2017-05-31 18:45:40 +03:00
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
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
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
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
Anna Bodnia 918e0e46c0 read me for parameterMacro 2017-05-23 15:36:42 +03:00
Robert Barnwell 760d1eba80 Merge branch 'master' into clickfix 2017-05-22 09:57:19 -07:00