d2cb509eae
add more cities and move the bootcamp calculator to field guide entries (still untested).
2015-07-02 13:59:13 -07:00
ec642a0980
Merge pull request #1159 from LumenTeun/lumenteun-1151
...
'Font degrade'-test now check order of font-familiy.
2015-07-02 13:57:41 -07:00
087e6fac21
Merge pull request #1160 from LumenTeun/lumenteun-1158
...
Slightly clarifies 'Uncomment HTML'.
2015-07-02 13:56:48 -07:00
afef9bc252
Merge pull request #1161 from LumenTeun/grammar
...
Quite a few spelling and grammar fixes
@LumenTeun Thanks for spotting these!
2015-07-02 13:56:11 -07:00
f126d0bc01
Merge pull request #1163 from kmiasko/staging
...
Waypoint: Get Set for Basejumps changed deprecated heroku command
@kmiasko Thanks for fixing this!
2015-07-02 13:51:23 -07:00
8a0c9eef54
Merge pull request #1172 from LumenTeun/lumenteun-1168
...
Reword parts of 'how-to-npm'-waypoint.
2015-07-02 13:50:22 -07:00
d4e013a846
Update basic-html5-and-css.json
2015-07-01 15:28:29 +01:00
4d1db79935
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
d7e1c0afef
Reword parts of 'how-to-npm'-waypoint. #1168
2015-07-01 13:46:36 +02:00
ba801bdc62
update official LA FCC chat room
2015-07-01 01:31:51 -07:00
8c7a4386bc
add official fcc chat room list
2015-07-01 01:26:56 -07:00
246b7a0315
add more cities
2015-07-01 00:57:15 -07:00
88f4a09f4e
add gitter rooms to cities
2015-07-01 00:45:19 -07:00
08fad55642
more improvements to html.json
2015-06-30 23:21:34 -07:00
2059b24f5d
finish the color section of the basic html section
2015-06-30 20:10:00 -07:00
6682839263
finish the color priority section of basic-html
2015-06-30 18:17:20 -07:00
d593463e63
Waypoint: Get Set for Basejumps changed deprecated heroku command
2015-06-30 12:25:51 +02:00
5316b7ac07
Quite a few spelling and grammar fixes
2015-06-30 04:28:43 +02:00
5c39f8c29e
half way done creating css priority challenges
2015-06-29 19:17:06 -07:00
1a80870665
Slightly clarifies 'Uncomment HTML'. Regarding #1158
2015-06-30 03:17:12 +02:00
86356659b3
'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
b96630b9e1
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
24e1cc8859
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
0ea78b9d1f
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
c3826c39dd
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
8970ef5877
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
481eb68baf
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
6a0996b1e0
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
afe0560042
fix should be bufferWithCount
2015-06-26 01:48:21 -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
30c46a43eb
update emails and refine sponsor view
2015-06-25 23:35:48 -07:00
ef919b7ed3
add comments migration to loopback script
2015-06-25 21:47:25 -07:00
e24144edaa
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
45787cebbd
Issue 1059 - Wording issue on instructions
...
Second issue to solve states "Each of your Bootstrap buttons should be wrapped within its own a div element with the class "col-xs-4". Removed the word "a" to read "wrapped within its own div".
This closes #1059
2015-06-24 21:52:10 -05:00
16edbe765a
Merge pull request #1073 from NatashaHaggard/NatashaHaggard-1036
...
Issue 1036 - Fixed minor grammatical mistake
2015-06-24 10:43:12 -07:00
39f46b380d
Merge pull request #1102 from NatashaHaggard/patch-2
...
Issue 1080
2015-06-24 10:32:58 -07:00
13a8a728e2
'Slack' to 'Gitter or Slack'
2015-06-24 10:29:52 -07:00
6b423dfcb1
'Slack' to 'Gitter'
2015-06-24 10:29:52 -07:00
9442f5f648
Merge branch 'master' into staging
...
Conflicts:
controllers/resources.js
public/js/main_0.0.2.js
seed/challenges/advanced-bonfires.json
seed/challenges/basic-bonfires.json
seed/challenges/get-set-for-free-code-camp.json
server/views/partials/navbar.jade
2015-06-24 07:19:54 -07:00
12f05fecc9
Issue 1080
...
Changed "Twitter Bootstrap" to "Bootstrap". It used to be it's name but it's not any more. It's in their brand guidelines to not refer to it as Twitter Bootstrap any more: http://getbootstrap.com/about/#name
2015-06-23 22:55:52 -05:00
6de5a6fb11
Issue 1094 - Field Guide Error
...
"Contact Jason Ruekert - he's @jsonify in Slack."
Since freecodecamp is now using Gitter again, changed it to say "Contact Jason Ruekert - he's @jsonify in Gitter."
2015-06-23 22:46:28 -05:00
33af133af3
Add Symmetric Difference link to bonfire
2015-06-22 21:49:44 -07:00
Quincy Larson
benmcmahon100
LumenTeun
Krzysztof Miąsko
JonSonesen
greasan
Berkeley Martinez
Natasha Haggard
Rex Schrader