Commit Graph

187 Commits

Author SHA1 Message Date
Raymond Feng b1fc7347ce Bump version 2014-08-08 11:21:42 -07:00
Raymond Feng f584c0998d Merge pull request #33 from strongloop/feature/fix-issue-32
Fix the type name for a property if model class is used
2014-08-08 11:21:04 -07:00
Shelby Sanders d7909e8f56 Merge pull request #1 from shelbys/loopback-v2
Upgraded to v2 and ported changes from fork
2014-08-07 13:08:35 -07:00
Shelby Sanders a4ab8023dc Removed branch-lock for loopback 2014-08-07 13:07:36 -07:00
Shelby Sanders 76057a2ba9 Changed to possibly pull model description from ctor.settings 2014-08-06 23:52:59 -07:00
Shelby Sanders 820c51fa7a Corrected generateModelDefinition() to scan for model references nested in other models 2014-08-06 00:31:34 -07:00
Shelby Sanders 5ef5baee06 Corrected prepareDataType() to handle collections and nesting, and changed to always and only use responseMessages 2014-08-06 00:21:48 -07:00
Shelby Sanders 1eddcade09 Corrected generateModelDefinition() to scan for model references in remote returns and errors 2014-08-06 00:20:15 -07:00
Shelby Sanders cf3e6161ef Corrected default for consumes+produces 2014-08-06 00:19:15 -07:00
Raymond Feng bf3a2c9764 Fix the type name for a property if model class is used
See https://github.com/strongloop/loopback-explorer/issues/32
2014-08-04 23:22:41 -07:00
Shelby Sanders c6754baf83 Ported prepareDataType() from old strong-remoting:ext/swagger.js 2014-08-04 20:29:32 -07:00
Shelby Sanders 1a96d84035 Corrected issues with merge of 2.x changes 2014-08-04 20:09:07 -07:00
Shelby Sanders 9693150c8b Corrected issues with merge of 2.x changes 2014-08-04 20:04:41 -07:00
Shelby Sanders ae8858c66b Corrected issues with merge of 2.x changes 2014-08-04 20:02:00 -07:00
Shelby Sanders 24d77f027d Corrected issues with merge of 2.x changes 2014-08-04 19:56:58 -07:00
Shelby Sanders 696e387ff3 Corrected issues with merge of 2.x changes 2014-08-04 19:44:12 -07:00
Samuel Reed 86d79584f9 Load swagger ui from `swagger-ui` package instead.
Added option `swaggerDistRoot` for specific file overrides.

Conflicts:
	README.md
	example/simple.js
	index.js
	package.json
	public/css/screen.css
	public/images/logo_small.png
	public/index.html
	public/lib/loadSwaggerUI.js
2014-08-04 19:22:55 -07:00
Shelby Sanders 28d293b6f9 Merge remote-tracking branch 'upstream/master'
* upstream/master:
  Bump version
  Set up default consumes/produces media types
  Fix the default opts
  Add required swagger 1.2 items property for property type array
  Allow passing a custom protocol.

Conflicts:
	lib/swagger.js
2014-08-04 18:20:59 -07:00
Shelby Sanders 3dc7de6881 Ported extensions for more Swagger 1.2 metadata, returns+errors as responseMessages, consumes+produces, and X-Forwarded-Proto for reverse-proxying from HTTPS to HTTP 2014-08-04 18:19:09 -07:00
Shelby Sanders 2c737d40b6 Merge remote-tracking branch 'upstream/master'
* upstream/master: (38 commits)
  Bump version
  res.send deprecated - updated to res.status
  Remove hidden properties from definition.
  Bump version
  Ensure models from relations are included
  1.2.4
  model-helper: handle arrays with undefined items
  1.2.3
  model-helper: handle array types with no item type
  Bump version
  Properly convert complex return types.
  Bump version
  Fix up loopback.rest() model definition hack.
  Bump version and update deps
  s/accessToken/access_token in authorization key name
  Fix resources if the explorer is at a deep path.
  Fix debug namespace, express version.
  Remove forgotten TODO.
  Simplify `accepts` and `returns` hacks.
  More consise type tests
  ...

Conflicts:
	public/css/loopbackStyles.css
	public/css/screen.css
	public/index.html
	public/lib/loadSwaggerUI.js
	public/lib/swagger.js
	public/swagger-ui.js
	public/swagger-ui.min.js
2014-08-04 18:11:36 -07:00
Raymond Feng 200da753b4 Merge tag 'v1.2.7'
1.2.7
2014-08-04 09:09:44 -07:00
Raymond Feng 3f9024a265 Merge branch 'release/1.2.7' into production 2014-08-04 09:09:37 -07:00
Raymond Feng db0ca06a4d Bump version 2014-08-04 09:08:49 -07:00
Raymond Feng 689a2f6a86 Merge pull request #29 from strongloop/feature/workaround-lb-issue-432
Set up default consumes/produces media types
2014-08-04 08:37:45 -07:00
Ritchie Martori e30df1de93 Merge pull request #27 from strongloop/fix/array-items-any
Add required swagger 1.2 items property for property type array
2014-08-04 08:34:59 -07:00
Raymond Feng 0aa476a682 Set up default consumes/produces media types
See:

https://github.com/strongloop/loopback/issues/432
https://github.com/wordnik/swagger-js/issues/107
2014-08-03 21:48:16 -07:00
Raymond Feng 885ae9e71d Merge branch 'STRML-protocol' 2014-07-31 16:48:31 -07:00
Raymond Feng df459ffc8b Fix the default opts 2014-07-31 16:47:47 -07:00
Raymond Feng 3c8f3b1dd0 Merge branch 'protocol' of github.com:STRML/loopback-explorer into STRML-protocol 2014-07-31 16:45:32 -07:00
Ritchie Martori f7734fe5b3 Add required swagger 1.2 items property for property type array 2014-07-31 16:33:02 -07:00
Shelby Sanders c1a0eb5192 Upgraded to SwaggerUI 2.0.18 2014-07-30 11:40:45 -07:00
Raymond Feng 8a1bd07f73 Merge tag 'v1.2.6'
1.2.6
2014-07-29 08:55:32 -07:00
Raymond Feng d99f6edf29 Merge branch 'release/1.2.6' into production 2014-07-29 08:55:26 -07:00
Raymond Feng 4da82cbac8 Bump version 2014-07-29 08:54:48 -07:00
Shelby Sanders 17e8b7b919 Added support for toggling Model and Schema, and added support for primitives in StatusCodeView 2014-07-28 21:36:28 -07:00
Raymond Feng 70db496d41 Merge pull request #25 from glesage/master
res.send deprecated - updated to res.status
2014-07-28 16:16:53 -07:00
Geoffroy f6970db749 res.send deprecated - updated to res.status
Used to get warning: 'express deprecated res.send(status, body): Use
res.status(status).send(body) instead
node_modules/loopback-explorer/lib/swagger.js:105:9'
2014-07-28 17:40:08 -05:00
Samuel Reed 32f0f5e37d Allow passing a custom protocol.
This allows swagger definitions to work properly when the API is behind
an SSL terminator.
2014-07-27 21:44:14 -05:00
Raymond Feng d2356f5af0 Merge pull request #24 from STRML/hiddenProperties
Remove hidden properties from definition.
2014-07-26 11:14:40 -07:00
Samuel Reed a9ecfecde5 Remove hidden properties from definition. 2014-07-26 12:15:47 -05:00
Raymond Feng 8c07540755 Merge tag 'v1.2.5'
1.2.5
2014-07-25 11:24:33 -07:00
Raymond Feng 73c68f44c4 Merge branch 'release/1.2.5' into production 2014-07-25 11:24:05 -07:00
Raymond Feng 8c6fc47276 Bump version 2014-07-25 09:10:54 -07:00
Raymond Feng 7c3f7744b3 Merge pull request #20 from strongloop/feature/add-related-models
Add models from relations
2014-07-25 08:28:11 -07:00
Raymond Feng 078649f990 Ensure models from relations are included 2014-07-24 13:35:02 -07:00
Miroslav Bajtoš 028e0fb579 Merge tag 'v1.2.4'
1.2.4
2014-07-22 21:58:25 +02:00
Miroslav Bajtoš 3d1b26aad4 Merge branch 'release/1.2.4' into production 2014-07-22 21:58:12 +02:00
Miroslav Bajtoš bb683e20a9 1.2.4 2014-07-22 21:57:53 +02:00
Miroslav Bajtoš 75151ae392 Merge pull request #18 from strongloop/feature/fixup
model-helper: handle arrays with undefined items
2014-07-22 21:56:56 +02:00
Miroslav Bajtoš 536fa4c577 model-helper: handle arrays with undefined items 2014-07-22 21:52:25 +02:00