Commit Graph

80 Commits

Author SHA1 Message Date
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
Harshad Kale
58d2cbf706 Add linkedin support for login 2014-01-25 12:03:26 -06: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
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
VikramTiwari
57055a355b Everything Latest
Bootstrap Latest
Angular Bootstrap Latest
Angular UI-Utils Latest
2014-01-15 11:57:23 +05:30
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
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
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
Amos Haviv
0c869a2cca Fixing the new Jade issues 2013-12-23 12:37:00 +02:00
Maciej Rzepiński
270d2c3fd6 one more time - update to valid Jade doctype 2013-12-22 21:34:52 +01:00
Amos Haviv
81fea3516d Moving from Underscore to LoDash 2013-12-20 14:15:58 +02:00
Amos Haviv
9c6e5514f0 Moving from Underscore to LoDash 2013-12-20 14:14:54 +02:00
Amos Haviv
1d9f1a0ce3 Update users.js 2013-12-14 20:35:29 +02:00
Amos Haviv
f8ac701c25 Fixing errors style 2013-12-12 18:42:54 +02:00
Andrew Pierce
d3b98529be Added check for empty salt before attempting to encrypt password. If you sign up with OAuth provider and then try to login with Email (local strategy), the Salt is empty and authentication fails. 2013-12-11 16:25:46 -05:00
Andrew Pierce
2def71a53e Moved flash messages from auth.jade to signin.jade. Placed within error div. 2013-12-11 15:49:19 -05:00
Amos Haviv
0697df0b6d Merge pull request #160 from CREO-Agency/statics_overwrite
Don't overwrite statics
2013-12-10 04:33:06 -08:00
Amos Haviv
b99c166f61 Merge pull request #162 from dizda/angular1.2.4
Upgrade to latest stable version of AngularJS (1.2.4)
2013-12-10 04:26:30 -08:00
Amos Haviv
4a07cdec7f Merge pull request #158 from davychiu/master
hash password with pbkdf2
2013-12-10 04:10:46 -08:00
Amos Haviv
218da62417 Fixing the Foot.jade to use env var instead of host 2013-12-10 13:32:05 +02:00
Saulo Vallory
7a872faece Fix bug in foot.jade which tries to assign host instead of comparing it 2013-12-09 21:39:55 -02:00
Jonathan Dizdarevic
f2a85f8dcd Update to AngularJS 1.2.4 2013-12-07 19:30:41 +01:00
John Williams
12037bc566 Don't overwrite statics 2013-12-05 15:45:52 -08:00
Davy Chiu
ebddcd319a hash password with pbkdf2 2013-12-04 05:20:48 -08:00
Amos Haviv
dbe7213f77 Removed the Show User method 2013-12-03 02:43:52 +02:00
Opi Danihelka
bf06b9af5c Bootstrap template dependency fix
After switching of order these two lines, you are now able to use features from Angular Bootstrap UI, for example: ui.bootstrap.popover... Without fix there is a error raised caused by missing bootstrap dependency.
2013-11-08 15:29:44 +01:00
Eric Thomas
1846287082 remove async module 2013-10-23 16:02:23 -06:00
Amos Haviv
cd07a1088d Set bootstrap repo as dep 2013-10-23 18:18:08 +03:00
Amos Haviv
1c242fd25d Merge pull request #109 from indyplanets/no-jquery
Remove jQuery dependency.
2013-10-23 07:30:02 -07:00
Amos Haviv
0714ab1417 Smarter User Model 2013-10-23 17:27:07 +03:00
Amos Haviv
4dd90f1e69 Fixing PR 2013-10-23 12:23:04 +03:00
Amos Haviv
6dbe99653d Merge branch 'master' of git://github.com/pontifier/mean into pontifier-master
Conflicts:
	gruntfile.js
	package.json
2013-10-23 12:14:37 +03:00
Amos Haviv
293fe61d3e Merge pull request #84 from dpmehta02/livereload
Removed livereload from prod
2013-10-23 00:26:42 -07:00
Jason Weaver
3561526b1d Revert back to bootstrap2.3.2 2013-10-20 17:15:05 -05:00
Jason Weaver
4f4d133790 Show mobile nav by default. 2013-10-20 17:03:33 -05:00
Jason Weaver
0773d24094 Updated to use @fyockm bootstrap-css-only repo. Changed header markup to use bootstrap 3 2013-10-20 15:59:32 -05:00
Jason Weaver
f77f715714 Dont bower install bootstrap-assets. Grab twitter bootstrap css from git. 2013-10-17 00:30:06 -05:00
Jason Weaver
c11b2b5f1c Remove jQuery dependency. Default to bootstrap components written in pure AngularJS. 2013-10-16 14:21:17 -05:00
John Fenley
b6830ba380 Better user model behavior and test teardown 2013-10-11 18:03:52 -06:00
John Fenley
5022bc258b Use Scrypt for password hashes 2013-10-11 15:33:50 -06:00
Dave Rapin
97fc8158d9 Switched to bootstrap-assets bower component so we have css and js files instead of less. When this project moves to BS3, change this back to the main bootstrap repo and use the dist directory. 2013-10-09 09:20:00 -04:00
Amos Haviv
fe50b418ae Fixing models auto loading bug 2013-09-29 16:00:23 +03:00