7b890aca68
start removing field guide and update nonprofits
2015-07-31 21:13:40 -07:00
1606fcb24a
remove mention of comments from zipline
...
update hot stories api uri
2015-07-31 20:10:30 -07:00
69c96496ec
Added additional tests to Sorted Union Bonfire
2015-07-31 18:04:06 -07:00
e9ca550aa3
Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location
2015-08-01 00:47:39 +01:00
0e08bb8039
fix issue with codemirror framework and script tag rendering
2015-07-31 16:38:12 -07:00
43aa3cccba
fix html view instruction column
2015-07-31 14:36:00 -07:00
b75a8e3138
fix storage and reset functionality for js and html challenge views
2015-07-31 13:37:06 -07:00
3c61c96751
Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location
2015-07-31 19:56:11 +01:00
f759d9fc24
Merge remote-tracking branch 'origin/staging' into staging
2015-07-31 19:54:00 +01:00
a827e2c846
Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location
2015-07-31 19:53:21 +01:00
08d2b373ac
add new jquery challenges and resequence other challenges
2015-07-30 22:40:17 -07:00
d2c4dd8de0
add removal and clone jquery challenges
2015-07-30 18:31:40 -07:00
a592d83f02
add .remove() challenge
2015-07-30 18:12:29 -07:00
6e514a80d4
add a removeClass challenge
2015-07-30 18:05:02 -07:00
781bc3076f
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-07-30 17:31:53 -07:00
3af9507f89
add two new jquery challenges
2015-07-30 17:31:47 -07:00
f49f0ccf07
Ready JavaScript Curriculum
2015-07-31 00:22:56 +01:00
ebc99f6e82
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-07-30 15:51:38 -07:00
60dbeb07fd
Ready JavaScript Curriculum
2015-07-30 23:46:47 +01:00
3a22e96754
finish drafting copy and tests for bootstrap section
2015-07-30 15:45:54 -07:00
17e60ba837
Extra comma was breaking node seed
2015-07-30 21:54:33 +01:00
4e8337bfb3
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-07-30 13:01:57 -07:00
86c6a9a440
fix some minor issues with bootstrap challenges
2015-07-30 13:01:46 -07:00
e78a39cb8d
Ready JavaScript Curriculum
2015-07-30 20:58:02 +01:00
fd10044367
add container-fluid divs to all bootstrap waypoints
2015-07-30 12:20:34 -07:00
a364bf989b
finish color tutorial
2015-07-29 23:21:44 -07:00
262de30393
start work on RGB section
2015-07-29 00:33:17 -07:00
912e075039
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
seed/challenges/basic-javascript.json
2015-07-28 23:11:00 -07:00
527df362db
add ID related challenges
2015-07-28 18:51:39 -07:00
d7a4f7c2c2
about to start priority and !important waypoints
2015-07-28 17:11:51 -07:00
7df555a2ff
Fix Issue #1015
...
Fix two of the tests in "Waypoint: Create an Ordered List"
2015-07-28 13:17:05 -04:00
41f643b5df
Change order of subarrays to cover all cases
...
Since in all tests each subarray has a larger max than the previous subarray, if the user does not reset max for each subarray, the tests still pass.
2015-07-27 20:37:39 +02:00
d6a27326a3
Fix dup id's in basic javascript
2015-07-25 20:22:13 -07:00
cf7da2a7d5
Merge branch 'staging' into js-curriculum
...
Conflicts:
seed/challenges/basic-javascript.json
2015-07-24 16:08:45 -07:00
84a268d09a
Merge branch 'js-curriculum' of https://github.com/benmcmahon100/freecodecamp into benmcmahon100-js-curriculum
...
Conflicts:
seed/challenges/basic-javascript.json
2015-07-24 15:59:37 -07:00
1ef15eb839
additional refactor of HTML challenges
2015-07-23 22:24:51 -07:00
86532e0c0e
QA first dozen html challenges
2015-07-23 18:44:16 -07:00
50f356f16f
Ready Js Curriculum
...
Added Regex, Random Numbers and If else Challenges
2015-07-24 00:38:13 +01:00
3046c14196
fix 'id' not _id.
...
fix spacing after semi colon
2015-07-23 16:14:45 -07:00
3df5319cc9
update zipline copy with CodePen override warning
2015-07-23 16:03:51 -07:00
860c6d8101
add missing false in hikes challenge
2015-07-23 16:03:49 -07:00
3d7ff1dd63
add transcript for missing hike
2015-07-23 16:03:49 -07:00
3e413488b6
add videos to new challenges
2015-07-23 16:03:46 -07:00
636ef6d4f7
finish adding the nodeschool challenges
2015-07-23 16:03:46 -07:00
b8fd1181a2
update basejump demo urls
2015-07-23 16:03:46 -07:00
080e90f446
finish scripts and overall structure for new curriculum
2015-07-23 16:03:46 -07:00
2e90976427
more minor updates
2015-07-23 15:50:47 -07:00
ebfb8384b0
update hikes.json
2015-07-23 15:50:47 -07:00
003aa90f8b
add hikes.json
2015-07-23 15:49:04 -07:00
260797affd
mid-task commit for Berkeley to take over
2015-07-23 15:49:04 -07:00
359d63a6bd
continue building the jQuery Playground
2015-07-23 15:49:03 -07:00
bbe9e492cd
start building the jquery playground bootstrap.json flow
2015-07-23 15:49:03 -07:00
1cc82ab469
restructure entire curriculum sequence and json files
2015-07-23 15:49:03 -07:00
7fc3664a41
continue adding rgb challenges to basic-html5
2015-07-23 15:49:02 -07:00
a2bae52c65
Added start of the random number challenges
2015-07-16 11:06:04 +01:00
79938d0fc1
Full JS Stuff
...
There is a bit more RegEx and if else stuff. Other challenges can be added later but this is the base working set without @QuincyLarson 's fixes to the copy
2015-07-13 21:55:36 +01:00
da9637297b
Add <p> element to label the new ordered list.
...
- Improve consistency of challenge seeds
- Clarify challenge objective for "Waypoint: Created an ordered list"
2015-07-13 13:20:28 -07:00
90f7e33f42
almost complete js challenges
2015-07-13 00:48:58 +01:00
f606d49a68
Clarify text for 'Waypoint: Add a Negative Margin to an Element'
...
- the user was asked to change text to a negative number
- this was confusing, as the test only passes if the value ia -15px
2015-07-11 10:52:58 -04:00
4060d7fdc9
Update to 30!
2015-07-10 17:22:58 +01:00
35fff3ed57
Third commit to the new curriculum
2015-07-10 00:56:30 +01:00
b117341e72
Update 2 of the new js curriculum!
...
7 more challenges added!
2015-07-09 00:26:16 +01:00
8cbf6d224c
Improved consitency in 'Friendly Date Ranges' test cases. #410
2015-07-08 21:19:34 +02:00
c569d6dfdb
Final wording tweak to line 1803
2015-07-08 19:51:19 +01:00
66bbf1ca92
Updated to reflect original wording a bit better
...
Another slight tweak to line 1803 to make it more true to the original wording of the challenge
2015-07-08 19:45:27 +01:00
fa8af8ae05
Fix for #1218
2015-07-06 23:46:26 +01:00
aa6a96a4fd
add basic javascript.json
2015-07-05 17:12:52 -07:00
7d2029780e
clear basic-javascript.json
2015-07-05 17:03:41 -07:00
7231a68222
Fixed typos in Bonfire: Friendly Date Ranges #1156
2015-07-04 16:04:12 -07:00
f8692cd60c
start purging the br challenges
2015-07-03 01:08:11 -07:00
25c5bd769a
add an ajax challenge
2015-07-02 17:31:08 -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
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
c3826c39dd
Merge pull request #1074 from SaintPeter/staging
...
Add video link to Symmetric Differences Bonfire
2015-06-28 15:20:06 -07:00
cd29353ac0
add some additional jquery challenges
2015-06-27 19:42:25 -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
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
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
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
33af133af3
Add Symmetric Difference link to bonfire
2015-06-22 21:49:44 -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
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
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
643aa30cea
Fix json typo
2015-06-15 18:59:56 -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
8ae797d582
Improves check for catphotoapp.com. Fixes #914
2015-06-15 18:06:09 +02:00
466395eb74
Fixed Zipline jQuery.getJSON() links. Fixes #918 #919
2015-06-15 17:43:52 +02:00
2911562888
More 'Convert HTML Entities' test cases. Fixes #924
2015-06-15 17:26:37 +02:00
d5b5973326
Merge branch 'interview' into staging
...
Conflicts:
app.js
controllers/challenge.js
seed/future-jquery-ajax-json.json
2015-06-14 01:02:39 -07:00
9589b6abeb
add dashedName attributes to JSON
2015-06-14 00:55:27 -07:00
ef99b91951
first challenge json file updated with dashedname
2015-06-13 23:50:36 -07:00
4693518192
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-12 22:19:10 +02:00
fc7ac3b3ca
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-11 11:16:31 -07:00
b12fcae985
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-10 07:16:02 +02:00
3b861a5a7f
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
app.js
controllers/fieldGuide.js
controllers/story.js
seed/challenges/basic-html5-and-css.json
seed/challenges/bootstrap.json
seed/field-guides.json
server/views/partials/navbar.jade
views/resources/jobs-form.jade
views/resources/nonprofits-form.jade
views/resources/pmi-acp-agile-project-managers-form.jade
2015-06-09 13:48:29 -07:00
3c042cba30
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-05 15:48:38 +02:00
323ec3d587
change _id to id everywhere that seems relevant to loopback
2015-06-04 13:20:42 -07:00
87f22a5b7e
fix challengeSeeds should be arrays
2015-06-04 12:31:33 -07:00
67d35540cd
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-04 12:24:30 -07:00
9032880e27
Update seed directory to use loopback
2015-06-02 20:32:10 -07:00
Quincy Larson
Berkeley Martinez
SaintPeter
benmcmahon100
TCYRUS
biellls
Sean Nguyen
Michael Pope
LumenTeun
Stephen Wanhella
Krzysztof Miąsko
greasan
Natasha Haggard
Matias Cao
terakilobyte
brandenbyers
Brett Guillory