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

5625 Commits (12eeef2f416696a950e7a435f411ff2ffbd0a297)

Author SHA1 Message Date
Quincy Larson c688082ee4 add appropriate challenges to certificate challenges 2015-10-02 11:44:29 -07:00
Quincy Larson 465835d6b1 Merge branch 'staging' into map-restructure 
Conflicts:
	seed/challenges/basic-ziplines.json
	seed/challenges/intermediate-ziplines.json
 2015-10-02 11:23:54 -07:00
Quincy Larson 08de1ac8bb Merge pull request #3568 from FreeCodeCamp/fix/travis 
fix travis yaml and test challenges
 2015-10-02 11:23:24 -07:00
Berkeley Martinez 86344d5c9e fix travis yaml and test challenges 2015-10-02 11:19:07 -07:00
Quincy Larson 7709438fa3 Merge pull request #3567 from FreeCodeCamp/fix/last-completed-regression 
Fix last completed logic bug
 2015-10-02 11:11:26 -07:00
Berkeley Martinez c819fcc0cb Merge pull request #3561 from FreeCodeCamp/remove-difficulty 
remove vestigial difficulty attribute from challenges
 2015-10-02 11:00:11 -07:00
Berkeley Martinez 5c3973c365 Fix last completed logic bug 
This PR fixes a regression introduced in an earlier patch
 2015-10-02 10:50:35 -07:00
Quincy Larson ea33385fea remove vestigial difficulty attribute from challenges 2015-10-02 01:06:27 -07:00
Quincy Larson 42b77e92f8 Merge pull request #3560 from FreeCodeCamp/fix/common-is-undefined 
Fix check for existence
 2015-10-02 00:11:26 -07:00
Berkeley Martinez a90fdf1e0c Fix check for existence 2015-10-01 23:58:56 -07:00
Quincy Larson 69a3729025 restructure challenges and add certificate challenge skeletons 2015-10-01 23:54:20 -07:00
Quincy Larson 5f9022475c Merge pull request #3558 from FreeCodeCamp/feature/show-waypoints 
Feature show Waypoints on user profile page
 2015-10-01 23:09:03 -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 7563b94509 Merge pull request #3557 from FreeCodeCamp/feature/make-completed-challenges-unique 
feature make completedChallenges uniq
 2015-10-01 22:28:57 -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
Berkeley Martinez fefefed0f2 Merge pull request #3550 from FreeCodeCamp/merge-account-page 
Merge account page
 2015-10-01 21:12:23 -07:00
Berkeley Martinez d0528ec768 fix re-encode uri during redirect 2015-10-01 21:11:15 -07:00
Berkeley Martinez 8a1a7f238d fix undefined username and remove old function 
fix many bugs and undefined
fix linting errors
 2015-10-01 21:03:28 -07:00
Quincy Larson d8fd63fb87 Merge branch 'staging' into merge-account-page 2015-10-01 20:39:56 -07:00
Quincy Larson 28e9dce221 Merge pull request #3551 from FreeCodeCamp/feature/uri-storage 
add uri code storage
 2015-10-01 19:44:12 -07:00
Aniruddh Agarwal fa89ff3471 Merge pull request #3376 from natac13/fix/slasher-flick-unclear-head-of-array 
fix unclear description slasher flick
 2015-10-02 05:20:28 +08:00
Berkeley Martinez 72e0595ca6 add uri code storage 2015-09-30 22:32:31 -07:00
Quincy Larson b197358056 make one page profile with bonfire solution urls 2015-09-30 21:04:16 -07:00
Berkeley Martinez 5de6837959 Merge pull request #3548 from FreeCodeCamp/converge-bonfires 
refactor all Bonfire tests to use assert and have friendly messages
 2015-09-30 19:47:20 -07:00
Quincy Larson 77892a05c0 Merge pull request #3546 from FreeCodeCamp/step 
add step based challenge to framework
 2015-09-30 19:38:01 -07:00
Quincy Larson c2af4f9b4c fix bad merge 2015-09-30 19:26:05 -07:00
Quincy Larson dca179c2c5 Merge branch 'staging' into converge-bonfires 
Conflicts:
	seed/challenges/basic-bonfires.json
	seed/challenges/intermediate-bonfires.json
 2015-09-30 19:06:28 -07:00
Quincy Larson 16c0c23b2c finish QAing all bonfires 2015-09-30 19:04:26 -07:00
Quincy Larson 4fffabfe8f fix exact change and QA all JS challenges 2015-09-30 18:33:32 -07:00
Quincy Larson 1994e340d3 all but 4 bonfires work 2015-09-30 14:57:58 -07:00
Anton Strömkvist c82744bb34 Merge pull request #3542 from MWGitHub/patch-1 
Remove Unnecessary Left Over Semicolon
 2015-09-30 23:51:23 +02:00
Quincy Larson 416a866ec0 add step based challenge to framework 2015-09-30 13:26:06 -07:00
Quincy Larson 03675ef0a6 finish QAing basic and intermediate bonfires 2015-09-30 01:33:07 -07:00
Mike ab72094333 Remove Unnecessary Left Over Semicolon 
Remove left over semicolon from function that was converted from an anonymous function at https://github.com/FreeCodeCamp/FreeCodeCamp/issues/3287
 2015-09-30 02:40:21 -04:00
Quincy Larson ab204c654e fix search results formatting for mobile and desktop camper news 2015-09-29 22:52:19 -07:00
Quincy Larson 242351e0e4 Merge pull request #3541 from FreeCodeCamp/fix/last-challenge-name 
fix check for existance when getting last challenge
 2015-09-29 22:37:57 -07:00
Berkeley Martinez cdf8c6a54c fix check for existance when getting last challenge 2015-09-29 22:12:02 -07:00
Quincy Larson afe8aed608 Merge pull request #3539 from QuincyLarson/pair-button 
fix issues with get-started and remove pair button
 2015-09-29 18:02:07 -07:00
Quincy Larson ee9827ea58 fix issues with get-started and remove pair button 2015-09-29 17:59:16 -07:00
Quincy Larson cbc21ee03f refactor messages on basic and advanced bonfires 2015-09-29 15:00:27 -07:00
Quincy Larson 838a80167e finish first take at upper-intermediate bonfires 2015-09-29 14:34:51 -07:00
Quincy Larson 6657348722 finish first pass at intermediate bonfires 2015-09-29 14:18:43 -07:00
Quincy Larson 52c74f5a3d merge staging 2015-09-29 13:44:58 -07:00
Quincy Larson 9e2db7636f Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-09-29 13:20:29 -07:00
Quincy Larson ddde4db821 Merge branch 'fix/intermediate-bonfires-tests' of https://github.com/awesomeaniruddh/FreeCodeCamp into awesomeaniruddh-fix/intermediate-bonfires-tests 
Conflicts:
	seed/challenges/intermediate-bonfires.json
 2015-09-29 13:19:24 -07:00
Quincy Larson 31f9b7d707 Merge pull request #3530 from FreeCodeCamp/map-share 
add facebook sharing to map on completed challenges
 2015-09-28 20:08:06 -07:00
Berkeley Martinez 55de772ade Remove portfolio comment from share 2015-09-28 20:05:22 -07:00
Quincy Larson 1a653182e7 add messages to basic and advanced bonfires 2015-09-28 19:55:58 -07:00
Berkeley Martinez c7d68932ce Show share button from last completed 2015-09-28 19:47:45 -07:00
Anton Strömkvist 759941c8a2 Merge pull request #3391 from awesomeaniruddh/fix/html-test-improvement 
Added test to HTML5 waypoint to make it stricter
 2015-09-29 04:27:59 +02:00