38c4944e2e
Merge pull request #54 from strongloop/feature/support-nested-values-in-config-overrides
...
Support nested values in config overrides
2014-10-09 19:33:13 +02:00
0d4b5bb7c4
Merge pull request #43 from johnsoftek/master
...
Custom rootDir for app config
Close #43
2014-10-09 16:36:31 +02:00
d54e2b54d0
Clean up jsdoc comments.
...
- Fix formatting to improve the way how the text is rendered on
http://apidocs.strongloop.com/loopback-boot/
- Add `@property` entry for `options.appConfigRootDir`.
2014-10-09 16:36:19 +02:00
18121a4208
Custom rootDir for app config
2014-10-09 16:36:19 +02:00
f0836719c9
compiler: improve merging of Arrays and Objects
...
Add more unit-tests to cover various edge cases. Fix issues discovered
by these new tests.
2014-10-08 17:15:32 +02:00
e1d870dced
config-loader: deeply merge Array and Object vals
2014-10-08 17:15:32 +02:00
abda37fee9
gitignore: add Idea's *.iml files
2014-10-08 17:15:30 +02:00
ac73288cef
Merge pull request #51 from strongloop/feature/fix-jshint-problems
...
package: Add `jshint` to `devDependencies`
2014-10-08 15:06:19 +02:00
ed0880d00f
package: Add `jshint` to `devDependencies`
...
Remove dependency on a globally installed jshint instance
and fix `npm test` on machines without a global jshint.
2014-10-08 12:09:16 +02:00
e974033395
Update contribution guidelines
...
Replace commit signing process with https://cla.strongloop.com/
2014-10-01 18:06:20 -07:00
6c26e99ab9
Merge pull request #36 from strongloop/feature/fix-CI-build
...
test: fix failures on CI
2014-08-19 19:37:39 +02:00
0169f22cd0
test: ensure sandbox dir is present
...
Fix test/browser.test.js failing on CI due to sandbox dir not present
on the first run.
2014-08-19 09:26:57 +02:00
34de593202
test: add `global.navigator` for browser tests
...
The debug module uses `navigator.userAgent` to detect whether the
browser support colors in console logs.
2014-08-18 14:56:20 +02:00
93bfc3a63a
test: increase timeout for browserify
2014-08-18 14:35:19 +02:00
edb1f1fdce
index: fix jshint error
...
Wrap a too long line in a jsdoc comment.
2014-08-18 14:26:11 +02:00
20ed867d79
Merge pull request #34 from cajoy/master
...
documentation fix
2014-08-07 08:23:37 -07:00
1ae0167b7c
documentation fix
2014-08-07 10:12:35 -04:00
51cf0052d0
Merge pull request #31 from fabien/fix/compile-options
...
Implemented modelSources, bootDirs and bootScripts options
2014-08-04 08:42:45 -07:00
217f0ce32f
Fix typo
2014-08-04 10:35:13 +02:00
f98d2cb89c
Implemented modelSources, bootDirs and bootScripts options
2014-08-04 10:33:03 +02:00
bc233e83d3
Merge tag 'v2.0.0'
...
2.0.0
2014-07-22 19:34:28 +02:00
4d55ab82aa
Merge branch 'release/2.0.0' into production
2014-07-22 19:34:24 +02:00
5471129f79
2.0.0
2014-07-22 19:34:01 +02:00
e2092bba17
Merge pull request #26 from strongloop/feature/simplify-model-fn-signature
...
executor: remove `Base` arg from model function
2014-07-22 19:28:05 +02:00
c4b09c6b7a
executor: remove `Base` arg from model function
...
Simplify the contract for functions exported by `models/*.js` files
by removing the second argument `Base`. The base class can be accessed
using `ModelCtor.base`.
An updated example of a model js file:
```js
module.exports = function(Customer) {
Customer.setup = function() {
Customer.base.setup.apply(this, arguments);
// etc.
};
};
```
2014-07-22 10:59:50 +02:00
b5989e907e
package: update dependency versions
2014-07-22 10:57:44 +02:00
e42ee20d00
Merge tag 'vv2.0.0-beta3'
...
v2.0.0-beta3
2014-07-17 19:01:19 +02:00
be74e7c1ec
Merge branch 'release/v2.0.0-beta3' into production
2014-07-17 19:01:16 +02:00
eac6cdf645
v2.0.0-beta3
2014-07-17 19:00:55 +02:00
6bf995c55b
compiler: return a clone of instructions
...
When executor passes the instruction to loopback methods,
loopback modifies the data. Since we are loading the data using
`require` such changes affects also code that calls
`require` for one of the instructions files.
This change adds a deep clone step to prevent this issue.
2014-07-17 18:44:15 +02:00
cb67fc4165
Merge tag 'v2.0.0-beta2'
...
2.0.0-beta2
2014-07-17 09:05:54 -07:00
85c40c635a
Merge branch 'release/2.0.0-beta2' into production
2014-07-17 09:05:46 -07:00
9493aca34e
Merge pull request #23 from strongloop/feature/fix-unit-tests
...
test: export Int32Array and DataView for browser
2014-07-17 09:03:13 -07:00
e7250b6eac
test: export Int32Array and DataView for browser
...
crypto-browserify uses Int32Array, which is not exposed on the VM
context in Node v0.10.
2014-07-17 10:05:08 +02:00
2bcf1f60aa
Merge tag 'v2.0.0-beta2'
...
v2.0.0-beta2
2014-07-16 08:21:54 +02:00
431bdc9b18
Merge branch 'release/2.0.0-beta2' into production
2014-07-16 08:21:46 +02:00
53ca2f697a
v2.0.0-beta2
2014-07-16 08:21:16 +02:00
cfe5f40808
Merge pull request #19 from strongloop/feature/rename-models-to-models-config
...
Rename `models.json` to `model-config.json`
2014-07-15 20:46:47 +02:00
3129f6495c
Rename `models.json` to `model-config.json`
...
The name `models.json` was potentially confusing since there are no
models defined in that file.
2014-07-15 11:09:39 +02:00
3522f117c0
Merge pull request #18 from strongloop/doc-changes
...
Doc changes
2014-07-09 07:39:02 +02:00
25704cf69a
Remove non-API docs.
...
- Remove material that's in Confluence.
- Change function name to boot()
- Create header-node.md and header-browser.md
2014-07-09 07:36:45 +02:00
5e142c5188
Merge tag 'v2.0.0-beta1'
...
2.0.0-beta1
2014-06-26 14:56:34 +02:00
fc18561cc7
Merge branch 'release/2.0.0-beta1' into production
2014-06-26 14:56:29 +02:00
5e23db50a5
2.0.0-beta1
2014-06-26 14:56:02 +02:00
f222be477e
Merge pull request #17 from strongloop/feature/fix-executor
...
Fix references to loopback; fix jshint warnings
2014-06-26 14:54:42 +02:00
92455f569c
test: fix jshint warnings
2014-06-26 14:54:07 +02:00
a3c347d073
compiler: fix references to loopback
2014-06-26 14:53:47 +02:00
d5cd0a3b50
Merge branch 'master' into 2.0
...
Conflicts:
README.md
docs/configuration.md
lib/executor.js
package.json
Changes in the docs were merged manually and updated to correctly
describe the 2.x layout.
2014-06-26 14:40:24 +02:00
af9c4d8cc6
Merge tag 'v1.1.0'
...
1.1.0
2014-06-26 11:00:26 +02:00
c70b8ac413
Merge branch 'release/1.1.0' into production
2014-06-26 11:00:19 +02:00
Miroslav Bajtoš
Miroslav Bajtoš
johnsoftek
Shelby Sanders
Ryan Graham
Raymond Feng
Alex
Fabien Franzen
Raymond Feng
Rand McKinney