10d29c7d86
Merge branch 'master' into 2.0
...
Conflicts:
package.json
2014-06-27 10:36:06 +02:00
45d026e7de
Merge pull request #335 from karlmikko/bug/invalid-token-unhandled
...
Ignore unhanded error - simulate token missing
2014-06-27 09:56:17 +02:00
46af483bdd
Invalid Access Token return 401
...
Clean up logic to be easier to read.
Signed-off-by: Karl Mikkelsen <karl@karlmikko.com>
2014-06-26 08:50:41 +10:00
9eab7d62d3
Merge branch 'master' into 2.0
2014-06-20 23:48:46 -07:00
b44dac3c62
Merge branch 'master' into 2.0
2014-06-20 23:08:35 -07:00
afd8de0c31
Fix a slowdown caused by mutation of an incoming accessToken option.
2014-06-20 16:39:28 -05:00
d5ed57e60d
Merge pull request #254 from strongloop/feature/role-id
...
Set the role id to be generated
2014-06-17 10:37:06 -07:00
7316048afc
lib/registry: `getModel` throws, add `findModel`
...
Rename `loopback.getModel` to `loopback.findModel`.
Implement `loopback.getModel` as a wrapper around `findModel` that
throws an error when the model as not found.
2014-06-16 16:13:24 +02:00
d21669b844
Merge branch 'master' into 2.0
...
Conflicts:
docs.json
lib/application.js
lib/loopback.js
lib/models/data-model.js
lib/models/model.js
lib/models/user.js
lib/registry.js
package.json
test/app.test.js
2014-06-13 10:09:25 +02:00
7d674779e1
refactor: extract runtime and registry
...
Move isBrowser and isServer from lib/loopback to a new file lib/runtime.
Move all Model and DataSource related methods like `createModel` and
`createDataSource` to lib/registry.
Remove the circular dependency between lib/application and lib/loopback,
by loading lib/registry and/or lib/runtime instead of lib/loopback
where appropriate
This commit is only moving the code around, the functionality should
not be changed at all.
2014-06-12 10:41:44 +02:00
ad347e517c
JSDoc fixes
2014-06-11 14:55:47 -07:00
6490447fac
Set the role id to be generated
...
See https://github.com/strongloop/loopback-connector-postgresql/issues/5
2014-06-10 16:38:37 -07:00
6af69e322a
JSDoc cleanup
2014-06-09 15:50:04 -07:00
cea2d30928
Merge branch 'master' of github.com:strongloop/loopback
2014-06-09 15:42:07 -07:00
1694ee2d83
JSDoc cleanup
2014-06-09 15:36:08 -07:00
854402acba
Merge pull request #314 from strongloop/feature/allow-custom-token-creation
...
Allow the creation of access token to be overriden
2014-06-09 15:01:15 -07:00
a6ff4b0cad
Use constructor to reference the model class
2014-06-09 15:00:15 -07:00
6b4ebdf609
Allow the creation of access token to be overriden
2014-06-09 14:53:55 -07:00
1316676946
Fixup JSDocs; note: updateOrCreate function alias pulled out on separate line for docs
2014-06-06 17:17:37 -07:00
eac231df99
refactor: extract runtime and registry
...
Move isBrowser and isServer from lib/loopback to a new file lib/runtime.
Move all Model and DataSource related methods like `createModel` and
`createDataSource` to lib/registry.
Remove the circular dependency between lib/application and lib/loopback,
by loading lib/registry and/or lib/runtime instead of lib/loopback
where appropriate
This commit is only moving the code around, the functionality should
not be changed at all.
2014-06-06 11:53:23 +02:00
ea5b9d16fc
Rename DataModel to PersistedModel
2014-06-05 09:56:00 +02:00
fea1cee1c4
!fixup only set ctx.accessType when sharedMethod is available
2014-06-02 14:41:08 -07:00
a2f931ed3f
Refactor ACL to allow for `methodNames` / aliases
2014-06-02 14:41:08 -07:00
d237ae5ddb
Merge latest from master
2014-05-20 14:31:09 -07:00
1a8ba602cc
!fixup Mark DAO methods as delegate
...
Allow juggler to mix in these methods.
2014-05-20 13:45:47 -07:00
77bd77e625
Ensure changes are created in sync
2014-05-20 12:46:43 -07:00
52eb72d94f
Remove un-rectify-able changes
2014-05-20 12:14:51 -07:00
2de33d4da5
Rework change conflict detection
2014-05-19 19:54:55 -07:00
eec7bdd5f4
- Use the RemoteObjects class to find remote objects instead of
...
creating a cache
- Use the SharedClass class to build the remote connector
- Change default base model from Model to DataModel
- Fix DataModel errors not logging correct method names
- Use the strong-remoting 1.4 resolver API to resolve dynamic remote
methods (relation api)
- Remove use of fn object for storing remoting meta data
2014-05-19 15:56:26 -07:00
558ea60da0
In progress: rework remoting meta-data
2014-05-16 12:32:54 -07:00
7c00119292
Fix typo "Unkown" => "Unknown"
2014-05-15 23:32:12 -04:00
2f21f4ec1e
Rework replication test
2014-05-15 17:30:58 -07:00
1e2ad9fba9
Change#getModel(), Doc cleanup, Conflict event
2014-05-14 09:20:04 -07:00
4bab42478f
Add error logging for missing data
2014-05-12 10:36:10 -07:00
978bc57421
Fix bug in User#resetPassword
2014-05-10 15:43:01 +08:00
908221416e
Fix issues when using MongoDB for replication
2014-05-09 17:19:32 -07:00
a3a6828709
Move replication implementation to DataModel
2014-05-06 13:31:23 -07:00
f8b5fa11ec
All tests passing
2014-05-02 21:19:14 -07:00
429052a0db
Ensure roleId and principalId to be string in Role#isInRole
2014-05-03 11:43:03 +08:00
012f880078
!fixup RemoteConnector tests
2014-05-02 20:04:06 -07:00
918596f035
Refactor DataModel remoting
...
- Move DataModel remoting setup into setup phase
- Add a remoting type converter for DataModels
- Move model tests into re-usable test utilities
- Move other test utilities into new test utilities folder
2014-05-02 18:12:24 -07:00
69cd6a836b
!fixup .replicate() argument handling
2014-04-29 20:40:00 -07:00
e35309ba27
Fixes for e2e replication / remote connector tests
2014-04-29 17:17:49 -07:00
eae86b64f4
typo
2014-04-29 20:10:44 +08:00
f44d737e7e
Add more check on principalId
2014-04-29 09:34:48 +08:00
aa63d7bf4b
Convert principalId to String
2014-04-28 21:36:44 +08:00
b57c998ce2
Merge pull request #242 from strongloop/feature/fix-issue-239
...
Rename the method so that it won't conflict with Model.checkAccess
2014-04-24 10:27:18 -07:00
1676ac6e58
Fix constructor JSDoc
2014-04-23 15:20:18 -07:00
921e35954d
Rename the method so that it won't conflict with Model.checkAccess
...
See https://github.com/strongloop/loopback/issues/239
2014-04-21 11:13:03 -07:00
83e74ab414
Merge
2014-04-16 07:39:13 -07:00
Miroslav Bajtoš
Miroslav Bajtoš
Karl Mikkelsen
Raymond Feng
Samuel Reed
Raymond Feng
crandmck
Ritchie Martori
Adam Schwartz
haio
Ritchie Martori