Commit Graph

8 Commits

Author SHA1 Message Date
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 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
Shelby Sanders ed044468f7 Reverted to use special loading logic from loopback-explorer 2014-07-14 21:57:39 -07:00
Samuel Reed a6afe13b08 Restore existing styles.
TODO extract overrides instead of replacing styles wholesale.
2014-07-09 12:03:34 -05:00
Samuel Reed 5f22982200 Allow easy setting of accessToken in explorer UI. 2014-07-09 11:45:44 -05:00