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

199 Commits (b5bc822acf083f2b5923939e8be807b34e10361b)

Author SHA1 Message Date
Quincy Larson d08c3e5a88 Merge pull request #3514 from FreeCodeCamp/tshirt 
Tshirt voting mechanism
 2015-09-27 11:06:26 -07:00
Quincy Larson ccf5504537 add tshirt voting mechanism 2015-09-27 10:49:44 -07:00
Berkeley Martinez 8148c1a19c save form to localStorage 2015-09-24 20:30:18 -07:00
Quincy Larson de976c18ba remove email address from stories 2015-09-23 15:20:45 -07:00
Quincy Larson 51af4e4b0d Merge branch 'google-cdns' into remove-angular 
Conflicts:
	server/boot/user.js
	server/views/account/show.jade
	server/views/account/signin.jade
	server/views/coursewares/showBonfire.jade
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade
 2015-09-23 09:56:01 -07:00
Berkeley Martinez 70b823ca63 add phone number input 
change validation function scheme
update validator
 2015-09-22 17:19:14 -07:00
Berkeley Martinez df3918cc53 fix email login not case sensitive 2015-08-25 22:27:01 -07:00
Berkeley Martinez 0f3acc629c fix profile linking 2015-08-21 16:09:07 -07:00
Quincy Larson 1dadc48aea remove angular from user account creation flows 2015-08-19 15:55:40 -07:00
Berkeley Martinez 456bf20b05 fix should hard code domain for password reset 2015-08-18 01:40:26 -07:00
Berkeley Martinez 1d3f7331fb email reset use port in dev 2015-08-18 01:32:38 -07:00
Berkeley Martinez 112972cfdd fix enables email login 2015-08-18 01:32:37 -07:00
Berkeley Martinez de7eb3d440 fix email password reset 2015-08-16 09:54:59 -07:00
Berkeley Martinez 129eebcc41 fix type should be rand not updated 2015-08-15 12:28:19 -07:00
Berkeley Martinez 13b38aefb5 add random attribute to user props 
Allows easier random sampling
 2015-08-15 12:19:36 -07:00
Berkeley Martinez dfb85e4ba7 fix prevent crash from user migrated profiles 2015-08-14 18:24:13 -07:00
Berkeley Martinez 4b0a9bef0a fix social auth scheme 
closes #1734
 2015-08-12 20:10:12 -07:00
Berkeley Martinez eb07cbfea6 fix override user identity login to reformat provider 2015-08-12 20:10:12 -07:00
Berkeley Martinez fc29c1fd9b linking accounts now works. 
bug, need to change how loopback generates provider string.
 2015-08-12 20:10:11 -07:00
Berkeley Martinez a4e220e2bc Move auth functions to central location 2015-08-12 20:10:11 -07:00
Berkeley Martinez 0838486483 properly define id fields for basic models 
closes #1724
 2015-08-11 14:49:57 -07:00
Berkeley Martinez 2256f3ef6e fix add github link to passport 2015-08-10 23:38:10 -07:00
Berkeley Martinez 5f21db457d fix challenge ordering 
Now challenges are ordered on map first by top order value of json file
second by index of array
 2015-08-10 23:29:32 -07:00
Quincy Larson 7bfe61731b give a user a brownie point when they start 2015-08-10 20:55:01 -07:00
Berkeley Martinez 967f92e6f4 fix challenge naming scheme 2015-08-09 22:46:44 -07:00
Berkeley Martinez 2476f35309 add challenge order to individual challenge 2015-08-09 07:40:16 -07:00
Berkeley Martinez 26e69c8621 add type to challenges 2015-08-07 23:37:32 -07:00
Berkeley Martinez 83397b7e1b add picture on github signin/up 2015-08-07 18:10:32 -07:00
Berkeley Martinez ce9e2ebcae fix test email for string 2015-08-05 22:56:23 -07:00
Berkeley Martinez 0ce81bbabb fix email sign should not require username 2015-08-05 19:29:17 -07:00
Berkeley Martinez e6d05e3421 fix specify index using mongodb property 2015-08-05 19:08:25 -07:00
Berkeley Martinez 8c7a9dd818 fix trim and lowercase user username and email 2015-08-05 18:51:15 -07:00
Berkeley Martinez e9958281c9 pull user bio from github 2015-08-05 17:49:54 -07:00
Berkeley Martinez 3cfd69c704 add loopbackMigrationGrandfathered flag 2015-08-05 13:01:48 -07:00
Quincy Larson 61aed73fa8 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-04 15:15:33 -07:00
Quincy Larson 5f2ec0aeae Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp i:wq 
nto staging
 2015-08-04 15:10:15 -07:00
Berkeley Martinez d752e5b487 on login double check that github username 
if different, assign user to new name
 2015-08-04 15:09:42 -07:00
Quincy Larson c573caf2e2 remove website links from user model and account view 2015-08-04 14:57:34 -07:00
Berkeley Martinez 9196d1c48e add github check on login with github. 2015-08-04 14:52:29 -07:00
Berkeley Martinez 2dc9934da2 add user.isGithubCool check 
if user signs up with github, they become GithubCool.
 2015-08-04 13:41:10 -07:00
Berkeley Martinez 70c5bcea20 fix error message string 2015-08-04 10:52:41 -07:00
Berkeley Martinez c2720d784c add debug flag to giveBrowniePoints endpoint 2015-08-01 20:08:32 -07:00
Quincy Larson feab8b508e remove field guide cruft and update all field guide links to wiki 2015-07-31 21:55:49 -07:00
Berkeley Martinez 13f2f349dc remove bonfire/comments models 
remove comments from user router
 2015-07-31 20:22:08 -07:00
Berkeley Martinez e7f522a611 fix giveBrowniePoints error messages 2015-07-31 13:45:45 -07:00
Berkeley Martinez 0e21d6eb30 set browniePoints timeout to 30 seconds for dev 2015-07-31 12:45:34 -07:00
Berkeley Martinez f1b964a26d send back user bio on giveBroniePoints 2015-07-31 12:16:27 -07:00
Berkeley Martinez fa47ed9afb remove extra debugs 2015-07-29 15:10:03 -07:00
Berkeley Martinez 5533779d45 add give brownie points!!!! 2015-07-29 15:00:24 -07:00
Berkeley Martinez 9731e8ccc6 fix return callbacks 2015-07-29 11:41:41 -07:00
Berkeley Martinez 9e22122832 adds user/about 2015-07-29 11:32:16 -07:00
Berkeley Martinez 9bc14d24a4 Display contact information for job and size thumbnail 2015-07-26 07:57:14 -07:00
Berkeley Martinez f547ce32f7 update jobs model and jobs seed 2015-07-25 21:59:52 -07:00
Berkeley Martinez 4792485ac4 show jobs route up 2015-07-25 21:32:18 -07:00
Berkeley Martinez 6de5ad682e Get rid of uncompletedChallenges on user object 2015-07-23 16:03:52 -07:00
Berkeley Martinez 3df60136e8 add title field to challenges 2015-07-23 16:03:46 -07:00
Berkeley Martinez 8b0b5dd6ce split field guides into separate categories 2015-07-23 15:50:47 -07:00
Quincy Larson 378f6da221 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 
Conflicts:
	public/js/main_0.0.3.js
	seed/challenges/get-set-for-free-code-camp.json
	seed/field-guides.json
 2015-06-26 01:08:40 -07:00
Quincy Larson 6700729658 update emails and refine sponsor view 2015-06-25 23:35:48 -07:00
Berkeley Martinez 3e24f21828 fix comment model defaults 2015-06-24 08:24:13 -07:00
Berkeley Martinez 62d2c40a87 Add read access to all models 2015-06-24 08:23:49 -07:00
Berkeley Martinez 5bde1839f3 add read authority to all for stories and comments 2015-06-24 07:25:56 -07:00
Berkeley Martinez b383da47bb fix uncompletedBonfires should default to empty array 2015-06-22 19:18:15 -07:00
terakilobyte e08f895769 Handle invalid login 2015-06-16 00:29:32 -04:00
terakilobyte 070c248132 Handle invalid login 2015-06-16 00:27:32 -04:00
Berkeley Martinez c4d229e62d remove email verification step. 
users are marked for future uses
 2015-06-15 15:43:12 -07:00
Quincy Larson b411426874 add dashedName attribute to challenge 2015-06-14 00:56:47 -07: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
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
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 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
terakilobyte 34c3fef7d4 Move api hooks to user.js 2015-06-11 19:11:07 -04:00
terakilobyte f7bb14803e Update field guides to display properly. Correct models on user object. 2015-06-11 16:19:44 -04:00
terakilobyte 0aa83f1bb9 Remove mongoose style lookup from fieldguide.js. Update user model. 2015-06-11 15:33:38 -04:00
Berkeley Martinez 0d32cf701f fix find instance or currentInstance 2015-06-11 12:17:53 -07:00
Berkeley Martinez fe5cbec117 add pull in user image on signup when available 2015-06-11 11:38:08 -07:00
Berkeley Martinez af902799b1 add acl controls to models 2015-06-10 23:59:42 -07:00
Berkeley Martinez 9f5ace03dc fix acls access for user exists remote method 2015-06-10 17:11:32 -07:00
Berkeley Martinez bdb7d40548 fix usernames should be saved lowercased 2015-06-10 15:22:57 -07:00
Berkeley Martinez a8494b29da add user signup through loopback 2015-06-09 16:45:14 -07:00
terakilobyte 4f9061bffb Sort out story model. 2015-06-05 14:53:12 -04:00
Berkeley Martinez 0ac664c9ae Use mongodb sparse indexing for user emails 2015-06-04 14:21:01 -07:00
Quincy Larson 3654bb7e6f change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Berkeley Martinez a695daa03f add default empty array to user.completedChallenges 2015-06-04 13:09:22 -07:00
Berkeley Martinez db37482c59 Flatten user object 2015-06-04 12:47:31 -07:00
Berkeley Martinez 66eff31294 Adding passport config stuff 2015-06-04 10:52:12 -07:00
Berkeley Martinez 75f9b06e90 fix incorrect model name 2015-06-03 16:48:17 -07:00
Quincy Larson 57893cf714 two more minor fixes 2015-06-02 16:58:12 -07:00
Quincy Larson a6dc24521d update models to be loopback compliantgs 2015-06-02 16:57:57 -07:00
Berkeley Martinez 88a512d96c refactor bonfire to loopback json 2015-06-02 16:08:50 -07:00
Berkeley Martinez 279f953628 Move models to common/models 
closes #795
 2015-06-02 15:05:26 -07:00