greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
200 Commits
3 Branches
0 Tags
959 MiB
Commit Graph

200 Commits (2c81ad568ba29ccf57ae74b3a6206343b8c26c61)

Author SHA1 Message Date
LumenTeun 86356659b3 'Font degrade'-test now check order of font-familiy. Fixes #1151 2015-06-30 02:52:21 +02:00
Quincy Larson bee2a843d1 fix broken challenges and attempt to make streak more lenient. 2015-06-29 16:32:49 -07:00
Quincy Larson b96630b9e1 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-28 18:03:21 -07:00
Quincy Larson 7bb72a824b make the Mobile Responsive Images challenge more robust fixes #998 2015-06-28 18:03:11 -07:00
Quincy Larson 24e1cc8859 Merge pull request #1115 from NatashaHaggard/923 
Issue 923 - Grammatical error
 2015-06-28 15:24:52 -07:00
Quincy Larson baa0e68e52 Merge pull request #1124 from greasan/greasan-translateDE 
First two sections translated into German
 2015-06-28 15:22:58 -07:00
Quincy Larson 0ea78b9d1f Merge pull request #1114 from NatashaHaggard/1059 
Issue 1059 - Wording issue on instructions
 2015-06-28 15:22:10 -07:00
Quincy Larson 8e2c246ccf Merge pull request #1149 from JonSonesen/jonathonsonesen-1148 
fixes issue #1148
 2015-06-28 15:21:11 -07:00
Quincy Larson c3826c39dd Merge pull request #1074 from SaintPeter/staging 
Add video link to Symmetric Differences Bonfire
 2015-06-28 15:20:06 -07:00
JonSonesen d4ea05c3fe fixes issue #1148 2015-06-28 15:03:52 -07:00
Quincy Larson 8970ef5877 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-27 19:43:13 -07:00
Quincy Larson cd29353ac0 add some additional jquery challenges 2015-06-27 19:42:25 -07:00
Quincy Larson 481eb68baf update the cities on the field guide 2015-06-27 15:28:37 -07:00
Quincy Larson a1055b0e52 clean up future jquery challenges 2015-06-27 11:56:31 -07:00
greasan 6a0996b1e0 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-26 19:22:13 +02:00
Berkeley Martinez f6c5e35f66 fix buffer return from database query 2015-06-26 01:51:27 -07:00
Berkeley Martinez afe0560042 fix should be bufferWithCount 2015-06-26 01:48:21 -07:00
Quincy Larson 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
Quincy Larson 30c46a43eb update emails and refine sponsor view 2015-06-25 23:35:48 -07:00
Berkeley Martinez ef919b7ed3 add comments migration to loopback script 2015-06-25 21:47:25 -07:00
Natasha Haggard 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
Natasha Haggard 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
Berkeley Martinez 16edbe765a Merge pull request #1073 from NatashaHaggard/NatashaHaggard-1036 
Issue 1036 - Fixed minor grammatical mistake
 2015-06-24 10:43:12 -07:00
Berkeley Martinez 39f46b380d Merge pull request #1102 from NatashaHaggard/patch-2 
Issue 1080
 2015-06-24 10:32:58 -07:00
LumenTeun 13a8a728e2 'Slack' to 'Gitter or Slack' 2015-06-24 10:29:52 -07:00
LumenTeun 6b423dfcb1 'Slack' to 'Gitter' 2015-06-24 10:29:52 -07:00
Quincy Larson 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
Natasha Haggard 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
Natasha Haggard 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
Rex Schrader 33af133af3 Add Symmetric Difference link to bonfire 2015-06-22 21:49:44 -07:00
Rex Schrader e640c71b31 Add video link for Symmetric Difference 2015-06-22 21:46:09 -07:00
Natasha Haggard 4fee40eb8e Issue 1036 - Fixed minor grammatical mistake 
Fixed minor grammatical mistake - changed "Your app should have an text field input element" to "Your app should have a text field input element"
 2015-06-22 22:13:21 -05:00
terakilobyte 99ba9aeb4d Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-22 10:31:24 -04:00
terakilobyte 96c3e41941 Fixes #1053 
This changes the link to point to Free Code Camp's "Lets Pair" room on gitter and opens the link in a new tab/window depending on user browser preference.
 2015-06-22 10:30:26 -04:00
greasan e3eb642fa8 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-21 12:25:45 +02:00
brandenbyers 198ce39564 Change eqls to equal 2015-06-21 00:56:20 -05:00
Quincy Larson 31686e8250 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-20 18:12:24 -07:00
Quincy Larson 3f21574b5e add new chat challenge 2015-06-20 18:12:12 -07:00
greasan 3a5574c805 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-20 10:46:50 +02:00
Quincy Larson a6ca40d6f3 finishing touches on calculator 2015-06-19 21:24:04 -07:00
Quincy Larson c01a0ad9d7 fix a bunch of github issues regarding waypoints 2015-06-19 18:31:21 -07:00
Quincy Larson fe9d1e97bb fix broken test from recent pull request 2015-06-19 17:53:59 -07:00
Quincy Larson 1bb9951d04 Merge branch 'master' into staging 
Conflicts:
	seed/challenges/basic-bonfires.json
 2015-06-19 17:39:11 -07:00
Quincy Larson e8c472ee91 Merge pull request #984 from rcw271828/staging 
Fixed typo in field-guides.json
 2015-06-19 17:36:19 -07:00
Quincy Larson 21de53de04 Merge pull request #961 from LumenTeun/lumenteun-942 
More test cases for 'Seek and Destroy'
 2015-06-19 17:32:31 -07:00
Quincy Larson d23ad5c121 Merge pull request #960 from 1hella/1hella-959 
1hella 959
 2015-06-19 17:31:14 -07:00
Quincy Larson b857d19e2c Merge pull request #958 from LumenTeun/lumenteun-941 
'No repeats please' test fix.
 2015-06-19 17:29:25 -07:00
Quincy Larson db1233c7d4 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-19 16:18:56 -07:00
Quincy Larson 0e9ab5017b Merge branch 'Lemony-Andrew-master' into staging 
Conflicts:
	server/views/coursewares/showBonfire.jade
 2015-06-19 16:17:59 -07:00
Quincy Larson 00d1f00b72 Merge pull request #940 from LumenTeun/lumenteun-907 
Check fix in 'Bootstrap Grid'.
 2015-06-19 16:07:48 -07:00