Commit Graph

6513 Commits (8175fbb2975fbbb73326a68d6769be316f6aaaa4)

Author SHA1 Message Date
Berkeley Martinez 8175fbb297 Remove console.log 2015-12-14 13:19:30 -08:00
Berkeley Martinez 8037ff9038 Remove hikes from map view 2015-12-14 13:19:30 -08:00
Berkeley Martinez ab043d1c6d Change map logic and view 2015-12-14 13:19:30 -08:00
Quincy Larson 4c1d84cbf4 fix duplicate ids 2015-12-14 13:19:30 -08:00
Quincy Larson 29cee8b921 restructure challenges within directories 2015-12-14 13:19:30 -08:00
Berkeley Martinez adc0ce28e5 Add superBlock to challenge seed 2015-12-14 13:19:30 -08:00
Berkeley Martinez 9f922310ea Add recursive file seeding 2015-12-14 13:19:30 -08:00
Berkeley Martinez 75821c4db3 Change hikes order 2015-12-14 13:19:30 -08:00
Logan Tegman 7e7fbd1848 Merge pull request #5180 from yjcxy12/fix/npm_run_only_once
fix npm script only-once: changed ech to echo
2015-12-13 12:43:10 -08:00
Xiangyun Chi 428d391df8 fix npm script only-once: changed ech to echo 2015-12-13 20:19:45 +00:00
Rex Schrader 5627c13ee7 Merge pull request #5175 from yjcxy12/fix/issue#5167
Fixed hard coded values pass for Waypoint: Make Unique Objects
2015-12-13 11:12:15 -08:00
Rex Schrader 8ce6d5a60a Merge pull request #5169 from FreeCodeCamp/fix/challenge-time-ga
Fix challenge ga time completion
2015-12-13 11:04:12 -08:00
Rex Schrader 25ad1d5660 Merge pull request #5168 from FreeCodeCamp/fix/loopback-mongodb
Fix loopback-connector-mongodb breaking change
2015-12-13 10:54:36 -08:00
Xiangyun Chi 9e35cb9909 Added two more test cases to the challenge. So that hard coded solution do not pass. 2015-12-13 16:01:54 +00:00
Berkeley Martinez 154ae0e489 Fix challenge ga time completion 2015-12-13 01:06:33 -08:00
Berkeley Martinez e8e5c7bde8 Fix loopback-connector-mongodb breaking change 2015-12-12 19:58:14 -08:00
Quincy Larson 6d911a70cd Merge pull request #5119 from FreeCodeCamp/fix/commit-directory
Add new cert goals to commit
2015-12-11 18:46:48 -06:00
Berkeley Martinez a8a73abea0 More changes to commit copy 2015-12-11 16:44:14 -08:00
Logan Tegman 7ef7c203c8 Merge pull request #5150 from SaintPeter/fix/increse-loop-protect-timeout
Increase Loop Protect Timeout to 1000
2015-12-11 14:04:13 -08:00
Rex Schrader bfdcd1ce25 Increase Loop Protect Timeout to 1000 2015-12-11 13:29:18 -08:00
Logan Tegman 74d5c0bf00 Merge pull request #5127 from Zenith-One/fix/forgot-password-error-message
Fix/forgot password error message
2015-12-10 15:13:33 -08:00
Craig Burton 275e3ad9ea Fixed error message displayed when an error occurs while requesting a password reset 2015-12-10 09:21:21 -05:00
Quincy Larson 60789e0386 Merge branch 'fix/commit-directory' of https://github.com/freecodecamp/freecodecamp into fix/commit-directory
Conflicts:
	server/views/commit/index.jade
2015-12-10 00:02:22 -06:00
Quincy Larson 473a77e0a2 update copy and improve look of commit and its directory 2015-12-10 00:01:09 -06:00
Rex Schrader cf65c698bb Merge pull request #5121 from gasperno/feature/skip-step-in-step-challenge
Skip Button/Go to next step functionality enhancement
2015-12-09 19:03:06 -08:00
Harsha a443c2bd37 Go to next step is enabled after user finishes step challenge 2015-12-09 20:25:43 -05:00
Rex Schrader 73bcdde4e5 Merge pull request #5110 from ltegman/fix/bf-truncate-string-typo
Fix Bonfire Truncate a String Typo
2015-12-09 15:38:04 -08:00
Rex Schrader a30c87db0c Merge pull request #5098 from ltegman/fix/wp-use-comments-tests
Fix Waypoint Use Comments Test
2015-12-09 14:50:28 -08:00
Logan Tegman 0dbf56e23a Merge pull request #5117 from FreeCodeCamp/landing-change
Update landing icons and copy to reflect React and D3
2015-12-09 14:38:50 -08:00
Logan Tegman 33b1ba08f1 Merge pull request #5090 from FreeCodeCamp/fix/bonfire-not-saving
Fix remove bonfire save endpoint
2015-12-09 14:20:10 -08:00
Berkeley Martinez 1464adc350 Add new cert goals to backend 2015-12-09 14:19:37 -08:00
Quincy Larson 3b320c8852 improve look of commit views 2015-12-09 15:39:36 -06:00
Quincy Larson 5d1ab89a1a Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-12-09 15:01:17 -06:00
Quincy Larson 41c0bf1f0e Merge branch 'CodeNonprofit-add/commitnonprofit' into staging 2015-12-09 15:00:58 -06:00
Quincy Larson 8c06293df3 update json for commit 2015-12-09 14:59:56 -06:00
Quincy Larson 66431753b3 Merge branch 'add/commitnonprofit' of https://github.com/CodeNonprofit/FreeCodeCamp into CodeNonprofit-add/commitnonprofit 2015-12-09 14:14:21 -06:00
Quincy Larson 747dbfe750 update landing icons 2015-12-09 14:13:18 -06:00
Michael D. Johnson aea2eaf2e7 Added 3 new nonprofits to Commit 2015-12-09 14:27:02 -05:00
Logan Tegman 22ef7fa3da Merge pull request #5069 from FreeCodeCamp/fix/reduce-header-size
Reduce header size
2015-12-09 11:19:35 -08:00
Berkeley Martinez 0f75aa3b88 Add freecatphotoapp to csp 2015-12-09 11:02:06 -08:00
Berkeley Martinez 9822cc67f9 Reduce header size
This is needed to move to cloudFlare
2015-12-09 10:56:40 -08:00
Logan Tegman 172d0f0207 Fix Bonfire Truncate a String Typo 2015-12-09 09:12:50 -08:00
Logan Tegman 0c8bf2dd9f Fix Waypoint Use Comments Test 2015-12-09 00:01:54 -08:00
Rex Schrader 4bcdb3d286 Merge pull request #5091 from LenaBarinova/fix/test-cases-do-not-catch-obvious-critcal-errors
Fix tests on Use Conditional Logic with If and Else to fail on wrong if
2015-12-08 16:45:04 -08:00
Berkeley Martinez f709ee30ee Fix for completedDate missing 2015-12-08 16:17:45 -08:00
Berkeley Martinez 579c569d15 Fix remove bonfire save endpoint
fix completedChallenge saving solution
remove unnecessary code.
2015-12-08 16:17:45 -08:00
Berkeley Martinez 9774638d43 Fix waypoints are not bonfires 2015-12-08 16:17:45 -08:00
Rex Schrader 6b7a314205 Merge pull request #5076 from FreeCodeCamp/update-ziplines
Update ZIpline and Basejump code review instructions, remove gist export
2015-12-08 16:13:58 -08:00
Rex Schrader da491ed374 Merge pull request #5088 from LenaBarinova/fix/free-code-camp-map
Challenge numbering in Map fixed to work properly on IE.
2015-12-08 15:47:42 -08:00
Logan Tegman c2e025ca23 Merge pull request #5094 from FreeCodeCamp/fix/history-semvar
Use same history as react-router
2015-12-08 15:39:42 -08:00