Commit Graph

4696 Commits (1c2748b623a129d32d0117816569af12c9a57117)

Author SHA1 Message Date
Allan Hernandez 1c2748b623 Update bootstrap.json
Clarifying - Agree with @BerkeleyTrue on clarity
2015-08-21 16:35:14 -05:00
Allan Hernandez 007f913517 Confusing Wells Text - #2391 #2458
Checklist instructions were incorrect as seen in

closes #2391 
closes #2458
2015-08-21 16:17:21 -05:00
benmcmahon100 0f1baeeb68 Merge remote-tracking branch 'origin/staging' into staging 2015-08-21 22:01:11 +01:00
benmcmahon100 e33a929f0c Fix #2444 2015-08-21 22:01:03 +01:00
Berkeley Martinez c32e89baff fix delete is a keyword not a function 2015-08-21 12:37:47 -07:00
benmcmahon100 d87b0457fe Merge remote-tracking branch 'origin/staging' into staging 2015-08-21 20:21:15 +01:00
benmcmahon100 9584c7870a Update JSON 2015-08-21 20:20:56 +01:00
Berkeley Martinez 6d3fcb3d0b Merge pull request #2342 from dokkillo/dokkillo-2333
issue 2333 : Fix grammar error in Waypoint
2015-08-21 09:37:17 -07:00
Quincy Larson adc50b764d uncomment social linking 2015-08-20 19:52:48 -07:00
benmcmahon100 184b913895 Merge remote-tracking branch 'origin/staging' into staging 2015-08-20 23:39:06 +01:00
benmcmahon100 4de75fc9e7 Fix #2364 2015-08-20 23:38:16 +01:00
Berkeley Martinez 2f4e459e82 Merge branch 'master' into staging 2015-08-20 15:19:18 -07:00
dokkillo 81afc27412 issue 2333 2015-08-20 20:24:25 +02:00
Berkeley Martinez d14eb0dbaa fix 401 account/delete if not auth 2015-08-20 09:40:29 -07:00
benmcmahon100 708b8dc0dc Merge pull request #2241 from dokkillo/dokkillo-2238
issue #2238
2015-08-20 17:35:23 +01:00
benmcmahon100 bec51ec2db Merge pull request #2315 from erratadei/erratadei-1754-and-2305
change in basic bonfire Mutations
2015-08-20 17:32:34 +01:00
benmcmahon100 87a7a4b256 Merge pull request #2320 from awesomeaniruddh/staging
updated description of DNA Pairing bonfire
2015-08-20 17:32:06 +01:00
benmcmahon100 66aee866ad Merge pull request #2321 from meecoder/meecoder-2309
change div to button in Target Elements by ID Using jQuery waypoint
2015-08-20 17:31:00 +01:00
benmcmahon100 ac8325a955 Merge pull request #2329 from dokkillo/dokkillo-2270
Issue 2270
2015-08-20 17:28:12 +01: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
dokkillo 87c01aae52 issue 2270 2015-08-20 17:21:10 +02:00
dokkillo 1bdbec15c3 issue 2265 2015-08-20 17:05:50 +02:00
dokkillo 45b53937c8 issue #2265 2015-08-20 16:57:50 +02:00
dokkillo c8b32afaeb Merge remote-tracking branch 'upstream/staging' into staging
Conflicts:
	seed/challenges/html5-and-css.json
2015-08-20 16:46:06 +02:00
dokkillo b001b8f8f2 issue #2271 2015-08-20 16:28:14 +02:00
Kian Moretz 9cf0f80321 change div to button in Target an element by ID jQuery challenge - fix for issue #2309 2015-08-20 10:09:33 -04:00
Aniruddh Agarwal a49734f3c5 updated description of DNA Pairing bonfire 2015-08-20 22:03:53 +08:00
Manuel Alzadiq Romero 235b952ff0 change in basic bonfire Mutations
Added an expect to be falsein order to avoid passing with wrong code
2015-08-20 07:55:21 -05:00
Quincy Larson 27cac3067a fix the code editor save and refresh actions 2015-08-19 18:30:01 -07:00
Quincy Larson ba8d0e6022 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-19 18:20:42 -07:00
benmcmahon100 f581b46bd7 This should fix funny tags in web storage 2015-08-20 02:20:11 +01:00
Quincy Larson 111ecf3440 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-19 18:20:04 -07:00
benmcmahon100 03d4c213c5 Update coursewaresHCJQFramework_0.1.9.js 2015-08-20 02:18:36 +01:00
benmcmahon100 79a0dc8259 This should fix web storage script tag issues 2015-08-20 02:18:11 +01:00
Quincy Larson 6bbc0046bd Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-19 18:12:42 -07:00
benmcmahon100 9541377a08 Update coursewaresHCJQFramework_0.1.9.js 2015-08-20 02:12:24 +01:00
Quincy Larson a6a765e9a4 Revert "Revert "attempt to fix challenge submit part two""
This reverts commit 706bd1beca.
2015-08-19 18:11:43 -07:00
Quincy Larson 706bd1beca Revert "attempt to fix challenge submit part two"
This reverts commit 72d7881597.
2015-08-19 18:10:06 -07:00
benmcmahon100 72d7881597 attempt to fix challenge submit part two 2015-08-20 00:04:55 +01:00
benmcmahon100 e35e306b0c Merge remote-tracking branch 'origin/staging' into staging 2015-08-19 23:55:25 +01:00
benmcmahon100 bdb4c55954 Fixed the stupid modals that i broke 2015-08-19 23:51:02 +01:00
dokkillo cd26a96757 issue #2238 2015-08-20 00:33:53 +02:00
benmcmahon100 74d79da1bf Merge pull request #2239 from dokkillo/dokkillo-2099
issue #2099
2015-08-19 23:24:23 +01:00
benmcmahon100 f1053a2f68 Merge pull request #2235 from dokkillo/dokkillo-2218
issue #2218
2015-08-19 23:14:09 +01:00
dokkillo 21d674b238 issue #2099 2015-08-20 00:13:06 +02:00
dokkillo 2d06e35afe issue #2218 2015-08-19 23:45:58 +02:00