diff --git a/.travis.yml b/.travis.yml index b6ebc61242..ce45c310ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,13 @@ language: node_js sudo: false node_js: - - 0.10 - 0.12 - 4 + - 5 # NodeJS v4 requires gcc 4.8 +matrix: + allow_failures: + - node_js: 5 env: - NODE_ENV=travis CXX="g++-4.8" CC="gcc-4.8" services: @@ -38,8 +41,3 @@ notifications: on_success: change # options: [always|never|change] default: always on_failure: always # options: [always|never|change] default: always on_start: never # options: [always|never|change] default: always -cache: - apt: true - directories: - - node_modules/ - - public/lib/ diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000000..764c462124 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,488 @@ + +## 0.4.2 (2015-11-11) + + +* bug(readme): Remove Broken Live Demo Link ([9bfb312](https://github.com/meanjs/mean/commit/9bfb312)) +* test(travis): Add Testing for Node 5 ([eafad77](https://github.com/meanjs/mean/commit/eafad77)) +* [bug] Dont use Cache ([3db8709](https://github.com/meanjs/mean/commit/3db8709)) +* [bug] Gulp test wasn't running server tests ([2131ccd](https://github.com/meanjs/mean/commit/2131ccd)) +* [bug] Seed Password's strength [Closes #908] ([1095131](https://github.com/meanjs/mean/commit/1095131)), closes [#908](https://github.com/meanjs/mean/issues/908) +* [doc] Add seed user instructions to README ([927855f](https://github.com/meanjs/mean/commit/927855f)) +* [docs] Changelog ([892d9bf](https://github.com/meanjs/mean/commit/892d9bf)) +* [docs] Information about Contributing ([5a4fe5a](https://github.com/meanjs/mean/commit/5a4fe5a)) +* [hotfix] Fixes db seed password bug ([1c7d742](https://github.com/meanjs/mean/commit/1c7d742)) +* [hotfix] SeedDB missing in env config ([28f1f57](https://github.com/meanjs/mean/commit/28f1f57)) +* Add ESLint support ([d5cc4b7](https://github.com/meanjs/mean/commit/d5cc4b7)) +* Added Ruby and Sass to requirements with install directions ([cec3e1f](https://github.com/meanjs/mean/commit/cec3e1f)) +* Added short Gulp Section to Intro ([1a3d3c1](https://github.com/meanjs/mean/commit/1a3d3c1)) +* adding ability to configure session.secret in local env config ([2eb0b09](https://github.com/meanjs/mean/commit/2eb0b09)) +* Adding another job for Travis CI to run the `grunt coverage` task on every build ([c6e0f68](https://github.com/meanjs/mean/commit/c6e0f68)) +* adding caching for packages and npm modules across builds. Also setting sudo to false as it's not us ([97d7eb7](https://github.com/meanjs/mean/commit/97d7eb7)) +* adding karma coverage for grunt ([c2b13b9](https://github.com/meanjs/mean/commit/c2b13b9)) +* Adding MEAN.JS version information as part of the startup info when app loads ([58b371b](https://github.com/meanjs/mean/commit/58b371b)) +* adding more API tests ([eb7c4f8](https://github.com/meanjs/mean/commit/eb7c4f8)) +* adding protractor options to fix travis failing ([83eb2dc](https://github.com/meanjs/mean/commit/83eb2dc)) +* adding return done() to tests ([b07af94](https://github.com/meanjs/mean/commit/b07af94)) +* adding route tests for user/admin CRUD operations ([de354ee](https://github.com/meanjs/mean/commit/de354ee)) +* adding stronger password requirements for improving security based on OWASP ([1fd6bb6](https://github.com/meanjs/mean/commit/1fd6bb6)) +* Adding support for meanjs-version specific configuration option and displaying both MEAN.JS project ([a12746e](https://github.com/meanjs/mean/commit/a12746e)) +* adding support for nodejs v4 and allowing it to fail without failing the complete build for CI ([0302a76](https://github.com/meanjs/mean/commit/0302a76)) +* adding tests for directives ([6514044](https://github.com/meanjs/mean/commit/6514044)) +* adding tests for meanjs core server functionality ([6f8b5bf](https://github.com/meanjs/mean/commit/6f8b5bf)) +* adding the required support to properly build the nodejs v4 edition ([b7a57ab](https://github.com/meanjs/mean/commit/b7a57ab)) +* Changed favicon string to env variable ([5af083c](https://github.com/meanjs/mean/commit/5af083c)) +* Dummy config directory for the articles module to make it easier for developers to understand and re ([903b4ca](https://github.com/meanjs/mean/commit/903b4ca)) +* Duplicate CRUD Test - Profile Picture ([a871c92](https://github.com/meanjs/mean/commit/a871c92)) +* Enable log options for Morgan ([8cd2291](https://github.com/meanjs/mean/commit/8cd2291)) +* Fail Build on Node 4 ([c8672a5](https://github.com/meanjs/mean/commit/c8672a5)) +* Favicon invalid path ([e6a5732](https://github.com/meanjs/mean/commit/e6a5732)) +* Fix redirection to previous state after required authentication ([2b8bee0](https://github.com/meanjs/mean/commit/2b8bee0)) +* Fix typo ([be36823](https://github.com/meanjs/mean/commit/be36823)) +* fixed bug #923 - making password reset links work for both http and https configuration ([b824ebc](https://github.com/meanjs/mean/commit/b824ebc)), closes [#923](https://github.com/meanjs/mean/issues/923) +* fixes #898 - addressing the issue where the webhook API is hard-coded into the travis config file ([70e83ff](https://github.com/meanjs/mean/commit/70e83ff)), closes [#898](https://github.com/meanjs/mean/issues/898) +* fixing grunt and gulp e2e tests ([fdf1ad5](https://github.com/meanjs/mean/commit/fdf1ad5)) +* fixing jshint issues by requiring single quotes ([a38abd0](https://github.com/meanjs/mean/commit/a38abd0)) +* Fixing jshint issues with grunt, gulp, and reset-password script. ([1f79770](https://github.com/meanjs/mean/commit/1f79770)) +* fixing spacing ([96bcd6d](https://github.com/meanjs/mean/commit/96bcd6d)) +* Format code according to ESLint rules ([0323696](https://github.com/meanjs/mean/commit/0323696)) +* Formatting and Indentation ([75cf745](https://github.com/meanjs/mean/commit/75cf745)) +* Global Mocha timeout ([037878b](https://github.com/meanjs/mean/commit/037878b)) +* Link for download link (NodeJs download) ([c83eefa](https://github.com/meanjs/mean/commit/c83eefa)) +* Lock mongoose version to a working version ([64916dd](https://github.com/meanjs/mean/commit/64916dd)) +* Logger Development config default ([99fe989](https://github.com/meanjs/mean/commit/99fe989)) +* Merge pull request #1000 from tatethurston/docs/requirements ([27ce914](https://github.com/meanjs/mean/commit/27ce914)) +* Merge pull request #1001 from ilanbiala/node-pre-gyp ([9795cc0](https://github.com/meanjs/mean/commit/9795cc0)), closes [#938](https://github.com/meanjs/mean/issues/938) +* Merge pull request #1002 from codydaig/docs/contributing-docs ([eb8d819](https://github.com/meanjs/mean/commit/eb8d819)) +* Merge pull request #1004 from lirantal/feature/travis-webhooks-as-env-variables ([71cc173](https://github.com/meanjs/mean/commit/71cc173)) +* Merge pull request #1006 from zeldar/gulpdocs#741 ([aa5f12b](https://github.com/meanjs/mean/commit/aa5f12b)) +* Merge pull request #1008 from codydaig/nocache ([4dc0f30](https://github.com/meanjs/mean/commit/4dc0f30)) +* Merge pull request #1009 from codydaig/bug/mongoose ([c2a86e0](https://github.com/meanjs/mean/commit/c2a86e0)) +* Merge pull request #1019 from mleanos/logger-default-stdout ([1ddd364](https://github.com/meanjs/mean/commit/1ddd364)) +* Merge pull request #1020 from codydaig/updateMongoose ([afd93b4](https://github.com/meanjs/mean/commit/afd93b4)) +* Merge pull request #1022 from codydaig/docs/changelog3 ([3165351](https://github.com/meanjs/mean/commit/3165351)) +* Merge pull request #1025 from mleanos/seeddb-missing-config ([860f7ce](https://github.com/meanjs/mean/commit/860f7ce)) +* Merge pull request #1026 from jloveland/jshint-issues-missed ([d7d1d64](https://github.com/meanjs/mean/commit/d7d1d64)) +* Merge pull request #1027 from rodp82/master ([c2f0d18](https://github.com/meanjs/mean/commit/c2f0d18)) +* Merge pull request #1028 from mleanos/duplicate-test-profile-picture ([1cd909a](https://github.com/meanjs/mean/commit/1cd909a)) +* Merge pull request #1039 from ryanjbaxter/bluemix-mongo-changes ([61ea25c](https://github.com/meanjs/mean/commit/61ea25c)) +* Merge pull request #1042 from codydaig/test/node5 ([829a7de](https://github.com/meanjs/mean/commit/829a7de)) +* Merge pull request #1043 from codydaig/bug/liveexample ([23cad18](https://github.com/meanjs/mean/commit/23cad18)) +* Merge pull request #801 from codydaig/docs/pull793 ([fe0d106](https://github.com/meanjs/mean/commit/fe0d106)) +* Merge pull request #878 from jloveland/owasp-password-strength ([5c16db2](https://github.com/meanjs/mean/commit/5c16db2)) +* Merge pull request #886 from lirantal/feature/travis-ci-enable-coverage-task ([522cc6b](https://github.com/meanjs/mean/commit/522cc6b)) +* Merge pull request #887 from lirantal/feature/app-startup-version-number ([d1a9119](https://github.com/meanjs/mean/commit/d1a9119)) +* Merge pull request #890 from lirantal/feature/article-module-dummy-config-dir ([bd1a7d7](https://github.com/meanjs/mean/commit/bd1a7d7)) +* Merge pull request #891 from codydaig/bug/gulphang ([48b1a9c](https://github.com/meanjs/mean/commit/48b1a9c)), closes [#873](https://github.com/meanjs/mean/issues/873) +* Merge pull request #893 from lirantal/feature/seeddb-refactor-users ([fba6eb7](https://github.com/meanjs/mean/commit/fba6eb7)) +* Merge pull request #901 from igorauad/fixRedirection ([5901b17](https://github.com/meanjs/mean/commit/5901b17)) +* Merge pull request #904 from jloveland/jshint-single-quotes ([cc80930](https://github.com/meanjs/mean/commit/cc80930)) +* Merge pull request #906 from lirantal/feature/travis-add-node-v4 ([be3622b](https://github.com/meanjs/mean/commit/be3622b)) +* Merge pull request #909 from codydaig/patch-1 ([03da3ee](https://github.com/meanjs/mean/commit/03da3ee)), closes [#908](https://github.com/meanjs/mean/issues/908) +* Merge pull request #910 from jloveland/hide-password-validator ([cc486d5](https://github.com/meanjs/mean/commit/cc486d5)) +* Merge pull request #911 from simonlinj/patch-1 ([3e69385](https://github.com/meanjs/mean/commit/3e69385)) +* Merge pull request #917 from simison/patch-13 ([8cbbb35](https://github.com/meanjs/mean/commit/8cbbb35)) +* Merge pull request #921 from mleanos/dbseed-user-passwords ([b800141](https://github.com/meanjs/mean/commit/b800141)) +* Merge pull request #922 from lirantal/feature/travis-add-node-v4-gcc-update ([3cfd978](https://github.com/meanjs/mean/commit/3cfd978)) +* Merge pull request #924 from lirantal/bugfix/923-ssl-support-for-password-reset ([cdd6a79](https://github.com/meanjs/mean/commit/cdd6a79)), closes [#923](https://github.com/meanjs/mean/issues/923) +* Merge pull request #925 from lirantal/bugfix/user-route-tests-typos ([0a91e34](https://github.com/meanjs/mean/commit/0a91e34)) +* Merge pull request #927 from jloveland/local-session-secret ([28ae5d6](https://github.com/meanjs/mean/commit/28ae5d6)) +* Merge pull request #928 from lirantal/feature/user-route-tests-improve ([658ac8d](https://github.com/meanjs/mean/commit/658ac8d)) +* Merge pull request #937 from lirantal/feature/seeddb-refactoring ([7fcd4f2](https://github.com/meanjs/mean/commit/7fcd4f2)) +* Merge pull request #939 from jloveland/e2e-tests-fix ([7a9ee53](https://github.com/meanjs/mean/commit/7a9ee53)), closes [#929](https://github.com/meanjs/mean/issues/929) +* Merge pull request #944 from SibuStephen/patch-1 ([1b22b7c](https://github.com/meanjs/mean/commit/1b22b7c)) +* Merge pull request #948 from gustavodemari/update-multer-profile-upload ([63d0d71](https://github.com/meanjs/mean/commit/63d0d71)), closes [#947](https://github.com/meanjs/mean/issues/947) +* Merge pull request #956 from mleanos/mocha-test-suite-timeouts ([3ff893a](https://github.com/meanjs/mean/commit/3ff893a)), closes [#955](https://github.com/meanjs/mean/issues/955) +* Merge pull request #957 from mleanos/seeddb-enhance-testability ([e30c3d1](https://github.com/meanjs/mean/commit/e30c3d1)) +* Merge pull request #959 from lirantal/feature/user-route-tests-improve-3 ([4586c29](https://github.com/meanjs/mean/commit/4586c29)) +* Merge pull request #967 from mleanos/user-model-validate-bug ([19aea2f](https://github.com/meanjs/mean/commit/19aea2f)), closes [#966](https://github.com/meanjs/mean/issues/966) +* Merge pull request #968 from jloveland/e2e-test-error ([3454cf8](https://github.com/meanjs/mean/commit/3454cf8)) +* Merge pull request #971 from jloveland/session-tests-return ([9c78c63](https://github.com/meanjs/mean/commit/9c78c63)) +* Merge pull request #972 from mleanos/mocha-global-timeout-grunt ([8a12f76](https://github.com/meanjs/mean/commit/8a12f76)) +* Merge pull request #980 from codydaig/patch-1 ([7406b2d](https://github.com/meanjs/mean/commit/7406b2d)) +* Merge pull request #985 from jloveland/karma-coverage ([76e11e4](https://github.com/meanjs/mean/commit/76e11e4)) +* Merge pull request #987 from mleanos/favicon-path-bug ([3a4c51a](https://github.com/meanjs/mean/commit/3a4c51a)), closes [#979](https://github.com/meanjs/mean/issues/979) +* Merge pull request #990 from ilanbiala/eslint ([1729db3](https://github.com/meanjs/mean/commit/1729db3)), closes [#763](https://github.com/meanjs/mean/issues/763) +* Merge pull request #991 from ilanbiala/formatting-fixes ([52f94a2](https://github.com/meanjs/mean/commit/52f94a2)) +* Merge pull request #993 from jloveland/e2e-fail-travis ([7509074](https://github.com/meanjs/mean/commit/7509074)) +* Merge pull request #999 from mleanos/morgan-logger-config ([a6b3f14](https://github.com/meanjs/mean/commit/a6b3f14)) +* Mocha test timeouts [fixes #955] ([3b375e6](https://github.com/meanjs/mean/commit/3b375e6)), closes [#955](https://github.com/meanjs/mean/issues/955) +* refactoring the seeddb logic to work with promises all over due to all the async behavior ([9886093](https://github.com/meanjs/mean/commit/9886093)) +* Refactoring the seeded user objects to be easily maintained ([05f9053](https://github.com/meanjs/mean/commit/05f9053)) +* removing keepAlive conf to fail travis if e2e tests fail ([70d7e17](https://github.com/meanjs/mean/commit/70d7e17)) +* renaming strength meter, hiding when password field is empty, and refactoring directives to use $va ([f733efb](https://github.com/meanjs/mean/commit/f733efb)) +* Repeating Characters condition ([3d37e20](https://github.com/meanjs/mean/commit/3d37e20)) +* Seed options - logResults ([0560062](https://github.com/meanjs/mean/commit/0560062)) +* Solves User model validation bug ([288f0b4](https://github.com/meanjs/mean/commit/288f0b4)) +* Switched to using new MongoDB service in Bluemix since MongoLabs is being removed ([7340e68](https://github.com/meanjs/mean/commit/7340e68)) +* Synchronous tests ([32e0d12](https://github.com/meanjs/mean/commit/32e0d12)) +* Update Bower manifest ([08c0732](https://github.com/meanjs/mean/commit/08c0732)) +* Update Mongoose Version ([09bc727](https://github.com/meanjs/mean/commit/09bc727)) +* Update package.json ([2ab02b7](https://github.com/meanjs/mean/commit/2ab02b7)) +* updating .travis.yml file for allowing builds to fail ([984e168](https://github.com/meanjs/mean/commit/984e168)) +* updating comments for tests in code ([1eddc47](https://github.com/meanjs/mean/commit/1eddc47)) +* updating profile upload with a new version of multer ([7ecf933](https://github.com/meanjs/mean/commit/7ecf933)) +* updating travis to support installing a local mail server ([0017886](https://github.com/meanjs/mean/commit/0017886)) + + +## 0.4.1 (2015-09-03) + + +* [docs] Contributing.md ([ef7ce74](https://github.com/meanjs/mean/commit/ef7ce74)) +* [fix] Empty Chat Messages ([8128570](https://github.com/meanjs/mean/commit/8128570)) +* [fix] Install ruby and SASS with Docker ([814b856](https://github.com/meanjs/mean/commit/814b856)) +* [fix] Was storing a 6 char password in plain text [fixes #829] ([5c287f5](https://github.com/meanjs/mean/commit/5c287f5)), closes [#829](https://github.com/meanjs/mean/issues/829) +* [test] Allow an email with sub domains ([74f58bb](https://github.com/meanjs/mean/commit/74f58bb)) +* 0.4.1 ([834555c](https://github.com/meanjs/mean/commit/834555c)) +* Added Deploy To Bluemix button to the README ([2892fe3](https://github.com/meanjs/mean/commit/2892fe3)) +* Added missing /client/ path ([195cbe5](https://github.com/meanjs/mean/commit/195cbe5)) +* Adding coverage report for server-side tests using istanbul ([7252032](https://github.com/meanjs/mean/commit/7252032)) +* adding ordered cipher list, stronger settings in generate-ssl-certs script, and hsts settings ([4949bdd](https://github.com/meanjs/mean/commit/4949bdd)) +* Adding suite of tests for the e-mail validation field in the users model ([89050d5](https://github.com/meanjs/mean/commit/89050d5)) +* adding support for a configurable ssl-mode and and ssl cert/key files in the environment configurati ([384fb7d](https://github.com/meanjs/mean/commit/384fb7d)) +* Adding support for configurable session expiration time ([0aa5e68](https://github.com/meanjs/mean/commit/0aa5e68)) +* adding support for coveralls integration for mean.js to report live project code coverage informatio ([7c286b0](https://github.com/meanjs/mean/commit/7c286b0)) +* Adding support for sessionKey configuration parameter to allow to easily change the session key that ([360c3a4](https://github.com/meanjs/mean/commit/360c3a4)) +* Adding the NSP tool to audit our packages version for known security vulnerabilities as part of the ([e1d69b8](https://github.com/meanjs/mean/commit/e1d69b8)) +* Admin Users require role ([bbbe877](https://github.com/meanjs/mean/commit/bbbe877)) +* Allow Guests to view Articles ([cbebed9](https://github.com/meanjs/mean/commit/cbebed9)) +* Changed .html files to have 2 spaces instead of tabs ([5754b03](https://github.com/meanjs/mean/commit/5754b03)) +* client-side form validation with ng-messages. ([8015476](https://github.com/meanjs/mean/commit/8015476)) +* Closes #202 - if user does not authorize email scope, email will not be mapped. Username will be ge ([27d2818](https://github.com/meanjs/mean/commit/27d2818)), closes [#202](https://github.com/meanjs/mean/issues/202) +* Code from mleanos ([9fc6091](https://github.com/meanjs/mean/commit/9fc6091)) +* Correct
Tags and set Title ([4b43c4e](https://github.com/meanjs/mean/commit/4b43c4e)) +* Corrected 'prod' task in gulpfile ([d737696](https://github.com/meanjs/mean/commit/d737696)) +* Database seeding ([ea97f2e](https://github.com/meanjs/mean/commit/ea97f2e)) +* do not save state to previous (history) for routes marked ignoreState. ([c6d2683](https://github.com/meanjs/mean/commit/c6d2683)) +* fix default session cookie maxAge ([3b5e13e](https://github.com/meanjs/mean/commit/3b5e13e)) +* fix indentation ([cb9d7e3](https://github.com/meanjs/mean/commit/cb9d7e3)) +* fix some typos ([8fc9b50](https://github.com/meanjs/mean/commit/8fc9b50)) +* Fixed bug with Socket IO session ([792488e](https://github.com/meanjs/mean/commit/792488e)) +* Fixed end tags in page header ([851973f](https://github.com/meanjs/mean/commit/851973f)) +* Fixed issue where if local.js exists then grunt test will run on that environment config and possibl ([d188326](https://github.com/meanjs/mean/commit/d188326)) +* Fixed User model tests ([14b8dd4](https://github.com/meanjs/mean/commit/14b8dd4)) +* Fixing Menus service remove bugs. ([ec3af65](https://github.com/meanjs/mean/commit/ec3af65)) +* fixing up a user model test which was not setup correctly without the async done() callback, which l ([463f5b9](https://github.com/meanjs/mean/commit/463f5b9)) +* Force Lowercase & Remove Sensitive Data ([aafa5e6](https://github.com/meanjs/mean/commit/aafa5e6)) +* Initial commit to return /client to the URL include paths ([d319f92](https://github.com/meanjs/mean/commit/d319f92)) +* Link to editorconfig from CONTRIBUTING.md ([601cf9f](https://github.com/meanjs/mean/commit/601cf9f)) +* local.example.js still has old fb auth callback ([3527537](https://github.com/meanjs/mean/commit/3527537)) +* Major Fixing and Refactoring tests ([6db8a4e](https://github.com/meanjs/mean/commit/6db8a4e)) +* Make tests pass ([1f7bfdd](https://github.com/meanjs/mean/commit/1f7bfdd)) +* Make TopBar Public By Default ([e68b422](https://github.com/meanjs/mean/commit/e68b422)) +* mask exception route, but show not-found page. ([9fdd2a0](https://github.com/meanjs/mean/commit/9fdd2a0)) +* Merge branch '0.4.0-cf' of https://github.com/ryanjbaxter/mean into ryanjbaxter-0.4.0-cf ([2f60b2b](https://github.com/meanjs/mean/commit/2f60b2b)) +* Merge branch 'ryanjbaxter-0.4.0-cf' ([21d87e9](https://github.com/meanjs/mean/commit/21d87e9)) +* Merge pull request #755 from Gym/bug-reset-password ([232883b](https://github.com/meanjs/mean/commit/232883b)) +* Merge pull request #756 from lirantal/feature/users_module_tests ([057a0cc](https://github.com/meanjs/mean/commit/057a0cc)) +* Merge pull request #758 from trainerbill/PathRefactor ([86b16c9](https://github.com/meanjs/mean/commit/86b16c9)) +* Merge pull request #759 from Gym/client-side-validation ([01bd98b](https://github.com/meanjs/mean/commit/01bd98b)) +* Merge pull request #762 from lirantal/feature/grunt_fail_on_failures ([1e51e06](https://github.com/meanjs/mean/commit/1e51e06)) +* Merge pull request #765 from jloveland/more-security ([fe20d3c](https://github.com/meanjs/mean/commit/fe20d3c)) +* Merge pull request #766 from lirantal/feature/jshint-deprecated-options ([c959180](https://github.com/meanjs/mean/commit/c959180)) +* Merge pull request #768 from lirantal/feature/users_module_tests_2 ([0f3259f](https://github.com/meanjs/mean/commit/0f3259f)) +* Merge pull request #771 from lirantal/bugfix/fix_user_module_async_tests ([609d958](https://github.com/meanjs/mean/commit/609d958)) +* Merge pull request #773 from codydaig/patch-2 ([21f1f4e](https://github.com/meanjs/mean/commit/21f1f4e)) +* Merge pull request #774 from Gym/remove-data-prefix ([ff59de0](https://github.com/meanjs/mean/commit/ff59de0)) +* Merge pull request #780 from codydaig/feature/issue583 ([114706e](https://github.com/meanjs/mean/commit/114706e)) +* Merge pull request #781 from codydaig/bug/listArticlesAuth ([0be1b11](https://github.com/meanjs/mean/commit/0be1b11)) +* Merge pull request #787 from Gym/spaces ([3064b28](https://github.com/meanjs/mean/commit/3064b28)) +* Merge pull request #790 from ryanjbaxter/bluemix-button ([9450c82](https://github.com/meanjs/mean/commit/9450c82)) +* Merge pull request #791 from pgrodrigues/master ([820355c](https://github.com/meanjs/mean/commit/820355c)) +* Merge pull request #793 from trainerbill/SeedDB2 ([d41490c](https://github.com/meanjs/mean/commit/d41490c)) +* Merge pull request #796 from trainerbill/UnauthorizedRoute2 ([2b015b0](https://github.com/meanjs/mean/commit/2b015b0)) +* Merge pull request #798 from lirantal/feature/security-enhancements-session ([7200426](https://github.com/meanjs/mean/commit/7200426)) +* Merge pull request #799 from lirantal/feature/users_module_tests_4 ([d9a8647](https://github.com/meanjs/mean/commit/d9a8647)) +* Merge pull request #804 from lirantal/feature/session-expiration-enhancement-2 ([84926ab](https://github.com/meanjs/mean/commit/84926ab)) +* Merge pull request #805 from vaucouleur/master ([a5250c3](https://github.com/meanjs/mean/commit/a5250c3)) +* Merge pull request #806 from pgrodrigues/master ([1f0f1b7](https://github.com/meanjs/mean/commit/1f0f1b7)) +* Merge pull request #810 from cdriscol/menus_service_issue ([793187c](https://github.com/meanjs/mean/commit/793187c)) +* Merge pull request #811 from lirantal/feature/code-coverage ([7051345](https://github.com/meanjs/mean/commit/7051345)) +* Merge pull request #812 from mleanos/bug/socket-session-key ([5b78706](https://github.com/meanjs/mean/commit/5b78706)) +* Merge pull request #815 from codydaig/docs/Contributing ([bed01ce](https://github.com/meanjs/mean/commit/bed01ce)) +* Merge pull request #816 from lirantal/feature/secure-mode-sslcerts-configurable ([98f3e8c](https://github.com/meanjs/mean/commit/98f3e8c)) +* Merge pull request #820 from pgrodrigues/master ([d6d2b41](https://github.com/meanjs/mean/commit/d6d2b41)) +* Merge pull request #821 from codydaig/fix/editorconfig ([bc31d45](https://github.com/meanjs/mean/commit/bc31d45)) +* Merge pull request #824 from lirantal/bugfix/localjs-env-params-used-for-tests ([2e8d659](https://github.com/meanjs/mean/commit/2e8d659)) +* Merge pull request #825 from seanemmer/master ([a1570c4](https://github.com/meanjs/mean/commit/a1570c4)) +* Merge pull request #826 from codydaig/test/userEmail ([6474718](https://github.com/meanjs/mean/commit/6474718)) +* Merge pull request #827 from mleanos/hotfix/default-env-client-path ([72067fd](https://github.com/meanjs/mean/commit/72067fd)) +* Merge pull request #830 from codydaig/bug/password ([7b880e9](https://github.com/meanjs/mean/commit/7b880e9)), closes [#829](https://github.com/meanjs/mean/issues/829) +* Merge pull request #832 from codydaig/fix/dockerSASS ([e03b892](https://github.com/meanjs/mean/commit/e03b892)), closes [#789](https://github.com/meanjs/mean/issues/789) +* Merge pull request #835 from simison/patch-12 ([37b0bdd](https://github.com/meanjs/mean/commit/37b0bdd)) +* Merge pull request #836 from Gym/0.4.1 ([b1f814e](https://github.com/meanjs/mean/commit/b1f814e)) +* Merge pull request #840 from lirantal/feature/users_module_tests_% ([6af137d](https://github.com/meanjs/mean/commit/6af137d)) +* Merge pull request #841 from Gym/master ([51196c5](https://github.com/meanjs/mean/commit/51196c5)) +* Merge pull request #842 from Gym/fb-enhancements ([05355b9](https://github.com/meanjs/mean/commit/05355b9)) +* Merge pull request #843 from Gym/bug-previous-state ([cfe71bb](https://github.com/meanjs/mean/commit/cfe71bb)) +* Merge pull request #844 from Gym/404-behavior ([b8147cb](https://github.com/meanjs/mean/commit/b8147cb)) +* Merge pull request #845 from lirantal/feature/sessionCookie-refactoring-params ([67491a8](https://github.com/meanjs/mean/commit/67491a8)) +* Merge pull request #846 from lirantal/feature/refresh-homepage-links ([979c4e5](https://github.com/meanjs/mean/commit/979c4e5)) +* Merge pull request #850 from vaucouleur/filenames ([a004b66](https://github.com/meanjs/mean/commit/a004b66)) +* Merge pull request #851 from lirantal/feature/security-nsp-ci-packages-up-to-date ([0e3f638](https://github.com/meanjs/mean/commit/0e3f638)) +* Merge pull request #852 from mleanos/chat-empty-message ([e415dc3](https://github.com/meanjs/mean/commit/e415dc3)) +* Merge pull request #853 from Gym/task-enhancements ([85d2a1a](https://github.com/meanjs/mean/commit/85d2a1a)) +* Merge pull request #858 from mleanos/admin-users-require-role ([8335aa7](https://github.com/meanjs/mean/commit/8335aa7)) +* Merge pull request #863 from mleanos/hotfix/user-model-tests-roles ([16b481f](https://github.com/meanjs/mean/commit/16b481f)) +* Merge pull request #864 from codydaig/bug/cfconfig ([40cc691](https://github.com/meanjs/mean/commit/40cc691)), closes [#861](https://github.com/meanjs/mean/issues/861) +* Merge pull request #866 from almegdad/0.4.0 ([320826b](https://github.com/meanjs/mean/commit/320826b)) +* Merge pull request #875 from meanjs/travis-gitter-integration ([57bd17a](https://github.com/meanjs/mean/commit/57bd17a)) +* Merge pull request #876 from codydaig/0.4.1 ([3890aae](https://github.com/meanjs/mean/commit/3890aae)) +* re-factoring the server model tests to create user model from schema only during tests, so that we c ([346ebd6](https://github.com/meanjs/mean/commit/346ebd6)) +* refactoring the async nature in the user model tests to account for mocha 2 second timeouts causing ([c967a98](https://github.com/meanjs/mean/commit/c967a98)) +* Refactoring the Session Cookie configuration and adding more configurale parameters ([80b63b5](https://github.com/meanjs/mean/commit/80b63b5)) +* Refreshing the M.E.A.N links and description in the homepage ([4a65439](https://github.com/meanjs/mean/commit/4a65439)) +* Remove data- prefix from attributes ([3bf07fe](https://github.com/meanjs/mean/commit/3bf07fe)) +* Remove Dev Branch Badges ([019e420](https://github.com/meanjs/mean/commit/019e420)) +* remove double esnext entry in .jshintrc ([8b29833](https://github.com/meanjs/mean/commit/8b29833)) +* Remove non CF specific files ([57079e2](https://github.com/meanjs/mean/commit/57079e2)) +* removing deprecated options in the latest versiosn of jshint which will be replaced by adding JSCS s ([9149dc4](https://github.com/meanjs/mean/commit/9149dc4)) +* Renamed files using convention verb-object.client.etc. Closes #817 ([ab82acb](https://github.com/meanjs/mean/commit/ab82acb)), closes [#817](https://github.com/meanjs/mean/issues/817) [#817](https://github.com/meanjs/mean/issues/817) +* reset-password enhancements and bug fix ([01a8d5e](https://github.com/meanjs/mean/commit/01a8d5e)) +* Task enhancements ([1fa9776](https://github.com/meanjs/mean/commit/1fa9776)) +* Travis now sends notifications to Gitter ([d1c3348](https://github.com/meanjs/mean/commit/d1c3348)) +* Unauthorized client routing ([ed89f9e](https://github.com/meanjs/mean/commit/ed89f9e)) +* updating grunt 'force' option to default/force it to false so that we can fail any task that is fail ([c22c888](https://github.com/meanjs/mean/commit/c22c888)) +* updating travis ci build to install required ruby gem dependencies ([dd254e1](https://github.com/meanjs/mean/commit/dd254e1)) +* use pushstate, fall back to window.location.hash. ([b249512](https://github.com/meanjs/mean/commit/b249512)) +* User model tests for roles ([263adcc](https://github.com/meanjs/mean/commit/263adcc)) + + + + +# 0.4.0 (2015-08-03) + + +### bug + +* bug: remove social account. ([b18a7dd](https://github.com/meanjs/mean/commit/b18a7dd)) + +### BUG + +* BUG: fix admin access (blocking user PUT) ([839f805](https://github.com/meanjs/mean/commit/839f805)) +* BUG: Path separator support for windows. ([3e378b4](https://github.com/meanjs/mean/commit/3e378b4)) +* BUG: Removed a ng-binding to article.content in user-list.client.view.html ([2747df6](https://github.com/meanjs/mean/commit/2747df6)) + +### formatting + +* formatting: indent ([b8d6fa7](https://github.com/meanjs/mean/commit/b8d6fa7)) + +* #450 Fixing unrelated jshint warnings ([b61d6a7](https://github.com/meanjs/mean/commit/b61d6a7)) +* #450 minor formatting fixes. ([9f45e63](https://github.com/meanjs/mean/commit/9f45e63)) +* #450 Now the mocha task synchronously calls mongoose connect and ([5f57f9d](https://github.com/meanjs/mean/commit/5f57f9d)) +* #450 Use the error reported by mocha. Added some comments explaining ([ffde5e8](https://github.com/meanjs/mean/commit/ffde5e8)) +* #501 Handle 404 errors at Express backend at at Angular frontend ([ba1a447](https://github.com/meanjs/mean/commit/ba1a447)) +* #501 Use req.format() to content-negotiate correct response ([fd17026](https://github.com/meanjs/mean/commit/fd17026)) +* `package.json` will always use 2 spaces indent ([73be794](https://github.com/meanjs/mean/commit/73be794)) +* 0.4.0 branch merged into master ([67e96a4](https://github.com/meanjs/mean/commit/67e96a4)) +* Add fonts and svgs to gzip compression pattern ([fea436f](https://github.com/meanjs/mean/commit/fea436f)) +* Add Grunt task to make sure uploads directory exists ([eba4754](https://github.com/meanjs/mean/commit/eba4754)) +* Add missing newline at the end of text files ([e027f40](https://github.com/meanjs/mean/commit/e027f40)) +* Add some abstraction to local strategy login error ([e11ffda](https://github.com/meanjs/mean/commit/e11ffda)) +* add user route tests ([4bbc4a3](https://github.com/meanjs/mean/commit/4bbc4a3)) +* Added Master and Dev Badges to README ([a7e065e](https://github.com/meanjs/mean/commit/a7e065e)) +* Added missing dependency injection in Chat ([0fa9b95](https://github.com/meanjs/mean/commit/0fa9b95)) +* Added Visual Studio files to gitignore ([6c2c77c](https://github.com/meanjs/mean/commit/6c2c77c)) +* Added Visual Studio files to gitignore ([c3380bf](https://github.com/meanjs/mean/commit/c3380bf)) +* Adding client test coverage. ([d5ea5c9](https://github.com/meanjs/mean/commit/d5ea5c9)) +* adding couple more tests to confirm users model works as expected ([ac35f0f](https://github.com/meanjs/mean/commit/ac35f0f)) +* Adding karma-ng-html2js-preprocessor to fix karma tests. Adding user mock to articles tests. ([c468539](https://github.com/meanjs/mean/commit/c468539)) +* adding ssl back in ([3e1d0b5](https://github.com/meanjs/mean/commit/3e1d0b5)) +* addressing missing newlines and node 0.12 version for travis-ci ([d5b22e3](https://github.com/meanjs/mean/commit/d5b22e3)) +* Adjust profile image URLs on Fb and Twitter strategies ([12766c1](https://github.com/meanjs/mean/commit/12766c1)) +* Admin module base & user admin implementation. ([6066020](https://github.com/meanjs/mean/commit/6066020)) +* appending a base tag to the head before jasmine tests run. ([9e7239b](https://github.com/meanjs/mean/commit/9e7239b)) +* Auth service ([9c501db](https://github.com/meanjs/mean/commit/9c501db)) +* Because html5Mode is enabled, the links the social buttons point to will not work, the request to /a ([87217da](https://github.com/meanjs/mean/commit/87217da)) +* Bump glob to version 5.0 ([dd0cdfc](https://github.com/meanjs/mean/commit/dd0cdfc)) +* change _.extend to _.merge ([4d1ae6e](https://github.com/meanjs/mean/commit/4d1ae6e)) +* Change file ignore pattern to match word 'core' instead of chars ([659c8de](https://github.com/meanjs/mean/commit/659c8de)) +* cleaning up application startup information ([9fb2215](https://github.com/meanjs/mean/commit/9fb2215)) +* cleaning up code blocks in README ([8c2156f](https://github.com/meanjs/mean/commit/8c2156f)) +* Cleanly track mongoose connection in test task sequence ([71c4d4b](https://github.com/meanjs/mean/commit/71c4d4b)) +* Correctly encode and decode password salt ([08f1750](https://github.com/meanjs/mean/commit/08f1750)) +* Disconnect method to close DB connection ([e954a20](https://github.com/meanjs/mean/commit/e954a20)) +* displayName undefined ([7605956](https://github.com/meanjs/mean/commit/7605956)) +* do not use aes when creating ssl certs to prevent password requirement ([bf777d9](https://github.com/meanjs/mean/commit/bf777d9)) +* duplicate controller. This was moved under settings/ ([d0bb4a3](https://github.com/meanjs/mean/commit/d0bb4a3)) +* Enable redirection to previous page after login ([e6a35a7](https://github.com/meanjs/mean/commit/e6a35a7)) +* enabling the lint task when running tests so we can identify coding convention issues on Pull-Reques ([c90dda9](https://github.com/meanjs/mean/commit/c90dda9)) +* enhancing error message with an actual instruction on how to fix the missing ssl problem when runnin ([315187e](https://github.com/meanjs/mean/commit/315187e)) +* Enhancing support for development envionrment to enable mongoose debug mode so that we can debug db ([0bcadcc](https://github.com/meanjs/mean/commit/0bcadcc)) +* Fig changed to Compose ([08b2f74](https://github.com/meanjs/mean/commit/08b2f74)) +* Filter states for which login is required during state change ([9fc88e6](https://github.com/meanjs/mean/commit/9fc88e6)) +* Final Clean Up after code review ([1b54d35](https://github.com/meanjs/mean/commit/1b54d35)) +* Fix #283 glob path issue for Windows ([acccc03](https://github.com/meanjs/mean/commit/acccc03)), closes [#283](https://github.com/meanjs/mean/issues/283) [#283](https://github.com/meanjs/mean/issues/283) +* Fix #321 image paths in social meta tags [v0.4] ([ab18e14](https://github.com/meanjs/mean/commit/ab18e14)), closes [#321](https://github.com/meanjs/mean/issues/321) +* fix btn-large class names. ([b6818b6](https://github.com/meanjs/mean/commit/b6818b6)) +* Fix deprecated ExpressJS req.param('provider') ([10d35d1](https://github.com/meanjs/mean/commit/10d35d1)) +* fix failing tests ([67e38ae](https://github.com/meanjs/mean/commit/67e38ae)) +* Fix Gulp throwing errors ([6f09033](https://github.com/meanjs/mean/commit/6f09033)) +* Fix headers to HTML5 format ([238bbe1](https://github.com/meanjs/mean/commit/238bbe1)) +* Fix merge conflicts ([a98a84f](https://github.com/meanjs/mean/commit/a98a84f)) +* Fix message catching the field for which a duplicate key error ocurred ([0efc82d](https://github.com/meanjs/mean/commit/0efc82d)) +* Fix typo at gitignore ([b7f24c6](https://github.com/meanjs/mean/commit/b7f24c6)) +* fixing chalk and console usage for consistency reasons ([411765b](https://github.com/meanjs/mean/commit/411765b)) +* fixing err object which isnt present in this check, replacing it with a text message ([52fe443](https://github.com/meanjs/mean/commit/52fe443)) +* fixing up SSL support on startup to fallback to non-SSL mode if files are not present ([03b7f6f](https://github.com/meanjs/mean/commit/03b7f6f)) +* formatting reboot (space-2 and consistency) ([ef3a3f9](https://github.com/meanjs/mean/commit/ef3a3f9)) +* Get site title from default ([40878bb](https://github.com/meanjs/mean/commit/40878bb)) +* Gulp now closes the mongoose connection ([6cce3d0](https://github.com/meanjs/mean/commit/6cce3d0)), closes [#450](https://github.com/meanjs/mean/issues/450) +* Hide email address and remove trailing whitespaces ([c800c0a](https://github.com/meanjs/mean/commit/c800c0a)) +* Ignore ALL .log files at gitignore ([f24ce65](https://github.com/meanjs/mean/commit/f24ce65)), closes [#523](https://github.com/meanjs/mean/issues/523) +* Indentation fixes ([fe1d584](https://github.com/meanjs/mean/commit/fe1d584)) +* Initial support for deploying MEANJS to Cloud Foundry ([efd3ee4](https://github.com/meanjs/mean/commit/efd3ee4)) +* JSHint test failing because of missing semicolon ([c572ed7](https://github.com/meanjs/mean/commit/c572ed7)) +* keeping nodejs versions 0.10 and 0.12 as the test servers for travis configuration ([96f8ab5](https://github.com/meanjs/mean/commit/96f8ab5)) +* Make emails unique ([5d4d7ce](https://github.com/meanjs/mean/commit/5d4d7ce)) +* Merge branch '0.4.0' ([d0613ce](https://github.com/meanjs/mean/commit/d0613ce)) +* Merge branch '0.4.0' of github.com:meanjs/mean into 0.4.0 ([16aa646](https://github.com/meanjs/mean/commit/16aa646)) +* Merge branch '0.4.0' of https://github.com/meanjs/mean into #450 ([6d0363f](https://github.com/meanjs/mean/commit/6d0363f)) +* Merge branch '0.4.0' of https://github.com/Robaum/mean into Robaum-0.4.0 ([6bb5b8c](https://github.com/meanjs/mean/commit/6bb5b8c)) +* Merge branch 'bugfix/404/#501' of https://github.com/dotch/mean-1 into error-404-pages ([8190ee4](https://github.com/meanjs/mean/commit/8190ee4)) +* Merge branch 'pr/278' into 0.4.0 ([f891660](https://github.com/meanjs/mean/commit/f891660)) +* Merge branch 'Robaum-0.4.0' into 0.4.0 ([9e8ee9e](https://github.com/meanjs/mean/commit/9e8ee9e)) +* Merge pull request #323 from AndreasHassing/0.4.0 ([90c9ddb](https://github.com/meanjs/mean/commit/90c9ddb)), closes [#283](https://github.com/meanjs/mean/issues/283) [#321](https://github.com/meanjs/mean/issues/321) +* Merge pull request #376 from rmuch/fix-salt-encoding-merge-0.4.0 ([61f1a22](https://github.com/meanjs/mean/commit/61f1a22)) +* Merge pull request #382 from igorauad/providerImages ([dd9a3af](https://github.com/meanjs/mean/commit/dd9a3af)) +* Merge pull request #384 from igorauad/facebook2.0 ([1e450b4](https://github.com/meanjs/mean/commit/1e450b4)) +* Merge pull request #386 from sylvainlap/0.4.0 ([1d18127](https://github.com/meanjs/mean/commit/1d18127)) +* Merge pull request #396 from sylvainlap/0.4.0 ([8f4ded8](https://github.com/meanjs/mean/commit/8f4ded8)) +* Merge pull request #411 from berendt/executable_bit ([c3dea3e](https://github.com/meanjs/mean/commit/c3dea3e)) +* Merge pull request #413 from berendt/add_newline ([6e1085e](https://github.com/meanjs/mean/commit/6e1085e)) +* Merge pull request #421 from vepasto/0.4.0 ([709c27f](https://github.com/meanjs/mean/commit/709c27f)) +* Merge pull request #425 from vepasto/fix-file-ignore ([d1b4bde](https://github.com/meanjs/mean/commit/d1b4bde)), closes [#424](https://github.com/meanjs/mean/issues/424) +* Merge pull request #439 from igorauad/uniqueEmail ([82d2377](https://github.com/meanjs/mean/commit/82d2377)) +* Merge pull request #445 from dotch/0.4.0 ([9e1a6aa](https://github.com/meanjs/mean/commit/9e1a6aa)) +* Merge pull request #453 from reblace/#450 ([cabb4c4](https://github.com/meanjs/mean/commit/cabb4c4)), closes [#450](https://github.com/meanjs/mean/issues/450) +* Merge pull request #456 from dotch/0.4.0 ([69b0588](https://github.com/meanjs/mean/commit/69b0588)) +* Merge pull request #458 from ilanbiala/0.4.0 ([77535bd](https://github.com/meanjs/mean/commit/77535bd)) +* Merge pull request #463 from adamwalz/0.4.0 ([a0495ea](https://github.com/meanjs/mean/commit/a0495ea)) +* Merge pull request #487 from igorauad/0.4.0 ([99a8168](https://github.com/meanjs/mean/commit/99a8168)) +* Merge pull request #497 from ilanbiala/0.4.0 ([79ec946](https://github.com/meanjs/mean/commit/79ec946)) +* Merge pull request #498 from ilanbiala/0.4.0 ([bb37d1b](https://github.com/meanjs/mean/commit/bb37d1b)) +* Merge pull request #509 from simison/patch-1 ([8b9a625](https://github.com/meanjs/mean/commit/8b9a625)) +* Merge pull request #516 from tcwd/0.4.0 ([25974a6](https://github.com/meanjs/mean/commit/25974a6)) +* Merge pull request #522 from simison/patch-4 ([90dbbb6](https://github.com/meanjs/mean/commit/90dbbb6)) +* Merge pull request #529 from pgrodrigues/0.4.0 ([9a9db26](https://github.com/meanjs/mean/commit/9a9db26)) +* Merge pull request #531 from pgrodrigues/0.4.0 ([426ce9e](https://github.com/meanjs/mean/commit/426ce9e)) +* Merge pull request #548 from jloveland/generate-sslcerts ([3ea400f](https://github.com/meanjs/mean/commit/3ea400f)) +* Merge pull request #549 from vepasto/patch-5 ([6fddcf4](https://github.com/meanjs/mean/commit/6fddcf4)) +* Merge pull request #565 from simison/patch-7 ([5564979](https://github.com/meanjs/mean/commit/5564979)) +* Merge pull request #566 from simison/error-404-pages ([00a4c06](https://github.com/meanjs/mean/commit/00a4c06)) +* Merge pull request #575 from pgrodrigues/0.4.0 ([cd5db4a](https://github.com/meanjs/mean/commit/cd5db4a)) +* Merge pull request #576 from simison/patch-8 ([801ba33](https://github.com/meanjs/mean/commit/801ba33)) +* Merge pull request #579 from lirantal/0.4.0-backport-local-config-feature-553 ([716925b](https://github.com/meanjs/mean/commit/716925b)) +* Merge pull request #582 from simison/patch-9 ([b1d95e0](https://github.com/meanjs/mean/commit/b1d95e0)) +* Merge pull request #586 from cdriscol/remove-target-on-signin ([6003085](https://github.com/meanjs/mean/commit/6003085)) +* Merge pull request #599 from loulin/0.4.0 ([ade074c](https://github.com/meanjs/mean/commit/ade074c)) +* Merge pull request #610 from trainerbill/PayPalAuth4 ([855a399](https://github.com/meanjs/mean/commit/855a399)) +* Merge pull request #616 from meanjs/master_to_0.4.0 ([c2bcfa3](https://github.com/meanjs/mean/commit/c2bcfa3)) +* Merge pull request #621 from simison/patch-10 ([2159094](https://github.com/meanjs/mean/commit/2159094)) +* Merge pull request #622 from Gym/0.4.0 ([99e0ea8](https://github.com/meanjs/mean/commit/99e0ea8)) +* Merge pull request #632 from danaronoff/0.4.0 ([8aa9dfa](https://github.com/meanjs/mean/commit/8aa9dfa)) +* Merge pull request #633 from Gym/package-formatting ([11b37f2](https://github.com/meanjs/mean/commit/11b37f2)) +* Merge pull request #634 from Gym/0.4.0 ([e8c79e4](https://github.com/meanjs/mean/commit/e8c79e4)) +* Merge pull request #637 from Gym/0.4.0 ([cff3efe](https://github.com/meanjs/mean/commit/cff3efe)) +* Merge pull request #640 from lirantal/bugfix/server-startup-log ([e1001b8](https://github.com/meanjs/mean/commit/e1001b8)) +* Merge pull request #641 from lirantal/bugfix/db-name-per-environment ([00879f5](https://github.com/meanjs/mean/commit/00879f5)) +* Merge pull request #642 from lirantal/bugfix/password-changing-on-user-save ([d9c15e2](https://github.com/meanjs/mean/commit/d9c15e2)) +* Merge pull request #643 from lirantal/enhancement/README-update-grunt-startup ([ab68fd2](https://github.com/meanjs/mean/commit/ab68fd2)) +* Merge pull request #645 from djorak/patch-1 ([6d199a5](https://github.com/meanjs/mean/commit/6d199a5)) +* Merge pull request #647 from lirantal/bugfix/cleanup-readme ([a146a30](https://github.com/meanjs/mean/commit/a146a30)) +* Merge pull request #651 from grantgeorge/no-password-ssl-certs ([32c12bb](https://github.com/meanjs/mean/commit/32c12bb)) +* Merge pull request #656 from fauria/0.4.0 ([a1355a0](https://github.com/meanjs/mean/commit/a1355a0)) +* Merge pull request #658 from codydaig/npm3-patch2 ([e1605b6](https://github.com/meanjs/mean/commit/e1605b6)) +* Merge pull request #659 from lirantal/bugfix/secure-mode-fix ([2f8e20e](https://github.com/meanjs/mean/commit/2f8e20e)) +* Merge pull request #665 from codydaig/mergeissue ([53194ff](https://github.com/meanjs/mean/commit/53194ff)) +* Merge pull request #666 from Gym/task-enhancements ([3a39f0a](https://github.com/meanjs/mean/commit/3a39f0a)) +* Merge pull request #668 from cdriscol/base_tag ([09251d1](https://github.com/meanjs/mean/commit/09251d1)) +* Merge pull request #671 from lirantal/feature/lint-on-grunt-test ([bed8ff5](https://github.com/meanjs/mean/commit/bed8ff5)) +* Merge pull request #673 from codydaig/bugfix/consolelog ([e6b8a69](https://github.com/meanjs/mean/commit/e6b8a69)) +* Merge pull request #676 from Gym/admin-feature ([e1ca1aa](https://github.com/meanjs/mean/commit/e1ca1aa)) +* Merge pull request #682 from codydaig/patch-2 ([29d264d](https://github.com/meanjs/mean/commit/29d264d)) +* Merge pull request #683 from mleanos/gitignore_VS ([e3405d2](https://github.com/meanjs/mean/commit/e3405d2)) +* Merge pull request #684 from lirantal/feature/users_tests_email_unique ([a62f25e](https://github.com/meanjs/mean/commit/a62f25e)) +* Merge pull request #685 from codydaig/pull664 ([d7f9622](https://github.com/meanjs/mean/commit/d7f9622)) +* Merge pull request #688 from codydaig/bugfix/github_undefined_displayname ([8a81cf0](https://github.com/meanjs/mean/commit/8a81cf0)), closes [#519](https://github.com/meanjs/mean/issues/519) +* Merge pull request #691 from lirantal/feature/missing_ssl_better_log ([0369db4](https://github.com/meanjs/mean/commit/0369db4)) +* Merge pull request #693 from lirantal/feature/clean_angular_hashbang_urls ([c671f65](https://github.com/meanjs/mean/commit/c671f65)) +* Merge pull request #698 from simison/patch-11 ([7c5b311](https://github.com/meanjs/mean/commit/7c5b311)) +* Merge pull request #699 from lirantal/bugfix/unused-variable ([0e3f194](https://github.com/meanjs/mean/commit/0e3f194)) +* Merge pull request #700 from trainerbill/requireLogin ([c8880ea](https://github.com/meanjs/mean/commit/c8880ea)) +* Merge pull request #701 from mleanos/socket-connect ([0c76179](https://github.com/meanjs/mean/commit/0c76179)) +* Merge pull request #703 from lirantal/bugfix/config_chalk_console_log_order ([7d7d076](https://github.com/meanjs/mean/commit/7d7d076)) +* Merge pull request #706 from Gym/formatting-reboot ([9c0068c](https://github.com/meanjs/mean/commit/9c0068c)) +* Merge pull request #707 from lirantal/feature/mongoose_debug_option ([4f7aed0](https://github.com/meanjs/mean/commit/4f7aed0)) +* Merge pull request #710 from mleanos/Chat-Missing-Auth-DI ([0faeb31](https://github.com/meanjs/mean/commit/0faeb31)) +* Merge pull request #713 from Gym/0.4.0 ([88b8f9e](https://github.com/meanjs/mean/commit/88b8f9e)) +* Merge pull request #714 from cdriscol/fix_karma_errors_html2js ([460ef53](https://github.com/meanjs/mean/commit/460ef53)) +* Merge pull request #720 from vaucouleur/getErrorMessage ([09870db](https://github.com/meanjs/mean/commit/09870db)) +* Merge pull request #728 from cdriscol/angular_tests ([612a76c](https://github.com/meanjs/mean/commit/612a76c)), closes [#663](https://github.com/meanjs/mean/issues/663) +* Merge pull request #729 from mleanos/angular-file-upload-static-dep ([6b3220c](https://github.com/meanjs/mean/commit/6b3220c)), closes [#722](https://github.com/meanjs/mean/issues/722) [#724](https://github.com/meanjs/mean/issues/724) +* Merge pull request #731 from simison/mkdir-uploads ([b7aebf3](https://github.com/meanjs/mean/commit/b7aebf3)) +* Merge pull request #733 from codydaig/enhancement/pull662 ([8104c98](https://github.com/meanjs/mean/commit/8104c98)) +* Merge pull request #734 from codydaig/docs/040release ([b8b8d01](https://github.com/meanjs/mean/commit/b8b8d01)) +* Merge pull request #736 from lirantal/feature/refactor-app-service ([7aaf363](https://github.com/meanjs/mean/commit/7aaf363)) +* Merge pull request #737 from lirantal/feature/0.4.0_prepare_release ([c2c0c62](https://github.com/meanjs/mean/commit/c2c0c62)) +* Merge pull request #744 from Gym/0.4.0 ([a66c3fe](https://github.com/meanjs/mean/commit/a66c3fe)) +* Merge pull request #750 from lirantal/bugfix/gitignore_jekyll_assets ([5bdd8f9](https://github.com/meanjs/mean/commit/5bdd8f9)) +* Merge remote-tracking branch 'upstream/0.4.0' into 0.4.0 ([07e8b41](https://github.com/meanjs/mean/commit/07e8b41)) +* Modify Generator Refrences/Docs ([c539cdb](https://github.com/meanjs/mean/commit/c539cdb)) +* Move livereload, image, and favicon to config ([a62c4dd](https://github.com/meanjs/mean/commit/a62c4dd)) +* move task configs to separate properties. ([0f7cf54](https://github.com/meanjs/mean/commit/0f7cf54)) +* Moved all editor setting to bottom ([0a7a715](https://github.com/meanjs/mean/commit/0a7a715)) +* Moved all editor setting to bottom ([c7ec27e](https://github.com/meanjs/mean/commit/c7ec27e)) +* New 0.4 version ([ab81d61](https://github.com/meanjs/mean/commit/ab81d61)) +* PayPal Authentication ([8694b7e](https://github.com/meanjs/mean/commit/8694b7e)) +* porting pull request from master to 0.4.0 branch: Local environment variables to address issue #553 ([1ea9f55](https://github.com/meanjs/mean/commit/1ea9f55)) +* Prepare for role-based access control of states ([e21805f](https://github.com/meanjs/mean/commit/e21805f)) +* Prettier res.status().format() ([7070796](https://github.com/meanjs/mean/commit/7070796)) +* Properly track DB disconnect ([81c2847](https://github.com/meanjs/mean/commit/81c2847)) +* Putting the head in order ([2802729](https://github.com/meanjs/mean/commit/2802729)) +* Refactor ([fb71619](https://github.com/meanjs/mean/commit/fb71619)) +* Refactoring server application service to enable modularity and callbacks, as well as provide app, d ([edb6234](https://github.com/meanjs/mean/commit/edb6234)) +* Remove console.log from an article test ([a8dae99](https://github.com/meanjs/mean/commit/a8dae99)) +* Remove dist files 0.4.0 ([eced93f](https://github.com/meanjs/mean/commit/eced93f)) +* Remove duplicate assets definition ([50937ea](https://github.com/meanjs/mean/commit/50937ea)) +* Remove executable bit when not necessary ([4879a8e](https://github.com/meanjs/mean/commit/4879a8e)) +* remove href attribute. ([9ca71c8](https://github.com/meanjs/mean/commit/9ca71c8)) +* Remove Image Uploads ([c94c870](https://github.com/meanjs/mean/commit/c94c870)) +* Remove Image Uploads ([9ef1812](https://github.com/meanjs/mean/commit/9ef1812)) +* Remove more unused requires ([b2d76b8](https://github.com/meanjs/mean/commit/b2d76b8)) +* Remove un-used hasAuthorization and requiresLogin ([fcb6f90](https://github.com/meanjs/mean/commit/fcb6f90)) +* remove unused dependcies. ([75c8052](https://github.com/meanjs/mean/commit/75c8052)) +* Remove unused passport require ([7f1b46b](https://github.com/meanjs/mean/commit/7f1b46b)) +* Remove unused scope declarations. ([9e19493](https://github.com/meanjs/mean/commit/9e19493)) +* Remove username from facebook strategy ([9929f1b](https://github.com/meanjs/mean/commit/9929f1b)) +* removed /#! in user controllers ([de3b890](https://github.com/meanjs/mean/commit/de3b890)) +* Removed duplicate include for crypto ([0dbab18](https://github.com/meanjs/mean/commit/0dbab18)) +* removed unused gulp-watch dependency ([7876fad](https://github.com/meanjs/mean/commit/7876fad)) +* removing left-overs of merge diff from 0.4 to master ([834bfd6](https://github.com/meanjs/mean/commit/834bfd6)) +* Removing target on signin and signup anchors to prevent a complete page reload when changing to thos ([2a3516e](https://github.com/meanjs/mean/commit/2a3516e)) +* removing unused passport variable in express.js library file ([2ff2490](https://github.com/meanjs/mean/commit/2ff2490)) +* Reset password script ([e1496dc](https://github.com/meanjs/mean/commit/e1496dc)) +* return a 404 for not found api, module and lib routes ([74273da](https://github.com/meanjs/mean/commit/74273da)) +* setup dropdown menu ([30c9160](https://github.com/meanjs/mean/commit/30c9160)) +* should return done(err) in article server route test ([d00f4ce](https://github.com/meanjs/mean/commit/d00f4ce)) +* Socket IO client enhancement with connect() method ([65c6d1f](https://github.com/meanjs/mean/commit/65c6d1f)) +* Sorting out .gitignore ([75aad2e](https://github.com/meanjs/mean/commit/75aad2e)) +* support for test:server and test:client grunt tasks which were removed from the merge of 0.4.0 into ([2be8f71](https://github.com/meanjs/mean/commit/2be8f71)) +* The article middleware was calling getErrorMessage with a null argument, causing a crash when this m ([71167b0](https://github.com/meanjs/mean/commit/71167b0)) +* Update connect-mongo to support Mongoose 4.0.0 ([dc6f74d](https://github.com/meanjs/mean/commit/dc6f74d)) +* update dependencies ([d4c880b](https://github.com/meanjs/mean/commit/d4c880b)) +* Update dependencies ([1fa147e](https://github.com/meanjs/mean/commit/1fa147e)) +* update gulp-sass to ensure node-0.12 compatibility ([75bb6f2](https://github.com/meanjs/mean/commit/75bb6f2)) +* update javascript libs ([00a4668](https://github.com/meanjs/mean/commit/00a4668)) +* Update package.json to include peer dependencies ([5d5d1b7](https://github.com/meanjs/mean/commit/5d5d1b7)) +* Update package.json to indent space-2. ([f345d20](https://github.com/meanjs/mean/commit/f345d20)) +* Update users.authentication.server.controller.js ([786c546](https://github.com/meanjs/mean/commit/786c546)) +* Updated angular-file-upload to use static dependency ([a5bceb9](https://github.com/meanjs/mean/commit/a5bceb9)) +* Updated routes and a logic fix ([03a4042](https://github.com/meanjs/mean/commit/03a4042)) +* updated the development.js environment configuration file to use the mean-dev database instead of me ([2e03d13](https://github.com/meanjs/mean/commit/2e03d13)) +* updating 0.4.0 merged branch to support the declerative db connection object instead of just a conne ([b76c2cd](https://github.com/meanjs/mean/commit/b76c2cd)) +* updating gitignore file to disregard the _site/ directory which gets created when using jekyll for g ([379f58e](https://github.com/meanjs/mean/commit/379f58e)) +* updating README file with more elaborate instructions on running grunt in different environment mode ([39e4282](https://github.com/meanjs/mean/commit/39e4282)) +* updating the new 0.4.1 dev branch for when 0.4.0 will actually be released ([f8750b3](https://github.com/meanjs/mean/commit/f8750b3)) +* updating the schema save pre hook so that it checks for a modified version of the password field bef ([bf79c17](https://github.com/meanjs/mean/commit/bf79c17)) +* Use validator.js for email validation ([a23290b](https://github.com/meanjs/mean/commit/a23290b)) +* Wait for async saving and removing ([1897ef9](https://github.com/meanjs/mean/commit/1897ef9)) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dc909ec5d0..f8d9a0f247 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,23 +16,70 @@ Before you create a new Issue: * Create a topic branch from the master branch. * Check for unnecessary whitespace / changes with `git diff --check` before committing. - * Also check that your code is formatted properly with spaces (hint: Use [.editorconfig](http://editorconfig.org/)) + * Also check that your code is formatted properly with spaces (hint: Use [.editorconfig](http://editorconfig.org/)) * Keep git commit messages clear and appropriate - * If possible, please "squash" your commits to as few commits as possible/reasonable such as one commit for implementation, one for tests, and one for documentation before finally squashing to one commit when getting the LGTM from a collaborator. + * If possible, please "squash" your commits to as few commits as possible/reasonable such as one commit for implementation, one for tests, and one for documentation before finally squashing to one commit when getting the LGTM from a collaborator. + * Follow the commit message guidelines below. * Make Sure you have added any tests necessary to test your code. - * Run __all__ the tests to ensure nothing else was accidently broken. - * Don't rely on the existing tests to see if you've broken code elsewhere; test the changes you made in a browser too! + * Run __all__ the tests to ensure nothing else was accidently broken. + * Don't rely on the existing tests to see if you've broken code elsewhere; test the changes you made in a browser too! * Update the Documentation to go along with any changes in functionality / improvements in a separate pull request against the gh-pages branch. +## Commit Message Guidelines +``` +Header +Blank Line +Body +Blank Line +Footer + +The header should look like: +(): + +The body should have any necessary detailed info about the commit: +An example, references as to where this idea came from, etc. + +The footer should have all the issues tagged: +Fixes #123, Fixes #456 + +So a commit should like like: +feat(users): Add new Yahoo authentication + +Yahoo authentication idea proposed by @codydaig +Example implementation in file.js + +Fixes #82 +``` + +* Types: + * feat - Features, Enhancements, and overall Improvements + * fix - Fixes, Bugs, HotFixs, etc... + * doc - Changes to the Documentation and doesn't actually touch any code. +* Scope: + * The scope should be where the change took place. + * Examples: users, core, config, articles +* Subject: + * The subject line should be clear and consice as to what is being accomplished in the commit. +* General Rules: + * No Line in the Commit message can be longer than 80 characters. +* Refrence: [Angular Conventions](https://github.com/ajoslin/conventional-changelog/blob/master/conventions/angular.md) + + ## Submitting the Pull Request * Push your changes to your topic branch on your fork of the repo. * Submit a pull request from your topic branch to the master branch on the MEAN.JS repository. * Be sure to tag any issues your pull request is taking care of / contributing to. - * By adding "Closes #xyz" to a commit message will auto close the issue once the pull request is merged in. + * By adding "Closes #xyz" to a commit message will auto close the issue once the pull request is merged in. * Small changes are usually accepted and merged in within a week (provided that 2 collaborators give the okay) * Larger changes usually spark further discussion and possible changes prior to being merged in. ## Documentation (meanjs.org) The code for the documentation and the website are located in the meanjs/mean repo on the gh-pages branch. The website is hosted by github pages and generated using jekyll. See the README in the gh-pages branch for more information on how to get your dev enviorment set-up. + +## Generating a new Release + +For those who will be generating releases: +* Don't forget to update the changelog! + * `conventional-changelog -r 1 | cat - CHANGELOG.md | tee CHANGELOG.md` diff --git a/Dockerfile b/Dockerfile index 7ff029f24a..bd27884dff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,4 @@ -FROM node:0.10 - -MAINTAINER Matthias Luebken, matthias@catalyst-zero.com +FROM node:0.12 # Install gem sass for grunt-contrib-sass RUN apt-get update -qq && apt-get install -y build-essential diff --git a/README.md b/README.md index 6041212738..bd5f721d3a 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ Before you begin we recommend you read about the basic building blocks that asse ## Prerequisites Make sure you have installed all of the following prerequisites on your development machine: * Node.js - [Download & Install Node.js](https://nodejs.org/en/download/) and the npm package manager. If you encounter any problems, you can also use this [GitHub Gist](https://gist.github.com/isaacs/579814) to install Node.js. + * Node v5 IS NOT SUPPORTED AT THIS TIME! * MongoDB - [Download & Install MongoDB](http://www.mongodb.org/downloads), and make sure it's running on the default port (27017). * Ruby - [Download & Install Ruby](https://www.ruby-lang.org/en/documentation/installation/) * Bower - You're going to use the [Bower Package Manager](http://bower.io/) to manage your front-end packages. Make sure you've installed Node.js and npm first, then install bower globally using npm: @@ -38,6 +39,16 @@ $ npm install -g grunt-cli $ gem install sass ``` +```bash +$ npm install -g grunt-cli +``` + +* Gulp - (Optional) You may use Gulp for Live Reload, Linting, and SASS or LESS. + +```bash +$ npm install gulp -g +``` + ## Downloading MEAN.JS There are several ways you can get the MEAN.JS boilerplate: @@ -59,8 +70,8 @@ $ wget https://github.com/meanjs/mean/archive/master.zip -O meanjs.zip; unzip me Don't forget to rename **mean-master** after your project name. -### Yo Generator --Another way would be to use the [Official Yo Generator](http://meanjs.org/generator.html), which generates a copy of the MEAN.JS 0.3.x boilerplate and supplies multiple sub-generators to ease your daily development cycles. +### Yo Generator +Another way would be to use the [Official Yo Generator](http://meanjs.org/generator.html), which generates a copy of the MEAN.JS 0.4.x boilerplate and supplies an application generator to ease your daily development cycles. ## Quick Install Once you've downloaded the boilerplate and installed all the prerequisites, you're just a few steps away from starting to develop your MEAN application. @@ -152,6 +163,59 @@ And to run only the client tests, run the test:client task: $ grunt test:client ``` +## Running your application with Gulp + +After the install process, you can easily run your project with: + +```bash +$ gulp +``` +or + +```bash +$ gulp default +``` + +The server is now running on http://localhost:3000 if you are using the default settings. + +### Running Gulp Development Environment + +Start the development environment with: + +```bash +$ gulp dev +``` + +### Running in Production mode +To run your application with *production* environment configuration, execute gulp as follows: + +```bash +$ gulp prod +``` + +### Testing Your Application with Gulp +Using the full test suite included with MEAN.JS with the test task: + +### Run all tests +```bash +$ gulp test +``` + +### Run server tests +```bash +gulp test:server +``` + +### Run client tests +```bash +gulp test:client +``` + +### Run e2e tests +```bash +gulp test:e2e +``` + ## Development and deployment With Docker * Install [Docker](https://docs.docker.com/installation/#installation) @@ -185,9 +249,6 @@ In the docs we'll try to explain both general concepts of MEAN components and gi * Discuss it in the new [Google Group](https://groups.google.com/d/forum/meanjs) * Ping us on [Twitter](http://twitter.com/meanjsorg) and [Facebook](http://facebook.com/meanjs) -## Live Example -Browse the live MEAN.JS example on [http://meanjs.herokuapp.com](http://meanjs.herokuapp.com). - ## Contributing We welcome pull requests from the community! Just be sure to read the [contributing](https://github.com/meanjs/mean/blob/master/CONTRIBUTING.md) doc to get started. @@ -196,17 +257,17 @@ We welcome pull requests from the community! Just be sure to read the [contribut Cloud Foundry is an open source platform-as-a-service (PaaS). The MEANJS project can easily be deployed to any Cloud Foundry instance. The easiest way to deploy the MEANJS project to Cloud Foundry is to use a public hosted instance. The two most popular -instances are [Pivotal Web Services](https://run.pivotal.io/) and +instances are [Pivotal Web Services](https://run.pivotal.io/) and [IBM Bluemix](https://bluemix.net). Both provide free trials and support pay-as-you-go models -for hosting applications in the cloud. After you have an account follow the below steps to -deploy MEANJS. +for hosting applications in the cloud. After you have an account follow the below steps to deploy MEANJS. * Install the [Cloud Foundry command line tools](http://docs.cloudfoundry.org/devguide/installcf/install-go-cli.html). * Now you need to log into Cloud Foundry from the Cloud Foundry command line. * If you are using Pivotal Web Services run `$ cf login -a api.run.pivotal.io`. * If you are using IBM Bluemix run `$ cf login -a api.ng.bluemix.net`. -* Create a Mongo DB service, IBM Bluemix and Pivotal Web Services offer a free MongoLabs service. - * `$ cf create-service mongolab sandbox mean-mongo` +* Create a Mongo DB service. ++ * If you are using Pivotal Web Services run `$ cf create-service mongolab sandbox mean-mongo` ++ * If you are using IBM Bluemix run `$ cf create-service mongodb 100 mean-mongo` * Clone the GitHub repo for MEANJS if you have not already done so * `$ git clone https://github.com/meanjs/mean.git && cd mean` * Run `$ npm install` @@ -260,4 +321,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/config/env/cloud-foundry.js b/config/env/cloud-foundry.js index 3a00da099d..6f7750bf00 100644 --- a/config/env/cloud-foundry.js +++ b/config/env/cloud-foundry.js @@ -1,9 +1,15 @@ 'use strict'; var cfenv = require('cfenv'), - appEnv = cfenv.getAppEnv(), - cfMongoUrl = appEnv.getService('mean-mongo') ? - appEnv.getService('mean-mongo').credentials.uri : undefined; + appEnv = cfenv.getAppEnv(); +var cfMongoUrl = (function() { + if (appEnv.getService('mean-mongo')) { + var mongoCreds = appEnv.getService('mean-mongo').credentials; + return mongoCreds.uri || mongoCreds.url; + } else { + throw new Error('No service names "mean-mongo" bound to the application.'); + } +}()); var getCred = function (serviceName, credProp) { return appEnv.getService(serviceName) ? diff --git a/gulpfile.js b/gulpfile.js index 861c3b83d4..45eea9dfa8 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -18,7 +18,8 @@ var _ = require('lodash'), endOfLine = require('os').EOL, protractor = require('gulp-protractor').protractor, webdriver_update = require('gulp-protractor').webdriver_update, - webdriver_standalone = require('gulp-protractor').webdriver_standalone; + webdriver_standalone = require('gulp-protractor').webdriver_standalone, + KarmaServer = require('karma').Server; // Set NODE_ENV to 'test' gulp.task('env:test', function () { @@ -207,6 +208,11 @@ gulp.task('mocha', function (done) { // Karma test runner task gulp.task('karma', function (done) { + new KarmaServer({ + configFile: __dirname + '/karma.conf.js', + singleRun: true + }, done).start(); + return gulp.src([]) .pipe(plugins.karma({ configFile: 'karma.conf.js', diff --git a/manifest.yml b/manifest.yml index 9f732b7b42..d00ebda826 100644 --- a/manifest.yml +++ b/manifest.yml @@ -1,8 +1,8 @@ --- -declared-services: - mean-mongo: - label: mongolab - plan: sandbox +declared-services: + mean-mongo: + label: mongodb + plan: 100 applications: - name: mean host: mean-${random-word} diff --git a/package.json b/package.json index 7bbbe5a874..d6bd9669fb 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "meanjs", "description": "Full-Stack JavaScript with MongoDB, Express, AngularJS, and Node.js.", - "version": "0.4.1", - "meanjs-version": "0.4.1", + "version": "0.4.2", + "meanjs-version": "0.4.2", "private": false, "author": "https://github.com/meanjs/mean/graphs/contributors", "license": "MIT", @@ -11,8 +11,8 @@ "url": "https://github.com/meanjs/mean.git" }, "engines": { - "node": ">=0.10.28", - "npm": ">=1.4.28" + "node": ">=0.12.0", + "npm": ">=2.0.0" }, "scripts": { "start": "grunt", @@ -77,7 +77,7 @@ "grunt-contrib-watch": "~0.6.1", "grunt-env": "~0.4.4", "grunt-eslint": "~17.3.1", - "grunt-karma": "~0.11.2", + "grunt-karma": "~0.12.1", "grunt-mocha-istanbul": "^2.4.0", "grunt-mocha-test": "~0.12.7", "grunt-ng-annotate": "^1.0.1", @@ -93,7 +93,6 @@ "gulp-cssmin": "~0.1.7", "gulp-eslint": "~1.0.0", "gulp-jshint": "^1.11.2", - "gulp-karma": "~0.0.4", "gulp-less": "^3.0.3", "gulp-livereload": "^3.8.0", "gulp-load-plugins": "^1.0.0-rc.1", @@ -105,7 +104,8 @@ "gulp-sass": "^2.0.3", "gulp-uglify": "^1.2.0", "gulp-util": "^3.0.6", - "karma": "~0.12.37", + "istanbul": "~0.4.0", + "karma": "~0.13.14", "karma-chrome-launcher": "~0.2.0", "karma-coverage": "~0.4.2", "karma-firefox-launcher": "~0.1.6",