Commit Graph

16274 Commits

Author SHA1 Message Date
4de75fc9e7 Fix #2364 2015-08-20 23:38:16 +01:00
2f4e459e82 Merge branch 'master' into staging 2015-08-20 15:19:18 -07:00
ef6c828be0 issue 2333 2015-08-20 20:24:25 +02:00
81afc27412 issue 2333 2015-08-20 20:24:25 +02:00
d14eb0dbaa fix 401 account/delete if not auth 2015-08-20 09:40:29 -07:00
012d729b18 Merge pull request #2241 from dokkillo/dokkillo-2238
issue #2238
2015-08-20 17:35:23 +01:00
708b8dc0dc Merge pull request #2241 from dokkillo/dokkillo-2238
issue #2238
2015-08-20 17:35:23 +01:00
fe96c2bf99 Merge pull request #2315 from erratadei/erratadei-1754-and-2305
change in basic bonfire Mutations
2015-08-20 17:32:34 +01:00
bec51ec2db Merge pull request #2315 from erratadei/erratadei-1754-and-2305
change in basic bonfire Mutations
2015-08-20 17:32:34 +01:00
a3bfb3a470 Merge pull request #2320 from awesomeaniruddh/staging
updated description of DNA Pairing bonfire
2015-08-20 17:32:06 +01:00
87a7a4b256 Merge pull request #2320 from awesomeaniruddh/staging
updated description of DNA Pairing bonfire
2015-08-20 17:32:06 +01:00
f3531e10da 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
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
ac8325a955 Merge pull request #2329 from dokkillo/dokkillo-2270
Issue 2270
2015-08-20 17:28:12 +01:00
16dcc6a39e remove old password reset route 2015-08-20 08:55:26 -07:00
eaca9ef495 refactor challenges
now only queries challenges on start up
use default scheduler for array manipulation
2015-08-20 08:55:25 -07:00
6d1d8a3e28 fix current streak
always start from today
2015-08-20 08:55:25 -07:00
da61161765 fix longest streak 2015-08-20 08:55:25 -07:00
d52a2d8da0 Attempt to sorta fix the scroll locker resetting 2015-08-20 16:48:46 +01:00
01fbec96a8 issue 2270 2015-08-20 17:21:10 +02:00
87c01aae52 issue 2270 2015-08-20 17:21:10 +02:00
901453745e issue 2265 2015-08-20 17:05:50 +02:00
1bdbec15c3 issue 2265 2015-08-20 17:05:50 +02:00
9246cf97f5 issue #2265 2015-08-20 16:57:50 +02:00
45b53937c8 issue #2265 2015-08-20 16:57:50 +02:00
9b1d7294c0 Merge remote-tracking branch 'upstream/staging' into staging
Conflicts:
	seed/challenges/html5-and-css.json
2015-08-20 16:46:06 +02:00
c8b32afaeb Merge remote-tracking branch 'upstream/staging' into staging
Conflicts:
	seed/challenges/html5-and-css.json
2015-08-20 16:46:06 +02:00
75b19e0e30 issue #2271 2015-08-20 16:28:14 +02:00
b001b8f8f2 issue #2271 2015-08-20 16:28:14 +02:00
b8f99cd3cf change div to button in Target an element by ID jQuery challenge - fix for issue #2309 2015-08-20 10:09:33 -04:00
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
1919e25e68 updated description of DNA Pairing bonfire 2015-08-20 22:03:53 +08:00
a49734f3c5 updated description of DNA Pairing bonfire 2015-08-20 22:03:53 +08:00
693cf537ce 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
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
94614c7855 Added a test for factorial(0) to be equal to 1. 2015-08-20 12:01:38 +05:00
23139ff45f Added a test for factorial(0) to be equal to 1. 2015-08-20 12:01:38 +05:00
45bcd32c9c Edited Pull Request #2018
Escaped the double quotation marks on line 418.
2015-08-19 22:48:25 -05:00
2c34c1016e Edited Pull Request #2018
Escaped the double quotation marks on line 418.
2015-08-19 22:48:25 -05:00
27cac3067a fix the code editor save and refresh actions 2015-08-19 18:30:01 -07:00
ba8d0e6022 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-19 18:20:42 -07:00
f581b46bd7 This should fix funny tags in web storage 2015-08-20 02:20:11 +01:00
111ecf3440 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-19 18:20:04 -07:00
03d4c213c5 Update coursewaresHCJQFramework_0.1.9.js 2015-08-20 02:18:36 +01:00
79a0dc8259 This should fix web storage script tag issues 2015-08-20 02:18:11 +01:00
6bbc0046bd Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-19 18:12:42 -07:00
9541377a08 Update coursewaresHCJQFramework_0.1.9.js 2015-08-20 02:12:24 +01:00
a6a765e9a4 Revert "Revert "attempt to fix challenge submit part two""
This reverts commit 706bd1beca.
2015-08-19 18:11:43 -07:00
706bd1beca Revert "attempt to fix challenge submit part two"
This reverts commit 72d7881597.
2015-08-19 18:10:06 -07:00
538e48e237 start updating showZiplineOrBasejump view to function post-angular 2015-08-19 17:56:44 -07:00