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
e640c71b31
Add video link for Symmetric Difference
2015-06-22 21:46:09 -07:00
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
120879e10b
WP 12-13 ES Translation
2015-06-22 20:22:09 -03:00
99ba9aeb4d
Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging
2015-06-22 10:31:24 -04:00
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
e3eb642fa8
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-21 12:25:45 +02:00
198ce39564
Change eqls to equal
2015-06-21 00:56:20 -05:00
31686e8250
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-20 18:12:24 -07:00
3f21574b5e
add new chat challenge
2015-06-20 18:12:12 -07:00
3a5574c805
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-20 10:46:50 +02:00
a6ca40d6f3
finishing touches on calculator
2015-06-19 21:24:04 -07:00
c01a0ad9d7
fix a bunch of github issues regarding waypoints
2015-06-19 18:31:21 -07:00
fe9d1e97bb
fix broken test from recent pull request
2015-06-19 17:53:59 -07:00
1bb9951d04
Merge branch 'master' into staging
...
Conflicts:
seed/challenges/basic-bonfires.json
2015-06-19 17:39:11 -07:00
e8c472ee91
Merge pull request #984 from rcw271828/staging
...
Fixed typo in field-guides.json
2015-06-19 17:36:19 -07:00
21de53de04
Merge pull request #961 from LumenTeun/lumenteun-942
...
More test cases for 'Seek and Destroy'
2015-06-19 17:32:31 -07:00
d23ad5c121
Merge pull request #960 from 1hella/1hella-959
...
1hella 959
2015-06-19 17:31:14 -07:00
b857d19e2c
Merge pull request #958 from LumenTeun/lumenteun-941
...
'No repeats please' test fix.
2015-06-19 17:29:25 -07:00
db1233c7d4
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-19 16:18:56 -07:00
0e9ab5017b
Merge branch 'Lemony-Andrew-master' into staging
...
Conflicts:
server/views/coursewares/showBonfire.jade
2015-06-19 16:17:59 -07:00
00d1f00b72
Merge pull request #940 from LumenTeun/lumenteun-907
...
Check fix in 'Bootstrap Grid'.
2015-06-19 16:07:48 -07:00
a516a49e15
Merge pull request #939 from LumenTeun/lumenteun-911
...
Test for almost palindromes in 'Check for Palindromes'
2015-06-19 16:06:56 -07:00
37341a2ad3
Merge pull request #938 from LumenTeun/lumenteun-914
...
Improves check for catphotoapp.com in 'Link to External Pages with Anchor Elements'
2015-06-19 16:05:23 -07:00
7a431bef5b
Merge pull request #937 from LumenTeun/lumenteun-918
...
Fixed Zipline jQuery.getJSON() links.
2015-06-19 16:03:17 -07:00
2cb57d5fcc
Merge pull request #936 from LumenTeun/lumenteun-924
...
More 'Convert HTML Entities' test cases. Fixes #924
2015-06-19 16:00:45 -07:00
f248b3fb9f
fix name and dashed name switched
...
close #975
2015-06-18 20:02:32 -07:00
78fa5449b4
Added new test with different max number to Bonfire: Truncate a String
...
Issue 959
2015-06-18 17:48:30 -07:00
92656fcf2f
Added missing MDN Link
...
This bonfire "Missing letters"seems to be missing an important MDN link to "String.fromCharCode()", which is needed to get the missing character to return for the test. Since the missing character is obviously not in the string supplied, you cannot get the character code for it from the string.
2015-06-18 17:48:30 -07:00
07a54c9e0c
Fixed a word
2015-06-18 17:48:29 -07:00
14225ec4bd
Update field-guides.json
...
Fixed a typo in languages section of field guides.
2015-06-18 20:36:33 -04:00
cddc1b6c6a
More test cases for 'Seek and Destroy' #942
2015-06-18 11:56:13 +02:00
f04019a790
'No repeats please' test fix. #941
2015-06-17 23:30:08 +02:00
931a197a93
fix minor typo in html challenge
2015-06-16 18:00:17 -07:00
3ce51fecea
WP11 ES Translation
2015-06-16 18:27:58 -03:00
026e027f23
Translated basic HTML5 and CSS
2015-06-16 19:40:07 +02:00
e39764a739
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-16 19:20:27 +02:00
bec1460d82
Fix wikipedia viewer zipline naming
2015-06-16 08:36:54 -04:00
092f8254ed
Fix challenge map display for loopback updated models. Update loopback migration script to auto complete and catch all records.
2015-06-15 20:53:43 -04:00
93dd65176c
rename flattenUser to loopbackMigration
...
add stories migration to script
2015-06-15 16:47:50 -07:00
d87dcd6ada
Remove excess debug statements from flattenUser.js
2015-06-15 19:12:48 -04:00
643aa30cea
Fix json typo
2015-06-15 18:59:56 -04:00
faeff7b1ed
Ensure build process is part of npm install
2015-06-15 18:10:48 -04:00
e5a4c2f8f5
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-15 18:54:20 +02:00
4b349ff761
Check fix in 'Bootstrap Grid'. #907
2015-06-15 18:26:44 +02:00
667a37cac7
Test for almost palindromes. #911
2015-06-15 18:14:55 +02:00
LumenTeun
Quincy Larson
Natasha Haggard
Rex Schrader
Matias Cao
terakilobyte
greasan
brandenbyers
Berkeley Martinez
Stephen Wanhella
Brett Guillory
rcw271828