gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,925 Commits 9 Branches 0 Tags
09abcf9f20e609cd435cb2de34d82dda4e667d99
Commit Graph

131 Commits

Author SHA1 Message Date
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