Commit Graph

1728 Commits

Author SHA1 Message Date
Raymond Feng 4e1d8c9a4e Merge branch '1.x' into 2.0 2014-07-16 11:06:24 -07:00
Raymond Feng a28e5b5897 Enhance the error message 2014-07-16 11:04:23 -07:00
Raymond Feng ec297228bf Merge tag 'v1.10.0'
1.10.0
2014-07-16 09:28:02 -07:00
Raymond Feng 010cc38ec0 Merge branch 'release/1.10.0' into production 2014-07-16 09:27:54 -07:00
Raymond Feng ff9bc10c06 Bump version 2014-07-16 09:09:50 -07:00
Raymond Feng 79f504a3c7 Merge branch 'master' into 2.0 2014-07-16 09:09:07 -07:00
Raymond Feng 9125218eab Remove unused dep 2014-07-15 16:47:13 -07:00
Raymond Feng 7fe347763b Bump version and update deps 2014-07-15 16:44:09 -07:00
Raymond Feng 7b36196561 Merge pull request #362 from strongloop/feature/remoting-add-remove
Add a test case for hasMany through add/remove remoting
2014-07-15 16:15:27 -07:00
Raymond Feng 54b13f4feb Upgrade to loopback-datasource-juggler@1.7.0 2014-07-15 16:15:02 -07:00
Miroslav Bajtoš e18ee116c1 2.0.0-beta6 2014-07-15 20:53:03 +02:00
Miroslav Bajtoš b24d1e942b Merge pull request #374 from strongloop/fix-conflict-resolution
[2.0] Fix conflict resolution
2014-07-15 20:51:08 +02:00
Raymond Feng c5c28aa634 Merge pull request #368 from strongloop/feature/loopback-base-model
Refactor modelBuilder to registry and set up default model
2014-07-15 08:38:43 -07:00
Raymond Feng 3c13ce5a8f Refactor modelBuilder to registry and set up default model 2014-07-15 08:37:59 -07:00
Raymond Feng f4b1d00d4e Merge pull request #372 from strongloop/feature/cleanup-user-model
Feature/cleanup user model
2014-07-15 08:21:49 -07:00
Raymond Feng 76b6dc10d9 Add a test case for credentials/challenges 2014-07-15 08:20:47 -07:00
Miroslav Bajtoš da9b724222 lib/application: publish Change models to REST API
When a public model is added to an application and the model has change
tracking enabled, its Change model is added to the public models.

Before this change, conflict resolution in the browser was not working,
because it was not possible to fetch the remote change.
2014-07-15 09:31:16 +02:00
Miroslav Bajtoš 087c602669 models/change: fix typo 2014-07-15 09:14:54 +02:00
Raymond Feng 22e929e439 Fix credentials/challenges types
Associated identities and credentials are now captured by models in
loopback-component-passport. These two properties will be removed in
2.x.
2014-07-14 14:22:21 -07:00
Rand McKinney a071895723 Merge pull request #371 from strongloop/jsdocs-fix
Split out aliases for deleteById and destroyAll functions for jsdoc.
2014-07-14 14:02:34 -07:00
Raymond Feng 28edac9473 Update modules for examples 2014-07-11 23:31:13 -07:00
crandmck b5c47dc7a5 Split out aliases for deleteById and destroyAll functions for jsdoc. 2014-07-11 15:41:14 -07:00
Miroslav Bajtoš 555d48f4e0 Merge pull request #369 from strongloop/fix-replication
[2.0] checkpoint: fix `current()`
2014-07-11 22:05:04 +02:00
Miroslav Bajtoš 31ef6394b4 checkpoint: fix `current()`
Fix the query in `Checkpoint.current()` to correctly specify sorting
`seq DESC`. Before this change, the first checkpoint was returned as the
current one.
2014-07-11 17:07:22 +02:00
Raymond Feng f8ffd978cf Merge pull request #365 from strongloop/feature/login-email-verification
Add an option to honor emailVerified
2014-07-08 13:24:10 -07:00
Raymond Feng a98db0bf86 Remove unused deps 2014-07-08 08:55:06 -07:00
Raymond Feng 74a39f3fc2 Refactor email verification tests into a new group 2014-07-08 08:54:50 -07:00
Raymond Feng de831dbd33 Fix the typo 2014-07-08 08:54:13 -07:00
Raymond Feng 0c67b1e781 Add an option to honor emailVerified
See https://github.com/strongloop/loopback/pull/215
2014-07-07 14:09:45 -07:00
Raymond Feng 75076c5196 Update module list in README 2014-07-03 13:52:03 -07:00
Raymond Feng f649c92bcf Refine the test cases for relation REST APIs 2014-07-03 11:18:34 -07:00
Miroslav Bajtoš be48a504e0 2.0.0-beta5 2014-07-03 10:14:41 +02:00
Miroslav Bajtoš 9767b88e03 Merge pull request #363 from strongloop/feature/add-test-for-model-remote-methods
test: add check of Model remote methods
2014-07-03 08:50:07 +02:00
Miroslav Bajtoš f0cc5f7534 test: add check of Model remote methods
The test ensures that Model has all methods listed in docs:

http://docs.strongloop.com/display/LB/Exposing+models+over+a+REST+API

See also #359.
2014-07-03 08:19:41 +02:00
Raymond Feng 0525f2c896 Adjust the REST mapping for add/remove 2014-07-02 23:06:11 -07:00
Raymond Feng b221714b38 Add a test case for hasMany through add/remove remoting 2014-07-02 18:09:05 -07:00
Raymond Feng d8c3376417 Merge pull request #361 from strongloop/feature/fix-issue-333
Fix the typo and add Bearer token support
2014-07-02 11:18:02 -07:00
Raymond Feng 217c9fa348 Fix the typo and add Bearer token support
See https://github.com/strongloop/loopback/issues/333
2014-07-02 09:02:13 -07:00
Raymond Feng 88a668cfe5 Update README 2014-07-01 10:14:39 -07:00
Raymond Feng 94892288b8 Merge pull request #358 from tsertkov/docs/token
Fix misleading token middleware documentation
2014-07-01 08:18:28 -07:00
Aleksandr Tsertkov 476dd8214d Fix misleading token middleware documentation
Signed-off-by: Aleksandr Tsertkov <tsertkov@gmail.com>
2014-07-01 16:59:49 +02:00
Miroslav Bajtoš 8ea11ea955 Merge branch 'master' into 2.0
Land the pull request #357
> app: update `url` on `listening` event
2014-07-01 16:18:00 +02:00
Miroslav Bajtoš 6a8a918166 Merge pull request #357 from strongloop/feature/set-url-on-app-listening
app: update `url` on `listening` event
2014-07-01 16:17:26 +02:00
Miroslav Bajtoš dfa8d7f49f app: update `url` on `listening` event
Most applications report the URL when started (at least the apps we
are scaffolding using loopback-workspace). Constructing the URL in the
loopback core allows us to simplify the templates and reduce the amount
of repeated code.
2014-07-01 14:27:02 +02:00
Miroslav Bajtoš 10d29c7d86 Merge branch 'master' into 2.0
Conflicts:
	package.json
2014-06-27 10:36:06 +02:00
Miroslav Bajtoš 1d0ece01e7 Merge tag 'v1.9.1'
v1.9.1
2014-06-27 10:26:23 +02:00
Miroslav Bajtoš 7e670c85c9 Merge branch 'release/1.9.1' into production 2014-06-27 10:26:15 +02:00
Miroslav Bajtoš 57060ec4c1 v1.9.1 2014-06-27 10:25:47 +02:00
Miroslav Bajtoš 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
Miroslav Bajtoš a976481adb Merge pull request #351 from globocom/fix/registry-memory
Fix ReferenceError: loopback is not defined in registry.memory().
2014-06-26 15:43:16 +02:00