Commit Graph

3533 Commits

Author SHA1 Message Date
a334b9870c Set up production variables 2015-06-15 18:24:26 -04:00
472834e39b Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-15 18:11:06 -04:00
988242df03 Ensure build process is part of npm install 2015-06-15 18:10:48 -04:00
ef55a4128b remove coverage from tracking.
closes #900
2015-06-15 15:06:15 -07:00
a82a8fb044 move to dashedName lookup 2015-06-15 14:50:54 -04:00
40ce1d8162 Refactor to use dashedName for challenges in lookup. 2015-06-15 08:01:43 -04:00
5e3edf5cda Merge branch 'master' into staging 2015-06-14 01:10:51 -07:00
43f347bae0 Merge branch 'calculator' into staging
Conflicts:
	app.js
	controllers/resources.js
	seed/field-guides.json
2015-06-14 01:10:48 -07:00
b6fc2551d9 Merge branch 'interview' into staging
Conflicts:
	app.js
	controllers/challenge.js
	seed/future-jquery-ajax-json.json
2015-06-14 01:02:39 -07:00
b411426874 add dashedName attribute to challenge 2015-06-14 00:56:47 -07:00
2b7177e856 add dashedName attributes to JSON 2015-06-14 00:55:27 -07:00
2c8a134e80 first challenge json file updated with dashedname 2015-06-13 23:50:36 -07:00
cb0485cb15 update meta 2015-06-13 13:42:59 -07:00
320d84c3c1 Make bower automatic, add gulp build task to build less file into css 2015-06-12 23:31:42 -04:00
cf47e5374f Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-12 21:10:18 -04:00
af75452db5 Remove forcedomain so we can test beta website 2015-06-12 21:09:12 -04:00
f6fbe6e9c7 make username unique and make username required 2015-06-12 16:40:49 -07:00
5b2b7e23ae Take id property of username, remove wasteful save on profile lookup. 2015-06-12 19:16:10 -04:00
d07e5351ea Comment out blacklist 2015-06-12 18:55:47 -04:00
071331de83 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-12 18:32:31 -04:00
90b2f99a70 add create identities on flatten users 2015-06-12 15:27:51 -07:00
e29a340afb add blacklisted usernames to loopback user validations 2015-06-12 13:54:38 -07:00
63937c3a56 fix make usernames required 2015-06-12 13:14:07 -07:00
2c2b0d18ba Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-12 15:45:14 -04:00
173d46ae01 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	seed/field-guides.json
2015-06-12 12:40:26 -07:00
2e7f2e4e3e Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-12 15:30:25 -04:00
3979dc42b9 start importing calculator 2015-06-12 11:59:07 -07:00
0f5f92b937 fix user deletion of credentials
should use a where clause with destroyAll
2015-06-12 11:58:31 -07:00
070a80cb79 set saltfactor for Passwords 2015-06-12 11:38:00 -07:00
b9b5a649ee fix grab user photo from profile 2015-06-11 21:12:47 -07:00
52b529fbdf rename generic test file 2015-06-11 23:21:50 -04:00
03df5cf492 remove reference to original alumni network 2015-06-11 19:01:31 -07:00
7077b18480 fix twitch view 2015-06-11 18:57:22 -07:00
ae3f253f5b Update index file for gh-pages 2015-06-11 21:28:45 -04:00
f0604ec9c7 Add istanbul and generate ininital coverage report 2015-06-11 21:21:02 -04:00
a5092d379d Merge conflicts and clean up lint errors. 2015-06-11 21:08:40 -04:00
223ea2a393 Merge conflicts and clean up lint errors. 2015-06-11 21:08:16 -04:00
3017991de5 Finished local user login flow 2015-06-11 21:03:01 -04:00
c2f408fb56 add blacklist to usernames 2015-06-11 17:04:48 -07:00
5be6ce7193 add delete user idenity and credentials after profile deletion 2015-06-11 16:57:06 -07:00
34c3fef7d4 Move api hooks to user.js 2015-06-11 19:11:07 -04:00
66d4ffba32 update modal 2015-06-11 15:46:41 -07:00
1e8d58068c add LinkedIn easy route 2015-06-11 15:34:06 -07:00
d56cee1f72 update challenge map and news nav 2015-06-11 15:01:21 -07:00
f7bb14803e Update field guides to display properly. Correct models on user object. 2015-06-11 16:19:44 -04:00
0aa83f1bb9 Remove mongoose style lookup from fieldguide.js. Update user model. 2015-06-11 15:33:38 -04:00
0b1c23207d Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-11 15:18:45 -04:00
3115ba6404 update tests 2015-06-11 15:18:37 -04:00
0d32cf701f fix find instance or currentInstance 2015-06-11 12:17:53 -07:00
b3fb1d492d Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-11 11:39:20 -07:00