Commit Graph

33 Commits

Author SHA1 Message Date
laurent lepinay
e7b7465335 Merge branch 'develop_2.0' into JSONEditor
Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/coffeescript/view/MainView.coffee
	src/main/coffeescript/view/OperationView.coffee
	src/main/coffeescript/view/ParameterView.coffee
	src/main/coffeescript/view/ResourceView.coffee
	src/main/coffeescript/view/SignatureView.coffee
	src/main/html/index.html
2015-03-24 07:06:07 -07:00
Livio Soares
b181fa95a0 OperatioView.js: fix rendering of Markdown (GFM) in description fields.
This removes substitution of \r\n, \r, \n to <br>, since the subsequent set of
renderGFM() gets confused by them. Furthermore, the marked module already does a
decent job of substituting \n with proper HTML (<p>, if I'm not mistaken).
2015-03-18 23:38:28 -04:00
Tony Tam
b66a8613ab fixed build error 2015-03-17 16:28:31 -07:00
Tony Tam
5a890c9788 merged 2015-03-17 16:16:27 -07:00
Mohsen Azimi
afe232747b Normalize all the line endings 2015-03-17 14:34:22 -07:00
Mohsen Azimi
9b409f75b8 Encode/decode tags before using it in the URL
Fixes #994

Conflicts:
	dist/swagger-ui.min.js
2015-03-17 14:14:28 -07:00
Tony Tam
f073f192a2 Merge pull request #1036 from mohsen1/remove-swaggerui-global-instance
Remove swaggerui global instance
2015-03-17 13:57:18 -07:00
Mohsen Azimi
f49c1689d2 Move backward compatibility to swaggerUi.js and warn users about API changes 2015-03-17 12:10:28 -07:00
Tony Tam
58982430c4 fix for #968, removed block 2015-03-16 21:21:35 -07:00
Mohsen Azimi
d61cf24ae0 Append swagger-auth global functions to window and don't break backward 2015-03-16 15:07:14 -07:00
Mohsen Azimi
8c6e3a6d95 Append Docs to window for now
also remove expection for global swaggerUi from JSHint
2015-03-16 13:58:05 -07:00
Mohsen Azimi
51bbbf03db Remove all references to swaggerUi global instance 2015-03-16 13:52:38 -07:00
Mohsen Azimi
66adb0d508 Remove global auth object references and fix header api key adding mechanism
Fixes #1033
2015-03-16 13:45:08 -07:00
Mohsen Azimi
9ed1ad88ec Pass router to all views 2015-03-16 11:08:28 -07:00
Mohsen Azimi
07ac7fcf95 Fix all JSHint errors 2015-03-12 16:50:57 -07:00
Mohsen Azimi
096cd120a4 Some cleanup in Docs.js
Doc.js is ignored in JSHint so we are not cleaning it up entirely!
2015-03-12 16:46:51 -07:00
Mohsen Azimi
dac83b71c8 Remove global views
Append all views to SwaggerUi.Views object
2015-03-12 16:42:23 -07:00
Mohsen Azimi
8440833f6c Remove [].forEach calls 2015-03-12 16:22:19 -07:00
Mohsen Azimi
f35bbc7ec1 Fix binding error in swagger-js file 2015-03-12 16:22:19 -07:00
Mohsen Azimi
07d8a89c8f Fix JS errors in source 2015-03-12 16:21:31 -07:00
Mohsen Azimi
215a8fa63e Move all files to javascript folder and remove coffeescript folder 2015-03-12 16:21:31 -07:00
Mohsen Azimi
dee699833f Update favicon with official logo and HiDPI support 2015-03-09 18:07:35 -07:00
Tony Tam
038443fc22 merged from develop_2.0 2015-02-01 02:27:43 -08:00
Tony Tam
bdec07e8c3 updated files 2014-09-07 17:12:03 -07:00
Tony Tam
fbe5278928 updated logger to avoid logging arrays 2014-08-01 17:13:30 -07:00
Tony Tam
dc7b663239 updated files 2014-02-27 23:35:36 -08:00
Tony Tam
7b77ffd079 ie8 fixes 2014-02-27 19:55:56 -08:00
sequielo
369b639329 Update src/main/javascript/doc.js
fixed #101: expand operations for resource when resource paramenter is an empty string.
2012-11-27 00:14:47 -02:00
Tony Tam
9b58ed5430 redo of PR #88, #89, #90 2012-11-19 19:51:28 -08:00
Greg MacLellan
ad944b93f3 Support console.log in IE9
IE9 does console incorrectly, this fixes according to http://stackoverflow.com/questions/5538972/console-log-apply-not-working-in-ie9
2012-11-13 13:03:16 -05:00
Arjun Balla
6beaa62b71 code to display resources in default/list/expended style. style can be
passed as a option while creating swagerUi object.
In future I would like to achieve this by passing options to templates
and have a template helper method manipulate dom and apply correct
classes.This approach will improve the performance as we need not go
over the entire dom and call Doc.collapseOperationsForResource or
Doc.expandOperationsForResource on each matched element
2012-10-23 11:42:26 -07:00
Ayush Gupta
58d5a35bce closes #45 2012-08-28 17:05:35 +05:30
Tony Tam
d2eb882e52 updated to v2 2012-07-11 09:57:27 -07:00