Commit Graph

494 Commits (08699fdac64bdc0f4bd24400ba2384e863486d9a)

Author SHA1 Message Date
benmcmahon100 38a73e392f Deactivated scroll locking 2015-08-22 00:59:21 +01:00
Berkeley Martinez f5a652e046 fix remove console log 2015-08-21 16:09:50 -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
Berkeley Martinez d14eb0dbaa fix 401 account/delete if not auth 2015-08-20 09:40:29 -07:00
Berkeley Martinez 16dcc6a39e remove old password reset route 2015-08-20 08:55:26 -07:00
Berkeley Martinez eaca9ef495 refactor challenges
now only queries challenges on start up
use default scheduler for array manipulation
2015-08-20 08:55:25 -07:00
Berkeley Martinez 6d1d8a3e28 fix current streak
always start from today
2015-08-20 08:55:25 -07:00
Berkeley Martinez da61161765 fix longest streak 2015-08-20 08:55:25 -07:00
benmcmahon100 d52a2d8da0 Attempt to sorta fix the scroll locker resetting 2015-08-20 16:48:46 +01:00
Berkeley Martinez f3410a3a95 remove debug statement 2015-08-19 13:48:04 -07:00
Berkeley Martinez 03b837cf51 fix break current stream 2015-08-19 13:46:26 -07:00
benmcmahon100 f4eecc9127 Merge pull request #1993 from kurzninja/patch-4
Potentially missing ;
2015-08-19 21:30:09 +01:00
Berkeley Martinez 576315abdc fix current streak,
longest streak still broken
2015-08-19 13:05:53 -07:00
Berkeley Martinez 6a11b30bc2 serve static assets before sessions 2015-08-19 11:28:44 -07:00
Quincy Larson 04c9d376f7 remove server maintenance warnings 2015-08-18 23:48:31 -07:00
Berkeley Martinez 679d1383a5 up timeout 2015-08-18 23:14:27 -07:00
Berkeley Martinez bc84a25ff9 add message on emergency maintenance 2015-08-18 23:07:06 -07:00
Berkeley Martinez 01a45e0635 fix cannot find challengeId of undefined 2015-08-18 20:02:39 -07:00
Berkeley Martinez 0128829d11 fix cannot read property id of user durring upvote
post to upvote without auth returns 401
2015-08-18 19:48:42 -07:00
Berkeley Martinez 8c803281f6 fix cannot read property match of undefined 2015-08-18 19:23:43 -07:00
Berkeley Martinez 0367a19ffc add bower_components to pathsOfNOReturnTo 2015-08-18 16:00:27 -07:00
Berkeley Martinez f59d029336 fix check if url sent with story 2015-08-18 15:56:23 -07:00
Berkeley Martinez 478ed3c522 fix should toString userId's 2015-08-18 15:23:26 -07:00
Quincy Larson 9dcf284825 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-18 15:21:38 -07:00
Quincy Larson b4ae49f915 add challenge type to beginning of challenge in map 2015-08-18 15:21: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 b2f4e520cb fix account link failure now flashes 2015-08-18 14:48:52 -07:00
Berkeley Martinez d9d44ae509 fix redirect link failures to /account 2015-08-18 14:48:52 -07:00
benmcmahon100 366b9e98a7 Merge remote-tracking branch 'origin/staging' into staging 2015-08-18 19:32:04 +01:00
Quincy Larson 0d0528a743 fix LinkedIn link in footer 2015-08-18 11:22:59 -07:00
benmcmahon100 6de1f49a1f Temp fix for buttons on modals and bonfires exec on load 2015-08-18 19:21:34 +01:00
Berkeley Martinez 112972cfdd fix enables email login 2015-08-18 01:32:37 -07:00
Brett Guillory c5d07b9e05 Potentially missing ;
My browser was throwing an error:
```Uncaught SyntaxError: missing ) after argument list```
That pointed to this line in the console as far as I could tell.
If this is a fix, w00t. If not, ignore this.
2015-08-17 22:05:16 -05:00
Berkeley Martinez 495aac8233 remove part of note about email signin 2015-08-17 19:21:57 -07:00
patlanders 973c9e67c2 Change "opps!" to "Oops!" in error-handlers.js 2015-08-17 13:20:15 -04:00
benmcmahon100 fe102bdf51 fix #1840 2015-08-17 14:04:12 +01:00
Ionut Costica c39189eab0 Fix for Issue #1828 2015-08-17 15:04:53 +03:00
Quincy Larson 07dd58d65b update copy and remove bug warnings 2015-08-16 23:43:57 -07:00
Quincy Larson 2634569e60 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 19:34:44 -07:00
Quincy Larson 21cbbc2233 Update warning messages 2015-08-16 19:34:23 -07:00
benmcmahon100 3be62c5374 Fixed the script issues 2015-08-17 00:04:20 +01:00
Berkeley Martinez a228e61353 hot fix test for function first 2015-08-16 15:27:06 -07:00
Quincy Larson a0c9906e69 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 14:20:19 -07:00
Berkeley Martinez f475a4e1ad fix map, should not mutate challenges 2015-08-16 14:20:00 -07:00
Quincy Larson dfc557f9e6 move refactor all non-jquery JS to load last 2015-08-16 13:49:43 -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 98df14bf86 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 08:03:48 -07:00
Quincy Larson b05d9338f4 update csp 2015-08-16 08:03:34 -07:00
Berkeley Martinez b828a1e825 fix google should be oauth2 2015-08-16 06:51:47 -07:00
Quincy Larson d14514f661 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 06:07:49 -07:00
Quincy Larson 58d86ce2dc hide linking buttons 2015-08-16 06:07:38 -07:00
Berkeley Martinez 7d22c2a073 fix should check completed challenge old _id 2015-08-16 05:52:25 -07:00
Quincy Larson edb58f6890 add authentication back in 2015-08-16 05:47:13 -07:00
Quincy Larson 63d506c14f remove beta warning 2015-08-16 04:06:01 -07:00
Quincy Larson 23003e8724 add new congratulatory quotes 2015-08-16 04:05:49 -07:00
Quincy Larson e3404c6564 minor improvements and bug fixes to stories 2015-08-15 14:13:21 -07:00
Berkeley Martinez bcdda9c62a fix unexpected syntax error on map 2015-08-14 18:25:34 -07:00
Berkeley Martinez 42303dc6aa fix progressBar not showing
reduce function needs initial seed

closes #1753
2015-08-14 18:24:14 -07:00
Quincy Larson ed0d38a474 make more progress QAing challenges 2015-08-13 17:20:52 -07:00
Berkeley Martinez acf48aa403 show jobs in dev
remove old jobs stuff
2015-08-13 15:41:30 -07:00
Quincy Larson 0a8855fb11 Merge branch 'OOPF' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-13 14:36:41 -07:00
benmcmahon100 5905e19e1b Merge remote-tracking branch 'origin/OOPF' into OOPF 2015-08-13 12:57:14 +01:00
Quincy Larson 40b43370eb update twitch page title thanks to @1hella for spotting this 2015-08-13 01:20:45 -07:00
Quincy Larson c50b9c5afa Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-13 00:57:42 -07:00
Quincy Larson 1b7195fbc1 replace RSAP with read-search-ask and replace AWS gifs with Imgur 2015-08-13 00:56:05 -07:00
Berkeley Martinez 0262d1b676 fix github link
link callback uri should have some path as auth callback uri
2015-08-12 21:44:55 -07:00
Quincy Larson bf2db5ff62 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 21:25:11 -07:00
Quincy Larson 99d0a58049 update the look of onboarding and change RSAP to RSA 2015-08-12 21:24:57 -07:00
Berkeley Martinez 7eaccffd15 remove hikes from map
closes #1682
2015-08-12 20:39:40 -07:00
Berkeley Martinez cd9dcc6953 hide react routes 2015-08-12 20:32:27 -07:00
Quincy Larson 315b78fb69 update copy on onboarding 2015-08-12 20:27:46 -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
Quincy Larson 8cdc545f71 minor ux improvement to onboarding 2015-08-12 18:25:43 -07:00
benmcmahon100 7910f0ae2c Revised scroll-locker layout. iPhone preview causing some styling issues that will require th dynamic resizing of the preview to fix which may impact the quality of the display 2015-08-13 01:20:12 +01:00
Berkeley Martinez ca01115674 fix next challenge unknown bug
closes #1725
2015-08-12 11:47:03 -07:00
Berkeley Martinez 0fcf3bcf42 fix challenge completion should give brownie points
closes #1665
2015-08-11 14:17:08 -07:00
Berkeley Martinez 6fd19738ce refactor and lint home router 2015-08-11 13:22:16 -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 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 853c728d9c improve get-started view and fix duplicate bonfire issue 2015-08-10 20:13:13 -07:00
Quincy Larson d67c049d5b make onboarding page the default homepage for authenticated users 2015-08-10 17:40:13 -07:00
Quincy Larson a44622af82 Merge branch 'staging' into onboarding 2015-08-10 15:42:07 -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
Quincy Larson d7e824ebbe done adding static images 2015-08-10 00:44:37 -07:00
Quincy Larson d56ecd1979 add a bunch of new images to onboarding 2015-08-10 00:42:33 -07:00
Berkeley Martinez 1d724f145e Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-08-09 22:58:46 -07:00
Berkeley Martinez 967f92e6f4 fix challenge naming scheme 2015-08-09 22:46:44 -07:00
Quincy Larson 13f08bf037 Merge branch 'staging' into onboarding 2015-08-09 22:00:26 -07:00
Quincy Larson f3028b0e6a continue work on get-started 2015-08-09 21:59:49 -07:00
Quincy Larson 4ed041c0db update curriculum structure again 2015-08-09 21:26:26 -07:00
Quincy Larson e0bd8c6dd2 remove pair programming Bonfire warm up challenge 2015-08-09 17:03:49 -07:00
Quincy Larson 0994dbaabe finalize copy on get-started 2015-08-08 22:46:21 -07:00
Quincy Larson 5fb1df0d55 start onboarding page 2015-08-08 16:13:23 -07:00
Berkeley Martinez 554c6ce228 Merge branch 'title' of https://github.com/ahstro/freecodecamp into ahstro-title 2015-08-07 18:41:05 -07:00
Berkeley Martinez 013d983c2e add github refresh button 2015-08-07 18:29:56 -07:00
Berkeley Martinez 611098ba09 if user is github cool navbar links to account show page 2015-08-07 18:26:18 -07:00
Berkeley Martinez 83397b7e1b add picture on github signin/up 2015-08-07 18:10:32 -07:00
ahstro e7c8589d08 Everything is horrible 2015-08-08 02:38:16 +02:00
Berkeley Martinez 71a02ed8b7 update all instances of progressTimestamp to check for objects 2015-08-07 13:32:30 -07:00
Berkeley Martinez 8d293c9fc6 fix order of user/pairedWith in withLatestFrom operator in challenges 2015-08-06 15:51:36 -07:00
Berkeley Martinez 783d7cf1ec fix string non-alphanumeric non-whitespace chars before regex 2015-08-06 15:37:07 -07:00
Berkeley Martinez 222d841e4f on oauth signin only set profile/username if using github 2015-08-06 00:19:03 -07:00
Berkeley Martinez 0ce81bbabb fix email sign should not require username 2015-08-05 19:29:17 -07:00
Berkeley Martinez a838a4097d fix clicking on image or points always takes you to /account 2015-08-05 19:12:54 -07:00
Berkeley Martinez 07e9bbf00a add link to github waypoint to non github cool campers 2015-08-05 13:54:48 -07:00
Berkeley Martinez 0def1b3ba8 readd challenges 2015-08-05 13:21:53 -07:00
Berkeley Martinez f167238c74 remove public accounts if user is not github cool or grandfathered 2015-08-05 13:01:48 -07:00
Berkeley Martinez 504239050c remove old license information
repo is now under copyright to FCC
find license in root directory
2015-08-05 13:01: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 989cb87c00 add redirect for now vanished field guide articles 2015-08-04 18:00:01 -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 73f0dcf732 make wiki open in new tab 2015-08-04 14:58:24 -07:00
Quincy Larson 041abd1065 fix beta warning 2015-08-04 14:58:04 -07:00
Quincy Larson c573caf2e2 remove website links from user model and account view 2015-08-04 14:57:34 -07:00
Quincy Larson df786eaf2b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-04 14:40:56 -07:00
Quincy Larson 0682857236 remove learn link from navbar 2015-08-04 14:40:47 -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 c8488c8419 reremove extra middlewares from server file 2015-08-04 06:28:10 -07:00
benmcmahon100 fc0ccf3aea Fixed typos in magical maths waypoints and restored server.js to a previous working state 2015-08-04 13:28:41 +01: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 43d74c2f48 add beta warning banner 2015-08-04 01:34:26 -07:00
Berkeley Martinez efa73c93ee remove twitter auth 2015-08-04 01:34:26 -07:00
Berkeley Martinez f01a66c5c7 use (LMP)loopback middleware phases
bump loopback-component-passport which uses LMP
move custom middlewares to middlewares directory
2015-08-04 01:34:26 -07:00
Berkeley Martinez a920e16cb9 fix completedWith.toLowerCase bug 2015-08-03 16:35:22 -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 c5af46b33f remove beta flash 2015-08-03 08:31:02 -07:00
Berkeley Martinez 55731aa52d fix beta warning title
closes #1452
2015-08-02 07:07:03 -07:00
Berkeley Martinez 88092f9ed6 Merge pull request #1255 from ahstro/lumenteun-1235
Profile pictures in 'Camper News' now link to profiles.
2015-08-01 16:51:56 -07:00
Berkeley Martinez 1b948ed4af Merge pull request #1302 from tanis2000/tanis2000-1273
Fixes #1273 (URL validation when submitting news)
2015-08-01 16:37:01 -07:00
Berkeley Martinez 32ce40b815 add beta site warning 2015-08-01 16:11:05 -07:00
benmcmahon100 0a34dcf6c3 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:25:49 +01:00
benmcmahon100 c075eb0116 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:24:16 +01:00
benmcmahon100 f60bfd5da1 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:22:02 +01:00
benmcmahon100 aef867cc69 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:20:19 +01:00
benmcmahon100 abfab7389b Added the scrolling editor 2015-08-01 19:55:40 +01:00
Berkeley Martinez 8270cb4103 add github auth 2015-08-01 08:39:13 -07:00