326 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
Amos Haviv	5a780aa34c	Adding Bower Resolutions	2013-12-23 19:52:54 +02:00
Amos Haviv	86186ad151	Fixing Facebook Redirect	2013-12-23 19:45:27 +02:00
Amos Haviv	ef50e5da0d	Fixing Facebook Redirect	2013-12-23 19:36:55 +02:00
Amos Haviv	46715a1268	Fixing Facebook Redirect	2013-12-23 19:17:32 +02:00
Amos Haviv	14147f7f88	Moving router above static	2013-12-23 12:40:23 +02:00
Amos Haviv	0c869a2cca	Fixing the new Jade issues	2013-12-23 12:37:00 +02:00
Amos Haviv	614a9dfb12	Merge pull request #196 from mrzepinski/patch-2 ... one more time - update to valid Jade doctype	2013-12-23 02:06:45 -08: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	bac1a06628	Fixing Heroku Bower Failure	2013-12-19 21:05:27 +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
Amos Haviv	d36b852e40	Merge pull request #173 from andrunix/master ... On the signin page, the error div was always visible even if it was empty.	2013-12-12 06:47:06 -08: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	50b3b88c58	Fixing Travis Stall	2013-12-10 14:50:44 +02: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	209b7023da	AngularJS latest is good for now	2013-12-10 14:29:14 +02: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
Amos Haviv	2d1542511b	Merge pull request #169 from theblacksmith/master ... Fix bug in foot.jade which tries to assign host instead of comparing it	2013-12-10 03:29:38 -08: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	1e75b420c8	lock to specified JS dependencies version	2013-12-07 19:41:48 +01:00
Jonathan Dizdarevic	f0ae031423	fix tests	2013-12-07 19:33:03 +01: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