Commit Graph

4699 Commits

Author SHA1 Message Date
ae43cb0fa3 Merge pull request #2451 from ahstro/ahstro-2440
Moved myArray into 'Only change code'-block
2015-08-21 22:34:16 +01:00
9dd3960a0b Merge pull request #2454 from saadanerdetbare/saadanerdetbare-2431
2431 changed wording on testresult
2015-08-21 14:30:27 -07:00
0f1baeeb68 Merge remote-tracking branch 'origin/staging' into staging 2015-08-21 22:01:11 +01:00
e33a929f0c Fix #2444 2015-08-21 22:01:03 +01:00
49fcdec9b7 2431 reworded 2nd test 2015-08-21 22:54:03 +02:00
dd71ada021 2431 changed wording on testresult 2015-08-21 22:06:04 +02:00
c32e89baff fix delete is a keyword not a function 2015-08-21 12:37:47 -07:00
ae6271964f Moved myArray into 'Only change code'-block 2015-08-21 21:22:25 +02:00
d87b0457fe Merge remote-tracking branch 'origin/staging' into staging 2015-08-21 20:21:15 +01:00
9584c7870a Update JSON 2015-08-21 20:20:56 +01:00
6d3fcb3d0b Merge pull request #2342 from dokkillo/dokkillo-2333
issue 2333 : Fix grammar error in Waypoint
2015-08-21 09:37:17 -07:00
adc50b764d uncomment social linking 2015-08-20 19:52:48 -07:00
184b913895 Merge remote-tracking branch 'origin/staging' into staging 2015-08-20 23:39:06 +01:00
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
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
708b8dc0dc Merge pull request #2241 from dokkillo/dokkillo-2238
issue #2238
2015-08-20 17:35:23 +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
87a7a4b256 Merge pull request #2320 from awesomeaniruddh/staging
updated description of DNA Pairing bonfire
2015-08-20 17:32:06 +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
87c01aae52 issue 2270 2015-08-20 17:21:10 +02:00
1bdbec15c3 issue 2265 2015-08-20 17:05:50 +02:00
45b53937c8 issue #2265 2015-08-20 16:57:50 +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
b001b8f8f2 issue #2271 2015-08-20 16:28:14 +02: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
a49734f3c5 updated description of DNA Pairing bonfire 2015-08-20 22:03:53 +08: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
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
72d7881597 attempt to fix challenge submit part two 2015-08-20 00:04:55 +01:00
e35e306b0c Merge remote-tracking branch 'origin/staging' into staging 2015-08-19 23:55:25 +01:00
bdb4c55954 Fixed the stupid modals that i broke 2015-08-19 23:51:02 +01:00
cd26a96757 issue #2238 2015-08-20 00:33:53 +02:00
74d79da1bf Merge pull request #2239 from dokkillo/dokkillo-2099
issue #2099
2015-08-19 23:24:23 +01:00