Commit Graph

17284 Commits

Author SHA1 Message Date
33fa2d1939 'Font degrade'-test now check order of font-familiy. Fixes #1151 2015-06-30 02:52:21 +02:00
bee2a843d1 fix broken challenges and attempt to make streak more lenient. 2015-06-29 16:32:49 -07:00
d9fe6dcef1 fix broken challenges and attempt to make streak more lenient. 2015-06-29 16:32:49 -07:00
5156714cf1 remove duplicate city 2015-06-29 15:56:02 -07:00
a97ce44925 update cities 2015-06-29 14:27:02 -07:00
e5df5120ff fix #1147 2015-06-28 18:30:34 -07:00
af8295ec75 fix modal copy 2015-06-28 18:19:54 -07:00
b96630b9e1 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-28 18:03:21 -07:00
cf167b3c11 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-28 18:03:21 -07:00
7bb72a824b make the Mobile Responsive Images challenge more robust fixes #998 2015-06-28 18:03:11 -07:00
c4c1a44c48 make the Mobile Responsive Images challenge more robust fixes #998 2015-06-28 18:03:11 -07:00
968676da72 fix entities bonfire tests 2015-06-28 15:38:42 -07:00
24e1cc8859 Merge pull request #1115 from NatashaHaggard/923
Issue 923 - Grammatical error
2015-06-28 15:24:52 -07:00
2284a9fcd7 Merge pull request #1115 from NatashaHaggard/923
Issue 923 - Grammatical error
2015-06-28 15:24:52 -07:00
baa0e68e52 Merge pull request #1124 from greasan/greasan-translateDE
First two sections translated into German
2015-06-28 15:22:58 -07:00
1fabe07bcd Merge pull request #1124 from greasan/greasan-translateDE
First two sections translated into German
2015-06-28 15:22:58 -07:00
0ea78b9d1f Merge pull request #1114 from NatashaHaggard/1059
Issue 1059 - Wording issue on instructions
2015-06-28 15:22:10 -07:00
bdb2c2989f Merge pull request #1114 from NatashaHaggard/1059
Issue 1059 - Wording issue on instructions
2015-06-28 15:22:10 -07:00
8e2c246ccf Merge pull request #1149 from JonSonesen/jonathonsonesen-1148
fixes issue #1148
2015-06-28 15:21:11 -07:00
d857bbcc0b Merge pull request #1149 from JonSonesen/jonathonsonesen-1148
fixes issue #1148
2015-06-28 15:21:11 -07:00
c3826c39dd Merge pull request #1074 from SaintPeter/staging
Add video link to Symmetric Differences Bonfire
2015-06-28 15:20:06 -07:00
68dfa51719 Merge pull request #1074 from SaintPeter/staging
Add video link to Symmetric Differences Bonfire
2015-06-28 15:20:06 -07:00
d4ea05c3fe fixes issue #1148 2015-06-28 15:03:52 -07:00
bdb170b0df fixes issue #1148 2015-06-28 15:03:52 -07:00
8970ef5877 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-27 19:43:13 -07:00
0350980c3a Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-27 19:43:13 -07:00
cd29353ac0 add some additional jquery challenges 2015-06-27 19:42:25 -07:00
05cfe86cd0 add some additional jquery challenges 2015-06-27 19:42:25 -07:00
80e995e98f update field guide cities 2015-06-27 15:29:39 -07:00
481eb68baf update the cities on the field guide 2015-06-27 15:28:37 -07:00
7ee4b22a57 update the cities on the field guide 2015-06-27 15:28:37 -07:00
a1055b0e52 clean up future jquery challenges 2015-06-27 11:56:31 -07:00
75c77cdb6f clean up future jquery challenges 2015-06-27 11:56:31 -07:00
4db1f441fe bump loopback passport 2015-06-26 18:11:44 -07:00
6a0996b1e0 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-26 19:22:13 +02:00
20fde8a8ab Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-26 19:22:13 +02:00
f6c5e35f66 fix buffer return from database query 2015-06-26 01:51:27 -07:00
66e4138b36 fix buffer return from database query 2015-06-26 01:51:27 -07:00
afe0560042 fix should be bufferWithCount 2015-06-26 01:48:21 -07:00
e53419bb59 fix should be bufferWithCount 2015-06-26 01:48:21 -07:00
3bac247627 remove stack trace from production 2015-06-26 01:30:51 -07:00
7e2d5c91e2 minor ui improvements 2015-06-26 01:28:02 -07:00
b287c14ddd Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	public/js/main_0.0.3.js
	seed/challenges/get-set-for-free-code-camp.json
	seed/field-guides.json
2015-06-26 01:08:40 -07:00
378f6da221 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	public/js/main_0.0.3.js
	seed/challenges/get-set-for-free-code-camp.json
	seed/field-guides.json
2015-06-26 01:08:40 -07:00
8570f9b5e7 fix story upvote should happen at end of stream 2015-06-26 00:35:13 -07:00
9818186afc fix should redirect to /news when no story is found 2015-06-26 00:16:18 -07:00
310bf7f6fb fix navbar should point to /news not /stories 2015-06-25 23:43:02 -07:00
549434bdbf fix should be /news for show views 2015-06-25 23:39:38 -07:00
30c46a43eb update emails and refine sponsor view 2015-06-25 23:35:48 -07:00
6700729658 update emails and refine sponsor view 2015-06-25 23:35:48 -07:00