Commit Graph

281 Commits

Author SHA1 Message Date
Miroslav Bajtoš d8b298b53d Merge pull request #158 from svennam92/patch-1
Bluemix favors PORT over VCAP_APP_PORT
2015-12-04 17:05:31 +01:00
Sai Vennam de6ebf65ee Bluemix prefers HOST/PORT over VCAP_APP_XXXX 2015-12-03 13:29:58 -05:00
Miroslav Bajtoš 4e3e1a7394 Merge pull request #164 from strongloop/set-app-env
Set app env if it is supplied in options object
2015-12-02 16:38:54 +01:00
Amir Jafarian 2574c9dbb6 Set app env if it is supplied in options object
Set the app env if it is supplied in options object which solves issue
number 28 under loopback-boot repo
2015-11-30 10:30:09 -05:00
Miroslav Bajtoš 088ca864c2 2.14.2
* executor: preserve RegExps in middleware paths (Miroslav Bajtoš)
2015-11-24 18:53:48 +01:00
Miroslav Bajtoš 5f0175afbf Merge pull request #159 from strongloop/fix/interpolate-regexp
executor: preserve RegExps in middleware paths
2015-11-24 18:53:17 +01:00
Miroslav Bajtoš a023e1f142 2.14.1
* Warn user if missing a config file (Amir Jafarian)
 * Refer to licenses with a link (Sam Roberts)
2015-11-24 14:15:56 +01:00
Miroslav Bajtoš c17efda0eb Merge pull request #162 from Amir-61/missingConfigWarning
Warn about missing main json config file
2015-11-24 14:07:53 +01:00
Amir Jafarian 3f55acf9d5 Warn user if missing a config file
Report a warning when the main json file is missing and there is a
local or {env} file present
2015-11-23 13:34:19 -05:00
Miroslav Bajtoš 1d27cf0e05 executor: preserve RegExps in middleware paths
Fix interpolateVariables() to skip objects with a non-default
constructor, for example RegExp or Date.
2015-11-04 15:47:55 +01:00
Sam Roberts 24fbfbebf1 Refer to licenses with a link 2015-11-03 12:27:49 -08:00
Miroslav Bajtoš 638368844d 2.14.0
* Support bluemix env variables for host and port (Miroslav Bajtoš)
2015-10-14 11:20:30 +02:00
Miroslav Bajtoš 5238bc1027 Merge pull request #156 from strongloop/feature/bluemix-env
Support bluemix environment variables for host and port
2015-10-14 11:18:45 +02:00
Miroslav Bajtoš c8fdbd5110 Support bluemix env variables for host and port
Detect Bluemix/CouldFoundry environment and automatically apply
VCAP_APP_PORT and VCAP_APP_HOST settings.
2015-10-09 13:21:38 -07:00
Miroslav Bajtoš 63589c03ab 2.13.0
* add env folder for boot (yorkie)
 * Use strongloop conventions for licensing (Sam Roberts)
2015-10-01 19:19:10 +02:00
Miroslav Bajtoš fbafa2b608 Merge pull request #154 from weflex/add/env-boot
add env postifix to boot
2015-10-01 18:11:24 +02:00
yorkie d249b15ce0 add env folder for boot 2015-09-29 12:31:46 +08:00
Sam Roberts d1b00ce5d8 Use strongloop conventions for licensing 2015-09-21 16:42:54 -07:00
Miroslav Bajtoš 6ef37ef651 2.12.2
* test: fix strict mode failure (Ryan Graham)
2015-09-09 13:39:21 +02:00
Miroslav Bajtoš 819e1ea9c8 Merge pull request #155 from strongloop/fix-build
test: fix strict mode failure
2015-09-09 13:27:42 +02:00
Ryan Graham a5bc1056aa test: fix strict mode failure
Since the value is undefined at the this point, just remove it so that
linters and strict mode don't cause the entire test suite to abort.
2015-09-08 17:30:30 -07:00
Simon Ho 55c87796cf 2.12.1
* Add config variable checks (Simon Ho)
2015-08-31 23:22:50 -07:00
Simon Ho 7cbb8f6b40 Merge pull request #152 from strongloop/bug/add-config-var-checks
Add config variable checks
2015-08-31 20:15:57 -07:00
Simon Ho 43042905af Add config variable checks
- Check for config variables defined as functions
- Check for config variables that are undefined
2015-08-31 17:53:27 -07:00
Miroslav Bajtoš f0aa0f8fdb 2.12.0
* Resolve ${var} values in component-config.json (Hage Yaapa)
 * Resolve ${var} values in middleware.json (Hack Sparrow)
 * Upgrade Travis to container-based infrastructure (Miroslav Bajtoš)
2015-08-28 19:06:22 +02:00
Miroslav Bajtoš 26a50137c7 Merge pull request #151 from hacksparrow/feature/declarative-loopback-explorer
Resolve ${var} values in component-config.json
2015-08-28 09:48:41 +02:00
Hage Yaapa 1b491dee85 Resolve ${var} values in component-config.json
App variables can now be specified in component-config.json using
the ${var} format. The value of var is looked up using app.get().

This allows loopback explorer and other loopback components which
require app variables, to be loaded declaratively using
component-config.json.
2015-08-28 11:49:46 +05:30
Miroslav Bajtoš 0b0f0ed202 Merge pull request #149 from hacksparrow/feature/declarative-loopback-rest
Resolve ${var} values in middleware.json
2015-08-25 15:32:42 +02:00
Hack Sparrow 8b475a97b2 Resolve ${var} values in middleware.json
App variables can now be specified in middleware.json using the ${var}
format. The value of var is looked up using app.get().

This allows loopback.rest and other loopback middleware which require
app variables, to be loaded declaratively using middleware.json.
2015-08-25 18:42:47 +05:30
Miroslav Bajtoš 75c945effa Merge pull request #150 from strongloop/fix/travis-config
Upgrade Travis to container-based infrastructure
2015-08-24 15:43:31 +02:00
Miroslav Bajtoš f6dfbd2625 Upgrade Travis to container-based infrastructure
See http://docs.travis-ci.com/user/migrating-from-legacy/ for details.
2015-08-24 15:35:56 +02:00
Raymond Feng 674a8da693 2.11.0
* Allow middleware array merge by a key in item objects (Raymond Feng)
2015-08-11 08:33:58 -07:00
Raymond Feng 8864e2b394 Merge pull request #148 from strongloop/feature/more-middleware-merge
Allow middleware array merge by a key in item objects
2015-08-11 08:16:44 -07:00
Raymond Feng b081d828b2 Allow middleware array merge by a key in item objects 2015-08-10 17:17:09 -07:00
Raymond Feng be3997de15 2.10.0
* Enhance middleware config merge (Raymond Feng)
2015-08-10 08:02:30 -07:00
Raymond Feng 32276c79d4 Merge pull request #147 from strongloop/feature/enhance-middleware-merge
Enhance middleware config merge
2015-08-10 07:55:31 -07:00
Raymond Feng 7362cc489e Enhance middleware config merge 2015-08-07 15:53:28 -07:00
Raymond Feng 952c4101ef 2.9.0
* Fix the build failure (Raymond Feng)

 * Fix the model-config/datasource merge (Raymond Feng)

 * Resolved style issue (Dennis Ashby)

 * Added code to allow model-config to respect model-config.local.js and model-config.env.js as do other config files. (Dennis Ashby)

 * Add jsdoc for `options.mixinSources` (Miroslav Bajtoš)

 * allow middleware to be optional (Hage Yaapa)
2015-08-03 07:47:10 -07:00
Raymond Feng e052da83db Merge pull request #143 from strongloop/dashby3000-master
Fix & Merge https://github.com/strongloop/loopback-boot/pull/141
2015-08-03 07:45:48 -07:00
Raymond Feng 450aa6dd21 Merge branch 'master' of github.com:strongloop/loopback-boot into dashby3000-master 2015-07-31 13:45:23 -07:00
Raymond Feng 329fc59113 Fix the build failure 2015-07-31 10:02:16 -07:00
Raymond Feng 02c826337c Fix the model-config/datasource merge 2015-07-31 10:01:53 -07:00
Dennis Ashby ab723b5490 Resolved style issue 2015-07-31 06:29:03 -07:00
Dennis Ashby 41af081c55 Added code to allow model-config to respect model-config.local.js and model-config.env.js as do other config files. 2015-07-25 09:56:28 -07:00
Miroslav Bajtoš 4f6e768426 Merge pull request #139 from strongloop/fix/jsdoc-mixinSources
Add jsdoc for `options.mixinSources`
2015-07-03 09:42:19 +02:00
Miroslav Bajtoš 6980a250ef Add jsdoc for `options.mixinSources` 2015-06-30 18:07:22 +02:00
Miroslav Bajtoš ac5265f726 Merge pull request #134 from hacksparrow/master
allow middleware to be optional

Close #134
2015-06-25 19:33:03 +02:00
Hage Yaapa 66cc099d1d allow middleware to be optional 2015-06-25 19:32:40 +02:00
Miroslav Bajtoš 0aac03ebb5 2.8.2
* Excl. mod. main path from middleware instructions (Miroslav Bajtoš)
2015-06-24 19:00:42 +02:00
Miroslav Bajtoš 5c8334c7c7 Merge pull request #136 from strongloop/fix/omit-middleware-main-module-file
Excl. mod. main path from middleware instructions
2015-06-24 19:00:15 +02:00