Commit Graph

1501 Commits

Author SHA1 Message Date
Raymond Feng c277be78fc Merge branch 'release/1.5.3' into production 2014-01-23 15:55:12 -08:00
Raymond Feng 4f72737b95 Bump version 2014-01-23 15:51:21 -08:00
Raymond Feng 554f62895b Merge pull request #150 from strongloop/feature/fix-auto-attach
Prevent autoAttach from overriding existing data source
2014-01-23 15:50:39 -08:00
Raymond Feng f08b9427ab Add a test for autoAttach 2014-01-23 15:27:31 -08:00
Raymond Feng 5586c54c49 Fix the Role ref to RoleMapping 2014-01-23 15:04:48 -08:00
Raymond Feng 224b500c3a Fix the Scope reference to models 2014-01-23 14:46:02 -08:00
Raymond Feng bb389ce209 Lookup the email model 2014-01-23 14:40:27 -08:00
Raymond Feng bcc7e68e0e Add lookback.getModelByType() and use it resolve model deps 2014-01-23 14:39:27 -08:00
Ritchie Martori 86a85291ac Fix user test race condition 2014-01-23 14:39:15 -08:00
Ritchie Martori a43d6004c1 Fix race condition where MyEmail model was not attached to the correct dataSource in tests 2014-01-23 14:25:54 -08:00
Raymond Feng d6a4230aed Fix the method args 2014-01-21 16:41:48 -08:00
Raymond Feng a5242a3b77 Fix the typo for the method name 2014-01-21 16:35:28 -08:00
Rand McKinney 9ab2d43bf5 Small change to text webhook. 2014-01-21 14:48:02 -08:00
Rand McKinney 1dbded56e1 Minor wording change for testing purposes. 2014-01-21 14:41:51 -08:00
Rand McKinney a802436f98 Fix capitalization and punctuation. 2014-01-21 14:14:13 -08:00
Rand McKinney 680a06bfec Minor wording cleanup. 2014-01-21 09:55:43 -08:00
Raymond Feng 8a114c635f Prevent autoAttach from overriding existing data source 2014-01-20 14:32:47 -08:00
Raymond Feng 73390a6be8 Merge tag 'v1.5.2'
1.5.2
2014-01-17 11:06:19 -08:00
Raymond Feng b1787e0b94 Merge branch 'release/1.5.2' into production 2014-01-17 11:06:11 -08:00
Raymond Feng 4c56be93c3 Bump version 2014-01-17 11:05:26 -08:00
Raymond Feng f887c3e623 Merge pull request #146 from strongloop/feature/DFD-48
Clean up loopback.js doc and add it to docs.json
2014-01-17 11:04:38 -08:00
Raymond Feng 5a6155e08e Clean up loopback.js doc and add it to docs.json 2014-01-17 10:40:41 -08:00
Raymond Feng 32bdce53ee Fix the jsdoc for loopback.getModel() 2014-01-17 10:23:59 -08:00
Raymond Feng c70ba01f6b Merge pull request #143 from strongloop/feature/fix-acl-model
Fix ACL model
2014-01-16 22:37:30 -08:00
Raymond Feng a6ff22c9c1 Make sure defaultPermission is checked 2014-01-16 15:05:10 -08:00
Raymond Feng 7212ebe805 Remove the dangling require 2014-01-16 09:12:52 -08:00
Raymond Feng d8647bb3c1 Make ACL model subclassing friendly 2014-01-16 08:50:50 -08:00
Miroslav Bajtoš 2b2d869763 Merge branch 'master' into production
Bring in recent API doc fixes.
2014-01-15 14:50:50 +01:00
Miroslav Bajtoš f155ba46c7 Merge pull request #132 from strongloop/feature/move-app-doc-to-jsdox
Move the documentation of app object to jsdox
2014-01-14 23:59:06 -08:00
Miroslav Bajtoš eabe29bb73 Fix heading levels in docs/ markdown files. 2014-01-15 08:50:54 +01:00
Miroslav Bajtoš 8be4d095e2 Remove docs/rest.md
The documentation of the REST interface is maintained on
docs.strongloop.com
2014-01-15 08:45:01 +01:00
Miroslav Bajtoš e6cdeb5cd4 Improve jsdox documentation of app object
Remove docs/api-app.md and docs/api.md, as they are no longer referenced
from docs.json.

Add few missing bits from docs/api-app.md to lib/application.js
comments.
2014-01-15 08:44:49 +01:00
Raymond Feng 191d52995e Merge tag 'v1.5.1'
1.5.1
2014-01-14 16:33:40 -08:00
Raymond Feng 92457b64b5 Merge branch 'release/1.5.1' into production 2014-01-14 16:31:42 -08:00
Raymond Feng 7e47bbea4b Bump version 2014-01-14 16:30:47 -08:00
Raymond Feng de7133f57e Merge pull request #139 from strongloop/feature/fix-app-model
Make sure methods are called in the context of the calling class
2014-01-14 15:50:36 -08:00
Raymond Feng c8eb5d9170 Make sure methods are called in the context of the calling class 2014-01-14 15:34:44 -08:00
Ritchie Martori 1e9b24276f Merge pull request #122 from strongloop/fix/minor-jsdoc
Start to move md to jsdoc
2014-01-14 11:51:03 -08:00
Ritchie Martori 9fc8e197ee Start to move md to jsdoc 2014-01-14 10:03:47 -08:00
Miroslav Bajtoš 0ed92bd3be Merge tag 'v1.5.0'
v1.5.0
2014-01-14 08:31:01 +01:00
Miroslav Bajtoš e18397ce4b Merge branch 'release/1.5.0' into production 2014-01-14 08:30:47 +01:00
Miroslav Bajtoš 7fbb70d520 v1.5.0 2014-01-14 08:29:56 +01:00
Miroslav Bajtoš d745d1a924 Merge pull request #138 from strongloop/feature/fix-middleware-events-examples
Replace `on` with `once` in middleware examples
2014-01-13 23:13:34 -08:00
Miroslav Bajtoš 8573d01c16 Replace `on` with `once` in middleware examples
Fix the jsdox for `app.installMiddleware` to use `app.once` for
listening on 'middleware:*' events.

The previous doc version using `on` was a sort of preliminary
pessimisation, becase the event handlers would stay in the heap
for the whole life-time of the app, even though they won't be called
more than once.
2014-01-14 08:07:47 +01:00
Miroslav Bajtoš 1f80164e69 Merge pull request #135 from strongloop/feature/speed-up-user-passwords
Speed up tests accessing User.password
2014-01-13 22:04:41 -08:00
Miroslav Bajtoš 57813cef56 Merge pull request #133 from strongloop/feature/app-install-middleware
Implement app.installMiddleware
2014-01-13 21:58:11 -08:00
Ritchie Martori d00b8b54bc 1.4.3 2014-01-13 20:04:15 -08:00
Ritchie Martori 9668692406 Merge pull request #136 from strongloop/fix/mail-transports
Fix incorrect transports
2014-01-13 20:03:25 -08:00
Ritchie Martori 92eaa383f3 Fix incorrect transports 2014-01-13 19:04:21 -08:00
Ritchie Martori 45e5641055 Merge pull request #130 from strongloop/fix/mail-transports
Fix/mail transports
2014-01-13 18:36:42 -08:00