greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,593 Commits
4 Branches
0 Tags
959 MiB
Commit Graph

3593 Commits (bb6f1538588af279fddb608b0882aa09c50441da)

Author SHA1 Message Date
terakilobyte 4092dcecf7 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-15 18:50:31 -04:00
terakilobyte c136895064 Rewrite challenge controller to use dashed names, update index.js to include new utility function getDashedNames 2015-06-15 18:50:18 -04:00
Berkeley Martinez b0dc4ffa12 get account should redirect to '/' when no user is logged in 2015-06-15 15:47:56 -07:00
Berkeley Martinez c4d229e62d remove email verification step. 
users are marked for future uses
 2015-06-15 15:43:12 -07:00
terakilobyte a334b9870c Set up production variables 2015-06-15 18:24:26 -04:00
terakilobyte 472834e39b Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-15 18:11:06 -04:00
terakilobyte 988242df03 Ensure build process is part of npm install 2015-06-15 18:10:48 -04:00
Berkeley Martinez ef55a4128b remove coverage from tracking. 
closes #900
 2015-06-15 15:06:15 -07:00
Quincy Larson ac282697ea Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-15 11:56:37 -07:00
terakilobyte a82a8fb044 move to dashedName lookup 2015-06-15 14:50:54 -04:00
Quincy Larson bd7494c909 Update directory.jade 2015-06-15 11:42:33 -07:00
terakilobyte 40ce1d8162 Refactor to use dashedName for challenges in lookup. 2015-06-15 08:01:43 -04:00
Quincy Larson 6c33d4bf78 calculator works 2015-06-14 21:17:48 -07:00
Quincy Larson 0ef39904a9 major improvements to calculator logic 2015-06-14 17:55:23 -07:00
Quincy Larson 2a98e5c851 fix calculator view file location 2015-06-14 01:39:22 -07:00
Quincy Larson 5e3edf5cda Merge branch 'master' into staging 2015-06-14 01:10:51 -07:00
Quincy Larson 43f347bae0 Merge branch 'calculator' into staging 
Conflicts:
	app.js
	controllers/resources.js
	seed/field-guides.json
 2015-06-14 01:10:48 -07:00
Quincy Larson 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
Quincy Larson b411426874 add dashedName attribute to challenge 2015-06-14 00:56:47 -07:00
Quincy Larson 2b7177e856 add dashedName attributes to JSON 2015-06-14 00:55:27 -07:00
Quincy Larson 2c8a134e80 first challenge json file updated with dashedname 2015-06-13 23:50:36 -07:00
Nathan bc37c9bbfb Update README 
Put it note about switching to loopback.
 2015-06-13 23:26:58 -04:00
Quincy Larson cb0485cb15 update meta 2015-06-13 13:42:59 -07:00
terakilobyte 320d84c3c1 Make bower automatic, add gulp build task to build less file into css 2015-06-12 23:31:42 -04:00
terakilobyte cf47e5374f Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-12 21:10:18 -04:00
terakilobyte af75452db5 Remove forcedomain so we can test beta website 2015-06-12 21:09:12 -04:00
Berkeley Martinez f6fbe6e9c7 make username unique and make username required 2015-06-12 16:40:49 -07:00
terakilobyte 5b2b7e23ae Take id property of username, remove wasteful save on profile lookup. 2015-06-12 19:16:10 -04:00
terakilobyte d07e5351ea Comment out blacklist 2015-06-12 18:55:47 -04:00
terakilobyte 071331de83 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-12 18:32:31 -04:00
Berkeley Martinez 90b2f99a70 add create identities on flatten users 2015-06-12 15:27:51 -07:00
Berkeley Martinez e29a340afb add blacklisted usernames to loopback user validations 2015-06-12 13:54:38 -07:00
Berkeley Martinez 63937c3a56 fix make usernames required 2015-06-12 13:14:07 -07:00
terakilobyte 2c2b0d18ba Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-12 15:45:14 -04:00
Quincy Larson 173d46ae01 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 
Conflicts:
	seed/field-guides.json
 2015-06-12 12:40:26 -07:00
terakilobyte 2e7f2e4e3e Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-12 15:30:25 -04:00
Quincy Larson 3979dc42b9 start importing calculator 2015-06-12 11:59:07 -07:00
Berkeley Martinez 0f5f92b937 fix user deletion of credentials 
should use a where clause with destroyAll
 2015-06-12 11:58:31 -07:00
Berkeley Martinez 070a80cb79 set saltfactor for Passwords 2015-06-12 11:38:00 -07:00
Berkeley Martinez b9b5a649ee fix grab user photo from profile 2015-06-11 21:12:47 -07:00
terakilobyte 52b529fbdf rename generic test file 2015-06-11 23:21:50 -04:00
Quincy Larson 03df5cf492 remove reference to original alumni network 2015-06-11 19:01:31 -07:00
Quincy Larson 7077b18480 fix twitch view 2015-06-11 18:57:22 -07:00
terakilobyte ae3f253f5b Update index file for gh-pages 2015-06-11 21:28:45 -04:00
terakilobyte f0604ec9c7 Add istanbul and generate ininital coverage report 2015-06-11 21:21:02 -04:00
terakilobyte a5092d379d Merge conflicts and clean up lint errors. 2015-06-11 21:08:40 -04:00
terakilobyte 223ea2a393 Merge conflicts and clean up lint errors. 2015-06-11 21:08:16 -04:00
terakilobyte 3017991de5 Finished local user login flow 2015-06-11 21:03:01 -04:00
Berkeley Martinez c2f408fb56 add blacklist to usernames 2015-06-11 17:04:48 -07:00
Berkeley Martinez 5be6ce7193 add delete user idenity and credentials after profile deletion 2015-06-11 16:57:06 -07:00