Commit Graph

4714 Commits

Author SHA1 Message Date
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
f1053a2f68 Merge pull request #2235 from dokkillo/dokkillo-2218
issue #2218
2015-08-19 23:14:09 +01:00
21d674b238 issue #2099 2015-08-20 00:13:06 +02:00
2d06e35afe issue #2218 2015-08-19 23:45:58 +02:00
d42afc8f10 Fixed local storage for HCJQ framework challenges 2015-08-19 22:31:18 +01:00
f3410a3a95 remove debug statement 2015-08-19 13:48:04 -07:00
03b837cf51 fix break current stream 2015-08-19 13:46:26 -07:00
dd2d376130 Merge pull request #1910 from itxchy/patch-1
Spelling and grammar edit.
2015-08-19 21:35:50 +01:00
b256d87565 Merge pull request #1939 from ayampol/ayampol-1928
Fixes #1928
2015-08-19 21:35:02 +01:00
576dcf1345 Merge pull request #1975 from AryanJ-NYC/AryanJ-NYC-1909
Fixed #1909 #1972
2015-08-19 21:31:16 +01:00
e05aab352d Merge pull request #1977 from AryanJ-NYC/AryanJ-NYC-1944
Fixed #1944
2015-08-19 21:30:58 +01:00
1159849947 Merge pull request #1978 from jbmartinez/jbmartinez-1970
Fixes #1970 (minor typo)
2015-08-19 21:30:50 +01:00
96b815281d Merge pull request #1984 from AryanJ-NYC/AryanJ-NYC-1980
Fixed #1980
2015-08-19 21:30:42 +01:00
c6cb1a0742 Merge pull request #1985 from AryanJ-NYC/AryanJ-NYC-1982
Fixed #1982
2015-08-19 21:30:25 +01:00
c3da5e9373 Merge pull request #1990 from AryanJ-NYC/AryanJ-NYC-1924
Fixes #1924
2015-08-19 21:30:17 +01:00
f4eecc9127 Merge pull request #1993 from kurzninja/patch-4
Potentially missing ;
2015-08-19 21:30:09 +01:00
a5faffc082 Merge pull request #1995 from jbmartinez/jbmartinez-1833
Fixes #1833
2015-08-19 21:29:50 +01:00
e18c3547e3 Merge pull request #1998 from itxchy/patch-2
Issue: Grammar #1994
2015-08-19 21:29:25 +01:00
7f712ffca3 Merge pull request #2003 from michael-krebs/michael-krebs-1986
fix #1986
2015-08-19 21:28:13 +01:00
c8de9d63fb Merge pull request #2004 from michael-krebs/michael-krebs-1988
fix #1988
2015-08-19 21:27:54 +01:00
a2d48f8b60 Merge pull request #2006 from itxchy/patch-4
Fixed: Misspell #1877
2015-08-19 21:27:34 +01:00
29988d92a8 Merge pull request #2022 from michael-krebs/michael-krebs-2011
fix #2011
2015-08-19 21:26:20 +01:00
79b319bbc0 Merge pull request #2051 from Gornstats/patch-1
Fixed new waypoint description typo
2015-08-19 21:24:33 +01:00
502a255253 Merge pull request #2069 from AryanJ-NYC/AryanJ-NYC-2036
Fixes #2036
2015-08-19 21:24:24 +01:00
45f0de877a Merge pull request #2074 from jbmartinez/jbmartinez-2049
Fixed #2049
2015-08-19 21:23:05 +01:00
e14e8239bf Merge pull request #2125 from saadanerdetbare/saadanerdetbare-2119
update seed for Override Styles in Subsequent CSS
2015-08-19 21:22:25 +01:00
79e259a0e7 Merge pull request #2127 from ptsurbeleu/staging
fix issue #2124 and rephrase the challenge a bit to avoid confusion
2015-08-19 21:22:12 +01:00
1a2183d1d1 Merge pull request #2228 from dokkillo/dokkillo-2189
Dokkillo 2189
2015-08-19 21:17:40 +01:00
576315abdc fix current streak,
longest streak still broken
2015-08-19 13:05:53 -07:00
222df425ac issue #2189 2015-08-19 21:57:41 +02:00
72dd0f7723 issue #2118 2015-08-19 21:00:39 +02:00
a2e3e4a476 issue #2133 2015-08-19 20:29:53 +02:00
6a11b30bc2 serve static assets before sessions 2015-08-19 11:28:44 -07:00
ca80196412 Merge pull request #2213 from dokkillo/staging
issue #2191
2015-08-19 19:11:27 +01:00
933d1edeee issue #2191 2015-08-19 19:12:51 +02:00
7fa976df2d Merge pull request #2172 from nikitin2009/patch-1
Bug with hover effect on footer's social links.
2015-08-19 18:00:26 +01:00