Commit Graph

135 Commits (668bd74690b7d110334b1e3d93188fe48c7c8e48)

Author SHA1 Message Date
Quincy Larson bcba082efc start simplifying views 2016-01-15 04:25:27 -08:00
Berkeley Martinez 5b681bfdfd Re-add btn classes to account page 2016-01-15 04:14:38 -08:00
Quincy Larson 8e71cdd4b8 start working on ghost-only buttons 2016-01-15 04:14:38 -08:00
Quincy Larson c36b8352d2 further build up challengemap 2016-01-15 04:14:38 -08:00
Quincy Larson 7eefcb0705 more redesign work on challenge views 2016-01-15 04:10:16 -08:00
Quincy Larson 4101a6c34a start simplifying views 2016-01-15 04:09:57 -08:00
Berkeley Martinez a7f04cdc11 Add data vis certification 2016-01-11 15:58:37 -08:00
Quincy Larson 649cfb72f8 make sync data from GitHub button's text more clear 2016-01-10 18:20:13 -08:00
Quincy Larson 80bb80b23a minor updates to copy 2015-12-28 16:28:53 -06:00
Berkeley Martinez 83e43dbbff Merge pull request #5134 from LenaBarinova/fix/streak-still-seems-to-be-broken
Current and Longest streak calculation fixed
2015-12-18 21:00:47 -08:00
Quincy Larson 6e85de9efe improve copy on some buttons and fix challenge map css issues 2015-12-17 01:28:40 -06:00
JelenaBarinova 6c7d2685fd Current and Longest streak calculation fixed
Minor refactoring and unit tests added

After CR: user-stats file moved to util folder, export keywork added to exported functions, new line added at the end of gulp file

User-stats-test file moved to replicate user-stats path in test folder
2015-12-15 18:33:04 -05:00
Berkeley Martinez 2aa611047f Change full stack to back end 2015-12-14 13:19:30 -08:00
Berkeley Martinez f709ee30ee Fix for completedDate missing 2015-12-08 16:17:45 -08:00
Berkeley Martinez 5270f0e42e Make tag replacement more robust
Some challenges are incorrectly saved with no solutions
2015-12-08 11:30:47 -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 f8d68bcfa2 Hotfix revert heat-map offset 2015-11-20 11:24:02 -08:00
Quincy Larson 0695860434 improve styling of completed challenges table 2015-11-13 17:08:51 -08:00
Matthias Kern f14009833c add a mobile portfolio view. 2015-11-11 17:25:06 +02:00
Berkeley Martinez 42ab1d70fd Remove unnecessary unary operator 2015-11-10 09:59:49 -08:00
terakilobyte 969204e2c8 Removes debugging statements 2015-11-07 16:40:36 -05:00
terakilobyte d6cea74447 Offsets user displayed time to server timezone(EST) for the heatmap 2015-11-07 13:26:58 -08:00
Berkeley Martinez 0f6cdf8be1 Merge pull request #3615 from FreeCodeCamp/feature/commit
Add feature Commit
2015-10-07 01:23:24 -07:00
Quincy Larson adfbdd7f9f more style improvements 2015-10-07 01:06:36 -07:00
Quincy Larson a1b574f768 update camper portfolio page 2015-10-07 00:41:43 -07:00
Berkeley Martinez 3273593b9c Change order of edit buttons on profile 2015-10-06 23:32:31 -07:00
Berkeley Martinez d132978df9 Add ability to edit commit 2015-10-06 19:51:19 -07:00
Berkeley Martinez 362efd4365 Add display on user profile when user commits 2015-10-06 19:51:19 -07:00
Berkeley Martinez 33e8f35bbf Fix replace script tags in URL
Replace script tags in URL with fcc tags.
This prevents some xss bugs blocking code from running
in the iFrame.
2015-10-06 16:39:15 -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 e16efc832c Move commit to separate router 2015-10-05 22:19:56 -07:00
Quincy Larson f02b3ffd4c update commit copy 2015-10-05 22:19:56 -07:00
Quincy Larson 68b12caf48 minor improvements to onboarding and create skeleton commit page 2015-10-05 22:19:55 -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
Quincy Larson b197358056 make one page profile with bonfire solution urls 2015-09-30 21:04:16 -07:00
Quincy Larson 3e25b3a6bc improve button html 2015-09-27 21:52:13 -07:00
Quincy Larson e74533a727 add lockdown mode toggling 2015-09-27 17:08:56 -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
Quincy Larson 08907b8ddb improve signin page copy and move twitter to bottom of list 2015-09-09 19:55:23 -07:00
Quincy Larson c4c9068950 start refactoring account view into show view 2015-09-08 22:52:32 -07:00
Isabell Long d85eded058 Consistently capitalize GitHub in the account settings text
- Also remove the capital D from Delete in the confirmation line—it's
  not the start of a sentence.
2015-08-23 13:52:14 +01:00
Quincy Larson ebb84c9e75 more refinement to simplified profile view 2015-08-21 22:53:38 -07:00
Quincy Larson d49b303de3 update look of profile 2015-08-21 22:52:09 -07:00
Berkeley Martinez 0f3acc629c fix profile linking 2015-08-21 16:09:07 -07:00
Quincy Larson adc50b764d uncomment social linking 2015-08-20 19:52:48 -07:00
Quincy Larson 1dadc48aea remove angular from user account creation flows 2015-08-19 15:55:40 -07:00
Berkeley Martinez 478ed3c522 fix should toString userId's 2015-08-18 15:23:26 -07:00
Quincy Larson b667a776ea add bonfires back in but now they are only visible to their creators 2015-08-18 14:53:18 -07:00
Berkeley Martinez 112972cfdd fix enables email login 2015-08-18 01:32:37 -07:00
Berkeley Martinez 495aac8233 remove part of note about email signin 2015-08-17 19:21:57 -07:00
Quincy Larson 07dd58d65b update copy and remove bug warnings 2015-08-16 23:43:57 -07:00
Quincy Larson 21cbbc2233 Update warning messages 2015-08-16 19:34:23 -07:00
Quincy Larson de10e77645 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 11:02:33 -07:00
Quincy Larson 454e59939e add wiki to tops of pages 2015-08-16 11:02:22 -07:00
Berkeley Martinez de7eb3d440 fix email password reset 2015-08-16 09:54:59 -07:00
Quincy Larson 58d86ce2dc hide linking buttons 2015-08-16 06:07:38 -07:00
Quincy Larson edb58f6890 add authentication back in 2015-08-16 05:47:13 -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
Quincy Larson 43e3dc8914 Finish onboarding page 2015-08-10 21:55:13 -07:00
Berkeley Martinez 341d931833 fix streak show days 2015-08-10 21:01:37 -07:00
Quincy Larson 7bfe61731b give a user a brownie point when they start 2015-08-10 20:55:01 -07:00
Quincy Larson f8665324ad simplify user account and profile system for github locking 2015-08-10 15:37:49 -07:00
Quincy Larson add87ae801 start simplifying account page 2015-08-10 15:10:38 -07:00
Berkeley Martinez 013d983c2e add github refresh button 2015-08-07 18:29:56 -07:00
Berkeley Martinez 71a02ed8b7 update all instances of progressTimestamp to check for objects 2015-08-07 13:32:30 -07:00
Berkeley Martinez 0ce81bbabb fix email sign should not require username 2015-08-05 19:29:17 -07:00
Berkeley Martinez 07e9bbf00a add link to github waypoint to non github cool campers 2015-08-05 13:54:48 -07:00
Quincy Larson 3c4142c92c fix profile update button 2015-08-04 18:43:40 -07:00
Quincy Larson 3551cefb3d simplify account.jade view for github integration 2015-08-04 18:29:05 -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
Quincy Larson 7246945b42 remove bonfires from campers' public portfolios 2015-08-04 15:09:20 -07:00
Berkeley Martinez e01876f3ab disable username updating when camper is githubCool 2015-08-04 15:03:33 -07:00
Quincy Larson c573caf2e2 remove website links from user model and account view 2015-08-04 14:57:34 -07:00
Berkeley Martinez a1a64435d6 readding twitter auth
twitter auth is the only oauth that works in local dev
2015-08-04 01:47:27 -07:00
Berkeley Martinez efa73c93ee remove twitter auth 2015-08-04 01:34:26 -07:00
Berkeley Martinez 7ca1d7cfde remove facebook/google/linkedin auth from linking 2015-08-03 12:53:23 -07:00
Berkeley Martinez bf1c2ace00 disable facebook/google/linked auth for testing 2015-08-03 12:38:20 -07:00
Berkeley Martinez 8270cb4103 add github auth 2015-08-01 08:39:13 -07:00
Berkeley Martinez 03ea412b4a major challenges refactor
commented out resetEditor in main
remove heatmap timout
2015-06-20 19:55:07 -07:00
terakilobyte 34c3fef7d4 Move api hooks to user.js 2015-06-11 19:11:07 -04:00
Berkeley Martinez cd38a2d88e fix user local signin 2015-06-09 17:22:14 -07:00
Berkeley Martinez a8494b29da add user signup through loopback 2015-06-09 16:45:14 -07:00
Quincy Larson b2aafd89e7 flatten user object references throughout controllers and views 2015-06-04 12:54:41 -07:00
terakilobyte d9c3251f94 Begin shaping codebase for loopback migration. 2015-06-01 18:30:43 -04:00