Commit Graph

3790 Commits

Author SHA1 Message Date
d96dde8d68 Merge pull request #1172 from LumenTeun/lumenteun-1168
Reword parts of 'how-to-npm'-waypoint.
2015-07-02 13:50:22 -07:00
5252fe1f58 Merge pull request #1174 from benmcmahon100/patch-4
solution to issue #1173
2015-07-02 13:49:04 -07:00
55aa38277a Merge pull request #1183 from benmcmahon100/patch-6
Combined UI Fixes
2015-07-02 13:46:33 -07:00
71ea26ab96 Implemented scroll-locker 2015-07-02 21:32:20 +01:00
8bed9fa7d7 Implemented scroll-locker 2015-07-02 21:31:59 +01:00
0a59bd5cfb Implemented scroll-locker 2015-07-02 21:31:28 +01:00
5cedb09703 Combined UI Fixes
phone overlap bug fix + scroll-locker feature added
2015-07-02 21:27:16 +01:00
580e2e3ebd add redirect for https 2015-07-01 14:35:15 -07:00
9120edc67c Update basic-html5-and-css.json 2015-07-01 15:28:29 +01:00
3955767c79 solution to issue #1173
this solution may also be needed for some of the other css-based challenges
2015-07-01 15:16:44 +01:00
85c628dc00 Reword parts of 'how-to-npm'-waypoint. #1168 2015-07-01 13:46:36 +02:00
c434342f15 update official LA FCC chat room 2015-07-01 01:31:51 -07:00
ad69a923ce add official fcc chat room list 2015-07-01 01:26:56 -07:00
154f8c894e add more cities 2015-07-01 00:57:15 -07:00
3a1b5e79b5 add gitter rooms to cities 2015-07-01 00:45:19 -07:00
b27832f0d0 more improvements to html.json 2015-06-30 23:21:34 -07:00
7035f1fcf0 finish the color section of the basic html section 2015-06-30 20:10:00 -07:00
bc8a677be5 finish the color priority section of basic-html 2015-06-30 18:17:20 -07:00
f6602fe680 half way done creating css priority challenges 2015-06-29 19:17:06 -07:00
d9fe6dcef1 fix broken challenges and attempt to make streak more lenient. 2015-06-29 16:32:49 -07:00
cf167b3c11 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-28 18:03:21 -07:00
c4c1a44c48 make the Mobile Responsive Images challenge more robust fixes #998 2015-06-28 18:03:11 -07:00
2284a9fcd7 Merge pull request #1115 from NatashaHaggard/923
Issue 923 - Grammatical error
2015-06-28 15:24:52 -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
bdb2c2989f Merge pull request #1114 from NatashaHaggard/1059
Issue 1059 - Wording issue on instructions
2015-06-28 15:22:10 -07:00
d857bbcc0b Merge pull request #1149 from JonSonesen/jonathonsonesen-1148
fixes issue #1148
2015-06-28 15:21:11 -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
bdb170b0df fixes issue #1148 2015-06-28 15:03:52 -07:00
0350980c3a Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-27 19:43:13 -07:00
05cfe86cd0 add some additional jquery challenges 2015-06-27 19:42:25 -07:00
7ee4b22a57 update the cities on the field guide 2015-06-27 15:28:37 -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
20fde8a8ab Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-26 19:22:13 +02:00
66e4138b36 fix buffer return from database query 2015-06-26 01:51:27 -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
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
6700729658 update emails and refine sponsor view 2015-06-25 23:35:48 -07:00
82c96ec0ba bump main.js version 2015-06-25 23:20:16 -07:00
9c2768591d fix check for user existence 2015-06-25 23:01:04 -07:00
2422663f34 add comments migration to loopback script 2015-06-25 21:47:25 -07:00
e9450b9321 start building sponsor views 2015-06-25 15:15:41 -07:00
13590a1331 refactor rxify stories
fixes many bugs
2015-06-25 15:03:46 -07:00
6c9cb28fdc Issue 923 - Grammatical error
"Your pair will have their own cursor, and will be able to type text on his or her and keyboard."

Removed the "and" after "his or her".

This closes #923
2015-06-24 22:40:10 -05:00