Commit Graph

361 Commits (456bf20b05c67add2bd54742c4cf5af127fc2231)

Author SHA1 Message Date
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
Quincy Larson 7b85031a8a fix issue with nonprofit show views not loading 2015-07-31 22:06:07 -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
Quincy Larson fd68501e16 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-31 21:13:46 -07:00
Quincy Larson 439849e9d8 start removing field guide and update nonprofits 2015-07-31 21:13:40 -07:00
Berkeley Martinez 13f2f349dc remove bonfire/comments models
remove comments from user router
2015-07-31 20:22:08 -07:00
Berkeley Martinez 646fa1cbac remove mention of comments from zipline
update hot stories api uri
2015-07-31 20:10:30 -07:00
Berkeley Martinez ee8776feb3 removes comments
moves upvote to main page
add more info page
closes #955
2015-07-31 19:54:57 -07:00
Quincy Larson 3f49b6288f move calculator back to its own view and out of field guide 2015-07-31 17:30:27 -07:00
Berkeley Martinez 6454f37079 fix upvoting story no longer gives you brownie points
closes #1008
2015-07-31 14:31:12 -07:00
Quincy Larson 2547868854 fix storage and reset functionality for js and html challenge views 2015-07-31 13:37:06 -07:00
Berkeley Martinez c82b2e3ae6 set and render page title
note this requires changes to thundercats to work
see: thundercatsjs/thundercats-react/issues/3
2015-07-29 10:18:06 -07:00
Quincy Larson 5fd95c584c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-28 23:11:00 -07:00
Quincy Larson fd3374fca7 about to start priority and !important waypoints 2015-07-28 17:11:51 -07:00
Berkeley Martinez 1b9608f225 fix nonprofits totalSavings errors 2015-07-26 19:15:19 -07:00
Berkeley Martinez dbe50a5dfa add beta.freecodecamp.com to csp script source 2015-07-25 15:44:40 -07:00
Berkeley Martinez 41274fad2d jobs store fetching 2015-07-25 15:42:03 -07:00
Berkeley Martinez 6306580d84 add note about indexof call throwing 2015-07-25 13:35:01 -07:00
Berkeley Martinez c0eda90eb1 make production future ready
This commit does the following:

Production start should use the following command `npm run
start-producion` this first runs bower install and builds the front end
app(react). Then it will use the `pm2Start` script. This script will set
up the pm2 daemons to run loopback in cluster mode. This script also use
`production-start` script instead of the regular `server` script.

The reasons are two fold: to ensure `server` is run in es7 mode, and to
wait for handshake from DB or kill itself if no DB can be found within a
certain amount of time.
2015-07-24 22:27:52 -07:00
Berkeley Martinez a1a4ac883d add user stores/actions
construct fetchr on every request
2015-07-24 22:27:52 -07:00
Quincy Larson 37d5efed4e Merge branch 'staging' into js-curriculum
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-24 16:08:45 -07:00
Berkeley Martinez 6de5ad682e Get rid of uncompletedChallenges on user object 2015-07-23 16:03:52 -07:00
Berkeley Martinez 5f52498dc1 lint user file 2015-07-23 16:03:51 -07:00
Berkeley Martinez e22cd5da23 correct answer hits server 2015-07-23 16:03:51 -07:00
Berkeley Martinez bf64beed5d Hide body overflow 2015-07-23 16:03:50 -07:00
Berkeley Martinez 04a5a081b3 fix mixing forward slash on transistionTo 2015-07-23 16:03:48 -07:00
Berkeley Martinez 5ba0dc1fec hikes/:dashedName renders questions 2015-07-23 16:03:47 -07:00
Berkeley Martinez 5e02896269 update loading hike directly loads lecture 2015-07-23 16:03:47 -07:00
Berkeley Martinez d0b1d83249 prefetch data and prime stores on client render 2015-07-23 16:03:47 -07:00
Berkeley Martinez f4f2d68551 add state namespace 2015-07-23 16:03:47 -07:00
Berkeley Martinez 02e4c66726 add hike service sort by difficulty 2015-07-23 16:03:47 -07:00
Berkeley Martinez de1d931b82 add hikes/map pulls hikes out of db and renders 2015-07-23 16:03:46 -07:00
Quincy Larson 83654fb86a finish adding the nodeschool challenges 2015-07-23 16:03:46 -07:00
Berkeley Martinez eb3f993b3b update split field guide view into categories 2015-07-23 15:50:47 -07:00