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

199 Commits (0a4a50f04021ddfb07a76afd21026738b99ef991)

Author SHA1 Message Date
Berkeley Martinez 1308d312a4 Add methods to get challengeMap 
Update boot/challenge.js to use new methods
Update boot/user.js to use new methods
 2016-04-06 21:11:07 -07:00
Quincy Larson e98fc9d9ff Remove Google and Facebook links from user profiles and settings page for privacy reasons 2016-04-04 22:21:34 -07:00
Quincy Larson d47aed4850 factor out settings page with email settings 2016-03-14 23:59:24 -07:00
Berkeley Martinez e657b96dbc Coerce values to string before using validator methods 2016-03-13 18:09:53 -07:00
Berkeley Martinez 74592e72b4 Update eslint, fix lint issues 2016-03-03 17:53:33 -08:00
Berkeley Martinez 8ef3fdb6a0 Initial move to redux 2016-03-03 17:53:33 -08:00
Berkeley Martinez a4dd9667ca Fix typos 2016-02-10 10:09:40 -08:00
Berkeley Martinez 76cfbdf752 challenge/user router now works with challengeMap 2016-02-10 10:09:40 -08:00
Berkeley Martinez 07d54a455c Add challengeMap migrations 2016-02-10 10:06:36 -08:00
Berkeley Martinez c7fc9dc99f Merge pull request #6601 from SaintPeter/feature/challenge-checksum 
Add Checksum to Challenges for Google Analytics
 2016-01-31 17:36:16 -08:00
SaintPeter f2e61ea0ac Add Checksum to Challenges for Google Analytics 2016-01-30 09:02:22 -08:00
JelenaBarinova 29f93df1bb Getting users timezone on client side and passing it to server side within POST (on challenge complete), showing users stats with users timezone 
After CR
 2016-01-26 15:09:47 -08:00
Berkeley Martinez 6b6232fb3e Block certs from cheaters 2016-01-24 15:48:00 -08:00
Arsen Melikyan a5bde55f6e Fixes incorrect redirection to map-aside 2016-01-17 13:28:03 +04:00
Berkeley Martinez 47c930d7f4 Add new help rooms and logic 2016-01-15 04:51:11 -08:00
Berkeley Martinez 52fd15284a Add banning to camper news 2016-01-12 22:07:19 -08:00
Berkeley Martinez a7f04cdc11 Add data vis certification 2016-01-11 15:58:37 -08:00
Berkeley Martinez 1fb321332b Change full stack to back end on job apps 2016-01-05 21:31:48 -08:00
Berkeley Martinez 8c3e14cd8e Fix commit redirect for non signed user. 
Now users will be directed to sign in page and on sign in
will have pledge completed
 2015-12-29 10:57:35 -08:00
Quincy Larson 80bb80b23a minor updates to copy 2015-12-28 16:28:53 -06:00
Berkeley Martinez 600ca2f8ad Fix duplicate email sign in 2015-12-28 13:52:28 -08:00
Berkeley Martinez 0b4052fc38 Add prop to user model 2015-12-14 13:19:30 -08:00
Berkeley Martinez 5c2bdd974a Add isComingSoon flag 2015-12-14 13:19:30 -08:00
Berkeley Martinez f7f587194d Add superblock ordering 2015-12-14 13:19:30 -08:00
Berkeley Martinez adc0ce28e5 Add superBlock to challenge seed 2015-12-14 13:19:30 -08:00
Quincy Larson 7e9d65675a Merge branch 'master' into remove-angular 
Conflicts:
	bower.json
	client/main.js
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade
 2015-12-04 18:49:38 -06:00
Berkeley Martinez 5ae5e087a4 Send down correct discount name 2015-11-23 15:51:42 -08:00
Berkeley Martinez 36067f37cb Add company specific promocodes 2015-11-23 15:38:05 -08:00
Berkeley Martinez d095fd5d90 Feature in dev mode always pull from disk 2015-11-09 17:27:56 -08:00
Berkeley Martinez 5dbfbfcf57 Add head/tail to challenge spec. 
Lint EVERYTHING!
 2015-11-06 17:32:01 -08:00
Quincy Larson d77d78a3b2 Merge branch 'staging' into feature/jobs 
Conflicts:
	seed/jobs.json
 2015-11-02 00:07:16 -08:00
terakilobyte af30d4d56e Implements a 'releasedOn' flag and marks challenges less than 30 days old as NEW https://www.dropbox.com/s/43un2a908ldktpl/Screenshot%202015-11-01%2017.06.53.png 2015-11-01 17:26:26 -08:00
Berkeley Martinez 81c40ddeeb Add promo fetch and associated logic 2015-10-29 17:10:29 -07:00
Berkeley Martinez 568d1ef1d2 Add promo model 2015-10-29 17:10:29 -07:00
Berkeley Martinez dc2df4537d Add howToApply 2015-10-29 17:10:28 -07:00
Berkeley Martinez cc736cda4e Add certs/isRemote flags to job form and model 2015-10-29 17:10:28 -07:00
Berkeley Martinez a65384e698 Make list an actual list instead of accordion 2015-10-29 17:10:26 -07:00
Berkeley Martinez 4577a007f2 Add goback and checkout buttons to preview job 2015-10-29 17:10:26 -07:00
Quincy Larson 5105efa624 add solutions to challenges object and add solutions for upper intermediate bonfires 2015-10-21 15:04:58 -07:00
Berkeley Martinez 1e439aa4c5 hotfix brownie points 2015-10-15 00:33:45 -07:00
Berkeley Martinez c8da944caf Add logic to load nonprofit on query 
Add logic to model update
 2015-10-06 19:51:19 -07:00
Berkeley Martinez 3f96490aff Add pledge model 2015-10-06 19:51:19 -07:00
Quincy Larson b8dc81214d Merge branch 'staging' into remove-angular 
Conflicts:
	server/boot/user.js
	server/views/account/show.jade
 2015-10-06 16:00:59 -07:00
Berkeley Martinez 188da02ffc Fix disable cert 
Disable certificate when user is locked to the public
or when they haven't signed academic honesty
 2015-10-05 20:00:25 -07:00
Berkeley Martinez 8c48626f03 Add certification page 2015-10-05 15:55:50 -07:00
Berkeley Martinez ee35fe075c Feature show Waypoints on user profile page 
This PR also fixes some bugs in lockedDown mode
 2015-10-01 23:03:52 -07:00
Berkeley Martinez 6c305dbc67 feature make completedChallenges uniq 
now when users complete a challenge, it will instead update the
last save if it exists.
 2015-10-01 22:19:26 -07:00
Quincy Larson b197358056 make one page profile with bonfire solution urls 2015-09-30 21:04:16 -07:00
Quincy Larson 7900628d2a Merge pull request #3525 from FreeCodeCamp/feature/jobs 
intermediate pull
 2015-09-28 17:35:13 -07:00
Quincy Larson e74533a727 add lockdown mode toggling 2015-09-27 17:08:56 -07:00
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