Commit Graph

16 Commits

Author SHA1 Message Date
Ron
f22a628934 in with the new 2017-03-17 21:17:53 -07:00
Ron
bd8344c808 out with the old 2017-03-17 20:34:15 -07:00
Laurent Lepinay
2c431d7873 Merge remote-tracking branch 'upstream/master' into JSONEditorMaster
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/javascript/view/OperationView.js
	src/main/less/screen.less
2015-12-16 10:25:38 +01:00
Sean Kennedy
43fc67b21e gitignore local specs copied to dist & anything in test/specs/local 2015-11-30 08:26:30 -05:00
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
Mohsen Azimi
afe232747b Normalize all the line endings 2015-03-17 14:34:22 -07:00
Константин Калинин
6b78d3eb6c readme 2015-02-26 15:44:03 +03:00
Tony Tam
38ea30834a removed unnecessary ignores 2015-01-06 17:44:28 -08:00
Tony Tam
22e5f5ccc1 #199 2013-07-07 01:21:39 -07:00
Tony Tam
8a9d41ca27 added dist folder back now that git downloads are gone 2013-01-25 20:15:23 -08:00
unknown
55fd0252b7 added .project to gitignore 2012-10-23 11:22:09 -07:00
Rintcius Blok
ce0c919ee2 refer to jquery-1.8.0.min.js because jquery-1.8.0.js is not available in lib
(also added .idea to .gitignore)
2012-08-30 16:24:27 +01:00
Ayush Gupta
ded600aecd closes #38 closes #37 2012-08-28 15:58:07 +05:30
Ayush Gupta
4a54c7a7a0 added sublime project file 2012-07-18 11:45:44 -07:00
zeke
e7ad3aa371 Ignore sass cache 2011-08-02 15:43:00 -07:00
Ayush Gupta
f971b0629a html/js page skelton 2011-07-26 22:38:46 -07:00