Commit Graph

1954 Commits

Author SHA1 Message Date
Lior Kesos
752854fafa Fixed consolidate dying on behalf of a cache=true, it needs to be cahce=memory 2014-02-06 23:58:22 +02:00
Lior Kesos
f0eb648cbd Merge pull request #236 from fyockm/master
use consolidate to make template engine configurable
2014-02-06 22:01:47 +02:00
Drew Fyock
30d949428e #236 add .idea to gitignore 2014-02-06 13:51:41 -05:00
Drew Fyock
f57b51d485 #236 fix travis asking for user input 2014-02-03 14:03:46 -05:00
Drew Fyock
a0c9de3756 #236 implement swig instead of jade 2014-02-03 13:46:39 -05:00
Drew Fyock
c2330e574c #326 merge latest 2014-02-01 11:50:48 -05:00
Lior Kesos
8499c45df4 Added requirement to passport-linkedin to the package.json to fulfill missing requirement. 2014-01-26 23:47:14 +02:00
Lior Kesos
febf917679 Merge branch 'linkedin' of https://github.com/kalehv/mean into kalehv-linkedin 2014-01-26 23:39:37 +02:00
Lior Kesos
87e701d05c Merge pull request #243 from jonaswindey/patch-2
Update .bowerrc
2014-01-26 13:29:20 -08:00
Lior Kesos
79076086a9 upgrade to angular 1.2.10 to avoid interaction in bower installed based on https://github.com/linnovate/mean/pull/245 by #sogko 2014-01-26 23:24:23 +02:00
Harshad Kale
58d2cbf706 Add linkedin support for login 2014-01-25 12:03:26 -06:00
jonaswindey
c6b6758cb5 Update .bowerrc
Added fix for Heroku deployment ENOENT issues that occur since bower 1.2.8
2014-01-22 17:52:22 +01:00
Lior Kesos
d59bf8645d Merge branch 'master' of https://github.com/lirantal/mean into lirantal-master 2014-01-21 22:51:52 +02:00
Liran Tal
8324179ca2 cleaning up jslint warnings 2014-01-21 21:51:14 +02:00
Lior Kesos
526fc0a9d7 Merge branch 'enhancement-authtypes_refactor' of https://github.com/lirantal/mean into lirantal-enhancement-authtypes_refactor 2014-01-20 23:55:50 +02:00
Lior Kesos
a5410c0fee Merge branch 'master' of https://github.com/VikramTiwari/mean into VikramTiwari-master 2014-01-19 22:58:31 +02:00
Yonatan Ellman
6b9826b2c4 Merge pull request #240 from ellman/master
Fixing grunt-nodemon and some dev dependency versions
2014-01-19 00:56:54 -08:00
yonatan
fac6ab852a Fixing grunt-nodemon and some dev dependency versions 2014-01-19 10:52:33 +02:00
Liran Tal
55aeaadd61 fixed defect where no flash (error/success) messages would be displayed due to wrongly placed flash() call (it should go after passport.initialize and passport.session) 2014-01-18 00:22:16 +02:00
Drew Fyock
412d6b3336 use consolidate to make template engine configurable 2014-01-17 10:28:09 -05:00
Liran Tal
6bacb0c79e Merge branch 'enhancement-routes_refactor' 2014-01-16 21:38:04 +02:00
Liran Tal
f0d9291895 Merge branch 'enhancement-authtypes_refactor' 2014-01-16 21:37:55 +02:00
VikramTiwari
c0de03085d Current Stable
Update to Current Stable versions for dependencies.

angular: 1.2.8
bootstrap: 3.0.3
angular-boostrap: 0.10.0
angular-ui-utils: 0.1.0
2014-01-15 14:11:19 +05:30
VikramTiwari
57055a355b Everything Latest
Bootstrap Latest
Angular Bootstrap Latest
Angular UI-Utils Latest
2014-01-15 11:57:23 +05:30
Lior Kesos
02ff85a501 Merge pull request #226 from lirantal/master
comment fixes, indentation and general cosmetic cleanup
2014-01-14 14:09:10 -08:00
Liran Tal
dea044c2e1 further refactoring of the route middlewares so they can be easily shared amongst app routes 2014-01-13 00:42:53 +02:00
Liran Tal
0afb2e6ec9 refactoring so that app routes can be maintained more easily from app/ directory (which makes more sense) 2014-01-12 23:55:34 +02:00
Liran Tal
3963892615 small bug fix where Mongoose validation functions must always return booleans 2014-01-12 23:30:30 +02:00
Liran Tal
969c6911d8 instead of relying on previously hard-coded passport strategies we can assume that any user entry which have no provider set is a local strategy and apply our validations only on those empty provider members of the user model object 2014-01-12 23:27:17 +02:00
Lior Kesos
5c950bf605 Set versions based on npm install --save 2014-01-06 01:31:38 +02:00
Liran Tal
ee63f1712e moving out configuration items from express.js code to a proper configuration directive 2014-01-06 00:11:37 +02:00
Liran Tal
e2ea8dace9 fixed small bug where logger was used also on production environment. Makes sense that original intent was to enable only for development environment 2014-01-05 23:27:18 +02:00
Liran Tal
add000d3a1 updating documentation 2014-01-05 23:14:11 +02:00
Liran Tal
0e692c5bfc comment fixes, indentation and general cosmetic cleanup 2014-01-05 22:58:39 +02:00
Amos Haviv
bb910c5981 Merge pull request #213 from cm0s/master
replace deprecated grunt-nodemon debug option
2013-12-30 06:18:47 -08:00
Amos Haviv
6876427698 Merge pull request #215 from jonaswindey/patch-1
Update package.json
2013-12-30 06:15:21 -08:00
Amos Haviv
923f744eac Merge pull request #212 from mackstar/master
Replaced dependency on server.js for mocha tests.
2013-12-30 06:14:54 -08:00
jonaswindey
6993150dcf Update package.json
Re-added forever.js reference, since the Procfile for Heroku deployment runs: web: ./node_modules/.bin/forever -m 5 server.js
2013-12-30 12:48:28 +01:00
Nicolas Forney
8f30cda7df replace deprecated grunt-nodemon debug option
Since grunt-nodemon version 0.1.0 the debug option is deprecated and must
be replaced by a nodeArgs option.
2013-12-30 00:31:15 +01:00
Richard McIntyre
c639ae65c2 Require server in gruntfile for mocha tests. 2013-12-29 15:27:31 +00:00
Richard McIntyre
cf7a3f0486 Replaced dependency on server.js for mocha tests. 2013-12-29 15:22:09 +00:00
Amos Haviv
963794a7f7 Removed unnecessary modules 2013-12-25 18:08:36 +02:00
Amos Haviv
4c0ee357bd Fixing enviornment issue with new JSHint 2013-12-25 16:54:08 +02:00
Amos Haviv
d8fe54d14f Properly run JSHint 2013-12-25 16:37:19 +02:00
Amos Haviv
822d7ca7b2 Properly run JSHint 2013-12-25 16:36:33 +02:00
Amos Haviv
2435a73291 Merge pull request #202 from naartjie/fix-02
correct the livereload host
2013-12-25 06:35:45 -08:00
Amos Haviv
d35cd02b82 Fixing jshint 2013-12-25 13:20:54 +02:00
Amos Haviv
2cd3512fef Merge pull request #203 from gebrits/patch-1
update gruntfile.js to let jshint adhere to .jshintrc
2013-12-24 07:13:39 -08:00
Geert-Jan Brits
a2f31f2c5d update gruntfile.js to let jshint adhere to .jshintrc
currently the `jshint:all` task doesn't take the .jshintrc-file into account. This pull corrects that.
2013-12-24 15:43:27 +01:00
Marcin Jekot
c9193642c9 correct the livereload host
This let's you use an arbitrary host in development mode, and do cross machine/VM testing etc, with a hostname other than localhost
2013-12-24 15:31:28 +02:00