CodeCow/freeCodeCamp
1
0
Fork 0
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git synced 2026-06-16 21:06:35 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
1,114 Commits 6 Branches 0 Tags 1.2 GiB
2ca89c19e9
Commit Graph

265 Commits

Author SHA1 Message Date
Berkeley Martinez
b49243ffe3 Merge pull request #2568 from AryanJ-NYC/AryanJ-NYC-1876 
Fixed #1876; fixed some grammar issues; adhered to JS comment convent…
 2015-08-24 11:14:32 -07:00
Berkeley Martinez
6a9c7aab12 Merge pull request #2596 from suhussai/suhussai-2592 
Typo Fix. Closes #2592
 2015-08-24 11:03:34 -07:00
Arsen Melikyan
7130f40b86 Fixes missing backslash in waypoints' instructions' 
In three waypoints: [Find Numbers with Regular Expressions](http://www.freecodecamp.com/challenges/waypoint-find-numbers-with-regular-expressions), [Find White Space with Regular Expressions](http://www.freecodecamp.com/challenges/waypoint-find-white-space-with-regular-expressions), [Invert Regular Expression Matches with JavaScript](http://www.freecodecamp.com/challenges/waypoint-invert-regular-expression-matches-with-javascript) there are confusing instructions: /d+/gi instead of /\d+/gi, /s+/gi instead of /\s+/gi, /S+/gi instead of /\S+/gi.This commit fixed them.
 2015-08-24 14:48:38 +04:00
benmcmahon100
8704aa9a8d Fix #2605 2015-08-24 00:22:35 +01:00
suhussai
b0d2ac24ec Typo Fix. Closes #2592 
Changed "greater then" to "greater than" in Waypoint 30, http://freecodecamp.com/challenges/waypoint-generate-random-whole-numbers-with-javascript
 2015-08-23 12:20:28 -06:00
Aryan Jabbari
918f57d1c4 Fixed #1876; fixed some grammar issues; adhered to JS comment conventions 2015-08-23 05:19:45 -04:00
Quincy Larson
91cb86eca9 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-22 18:08:37 -07:00
Quincy Larson
f00a56580c update JavaScript copy from pull request 2015-08-22 17:40:59 -07:00
Berkeley Martinez
ec5a4d62e3 Merge pull request #2505 from issyl0/fix_typo_iterate_with_js 
In the while loop iterator section, advise while loops, not for loops
 2015-08-22 17:22:14 -07:00
Abhisek Pattnaik
b44f537835 Fix error in string 2015-08-23 03:26:20 +05:30
Abhisek Pattnaik
b224955e2f Fix Add your JavaScript Slot Machine Instructions 2015-08-23 03:22:05 +05:30
Isabell Long
6344f73a36 In the while loop iterator section, advise while loops, not for loops 
- Fixes #2504.
 2015-08-22 20:27:08 +01:00
Berkeley Martinez
45f7fee772 Merge pull request #2498 from issyl0/add_full_stops 
Add full stops at the end of "Random Whole Number" waypoint
 2015-08-22 10:14:04 -07:00
Isabell Long
43f229a231 Add periods at the end of sentences in the Random Whole Number waypoint 
- Partially fixes #1991.
 2015-08-22 18:08:58 +01:00
waseem
b9db124ea4 Fixed grammar - replaced 'but' with 'by' 2015-08-22 22:21:15 +08:00
Abhisek Pattnaik
a4e903847f Correct Sift through Text with Regular Expressions 
- Change information text
- Change regular expression
- Change code in editor
- Change assertion
 2015-08-22 19:05:41 +05:30
benmcmahon100
6c56cfa238 Merge remote-tracking branch 'origin/staging' into staging 2015-08-21 22:40:18 +01:00
benmcmahon100
1f0b5d9e60 Fix a syntax(ish) error 2015-08-21 22:37:34 +01:00
benmcmahon100
5a1d45b766 Merge pull request #2451 from ahstro/ahstro-2440 
Moved myArray into 'Only change code'-block
 2015-08-21 22:34:16 +01:00
benmcmahon100
93b5961a12 Merge remote-tracking branch 'origin/staging' into staging 2015-08-21 22:01:11 +01:00
benmcmahon100
6a887bbf33 Fix #2444 2015-08-21 22:01:03 +01:00
Berkeley Martinez
fa4b330281 fix delete is a keyword not a function 2015-08-21 12:37:47 -07:00
ahstro
7714b0c4b7 Moved myArray into 'Only change code'-block 2015-08-21 21:22:25 +02:00
benmcmahon100
4959a23412 Update JSON 2015-08-21 20:20:56 +01:00
benmcmahon100
813d7509a1 Fix #2364 2015-08-20 23:38:16 +01:00
dokkillo
01fbec96a8 issue 2270 2015-08-20 17:21:10 +02:00
benmcmahon100
eb0a06c523 Merge pull request #2235 from dokkillo/dokkillo-2218 
issue #2218
 2015-08-19 23:14:09 +01:00
dokkillo
48e6f6a7bf issue #2218 2015-08-19 23:45:58 +02:00
benmcmahon100
23625a3b09 Merge pull request #1975 from AryanJ-NYC/AryanJ-NYC-1909 
Fixed #1909 #1972
 2015-08-19 21:31:16 +01:00
benmcmahon100
525802cf07 Merge pull request #1977 from AryanJ-NYC/AryanJ-NYC-1944 
Fixed #1944
 2015-08-19 21:30:58 +01:00
benmcmahon100
8040dfbe14 Merge pull request #1985 from AryanJ-NYC/AryanJ-NYC-1982 
Fixed #1982
 2015-08-19 21:30:25 +01:00
benmcmahon100
16b91a9220 Merge pull request #1990 from AryanJ-NYC/AryanJ-NYC-1924 
Fixes #1924
 2015-08-19 21:30:17 +01:00
benmcmahon100
d0aab2569d Merge pull request #1998 from itxchy/patch-2 
Issue: Grammar #1994
 2015-08-19 21:29:25 +01:00
benmcmahon100
08efc3ecb0 Merge pull request #2003 from michael-krebs/michael-krebs-1986 
fix #1986
 2015-08-19 21:28:13 +01:00
benmcmahon100
5bceb73887 Merge pull request #2004 from michael-krebs/michael-krebs-1988 
fix #1988
 2015-08-19 21:27:54 +01:00
benmcmahon100
16f83d544a Merge pull request #2006 from itxchy/patch-4 
Fixed: Misspell #1877
 2015-08-19 21:27:34 +01:00
benmcmahon100
038d77776c Merge pull request #2069 from AryanJ-NYC/AryanJ-NYC-2036 
Fixes #2036
 2015-08-19 21:24:24 +01:00
benmcmahon100
bdfb84ef86 Merge pull request #2074 from jbmartinez/jbmartinez-2049 
Fixed #2049
 2015-08-19 21:23:05 +01:00
benmcmahon100
3cdc703147 Merge pull request #2127 from ptsurbeleu/staging 
fix issue #2124 and rephrase the challenge a bit to avoid confusion
 2015-08-19 21:22:12 +01:00
benmcmahon100
97b54dd933 Merge pull request #2213 from dokkillo/staging 
issue #2191
 2015-08-19 19:11:27 +01:00
dokkillo
0b45c69d32 issue #2191 2015-08-19 19:12:51 +02:00
Ionut Costica
d22deb5f76 Fix for Issue #2179, #2141, #2077, #1999 
Fixes #2179, #2141, #2077, #1999
 2015-08-19 15:43:39 +03:00
Ionut Costica
72c69a7e19 Fix for Issue #2175 
Fixes #2175
 2015-08-19 15:08:57 +03:00
Pavel Tsurbeleu
d6752a0600 fix issue #2124 and rephrase the challenge a bit to avoid confusion 2015-08-18 15:17:26 -07:00
Juan Martínez
1b42bb4433 Fixed #2049 2015-08-18 14:05:51 +00:00
Aryan Jabbari
079d396770 Fixes #2036 2015-08-18 09:34:34 -04:00
Matt Trifilo
5119565411 Fixed: Misspell #1877 
Issue #1877's description's hint mentioned the wrong variable.
 2015-08-17 23:29:11 -05:00
Michael Krebs
de9adc0aa8 fix #1988 2015-08-18 00:22:33 -04:00
Michael Krebs
3215c39b8b fix #1986 2015-08-18 00:17:56 -04:00
Matt Trifilo
ee451a34fa Issue: Grammar #1994 
Put in the proposed grammar changes from [this issue](https://github.com/FreeCodeCamp/FreeCodeCamp/issues/1994).
 2015-08-17 23:01:52 -05:00
Aryan Jabbari
ea131f3821 Fixes #1924 2015-08-17 22:54:08 -04:00
Aryan Jabbari
c31f6956c1 Fixed #1982 2015-08-17 22:31:37 -04:00
Aryan Jabbari
c8e41ef084 Fixed #1944 2015-08-17 22:21:57 -04:00
Aryan Jabbari
7bfe73ce26 Fixed #1909 #1972 2015-08-17 22:19:14 -04:00
Aryan Jabbari
79b2c0bd2c Fixed #1926 2015-08-17 16:42:20 -04:00
Aryan Jabbari
237df7aa64 Moved closing code to line 961 2015-08-17 16:34:45 -04:00
Aryan Jabbari
14713a4c48 Fixes #1878 2015-08-17 16:19:02 -04:00
benmcmahon100
02e2e915f9 Spaced out code a bit more on the shift challenge 2015-08-17 21:12:19 +01:00
benmcmahon100
161138d4c6 fixed the moved some comments in a seed that were causing confusion 2015-08-17 21:11:01 +01:00
benmcmahon100
bbfa6b339e Merge pull request #1812 from AryanJ-NYC/AryanJ-NYC-1807 
Fixes #1807
 2015-08-17 20:22:55 +01:00
benmcmahon100
1be658fdeb Fix #1871 2015-08-17 20:11:04 +01:00
benmcmahon100
0e05a93d96 Fix #1870 #1874 and there was another issue but i cant find it related to the arithmetic on decimals challenge 2015-08-17 20:08:21 +01:00
benmcmahon100
154d38ed13 Merge pull request #1857 from AryanJ-NYC/AryanJ-NYC-1856 
Fixes #1856
 2015-08-17 14:53:40 +01:00
Aryan Jabbari
0be4d6f1dc Fixes #1856 2015-08-17 09:52:34 -04:00
benmcmahon100
3565ef4903 Merge remote-tracking branch 'origin/staging' into staging 2015-08-17 14:28:54 +01:00
benmcmahon100
a18979a9ff Fix #1838 2015-08-17 14:28:30 +01:00
benmcmahon100
477624b6bf Update basic-javascript.json 2015-08-17 14:16:16 +01:00
benmcmahon100
9584dfb156 Merge pull request #1815 from AryanJ-NYC/AryanJ-NYC-1813 
Fixed #1813
 2015-08-17 14:15:37 +01:00
Aryan Jabbari
8cbde055af Fixed #1813 2015-08-16 20:47:43 -04:00
Aryan Jabbari
d206e0b416 Fixes #1807 2015-08-16 20:14:12 -04:00
Aryan Jabbari
59a2765e27 Deleted extra comma 2015-08-16 20:08:37 -04:00
Aryan Jabbari
5041d6e472 Fixes #1801 2015-08-16 20:06:47 -04:00
benmcmahon100
5e3de0be68 Fixed a challenge test on modify array data with indexes 2015-08-16 20:17:06 +01:00
Quincy Larson
960931d41c improvements to javascript challenges 2015-08-16 04:05:15 -07:00
Quincy Larson
0a0379eecf fix nested array challenge 2015-08-15 15:56:56 -07:00
Quincy Larson
0d61531b4d fix critical failing test in early waypoint 2015-08-15 15:33:21 -07:00
Quincy Larson
2b6bdd098f update JavaScript challenges 2015-08-15 13:57:44 -07:00
Quincy Larson
4557711908 QA javascript challenges and remove slot machine for now 2015-08-15 11:11:25 -07:00
Quincy Larson
0c3e20977d Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-14 17:29:28 -07:00
Quincy Larson
7670d73ff5 improvements to copy of text and test output 2015-08-14 17:26:24 -07:00
benmcmahon100
273b731d29 Added a helper function to main.js for challenge making 2015-08-15 01:08:33 +01:00
Quincy Larson
fc7fcdc6a6 add semicolons to end of all tests in js-style challenges 2015-08-14 14:48:59 -07:00
Quincy Larson
56a8c203a7 improve javascript challenge copy 2015-08-14 14:40:02 -07:00
Quincy Larson
b56fd5b250 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-14 13:50:31 -07:00
Quincy Larson
a272b6f5ec more improvements to javascript challenges 2015-08-14 13:50:20 -07:00
benmcmahon100
e55b3f1782 Fixed a weird error involving RegEx and single quotes 2015-08-14 20:26:05 +01:00
benmcmahon100
09c56cb73a Allow optional white space when nesting arrays 2015-08-14 12:08:40 +01:00
Quincy Larson
dca68ef0b0 more improvements to javascript challenges 2015-08-14 01:13:07 -07:00
Quincy Larson
cd4fd1720d make additional improvements to JavaScript challenge copy 2015-08-13 23:44:13 -07:00
Quincy Larson
edf9959fc9 finish jquery and start modifying javascript 2015-08-13 22:07:54 -07:00
Quincy Larson
9275bd5076 Merge branch 'staging' into jquery 
Conflicts:
	seed/challenges/basic-javascript.json
	seed/challenges/object-oriented-and-functional-programming.json
 2015-08-13 15:39:30 -07:00
Quincy Larson
837d412777 use double quotes for all string literals in waypoints 2015-08-13 15:32:40 -07:00
benmcmahon100
74ba74bb3b Added a more specific example 2015-08-13 21:25:31 +01:00
Quincy Larson
0fdf9fbe62 Merge branch 'staging' into jquery 
Conflicts:
	seed/challenges/bootstrap.json
	seed/challenges/jquery.json
 2015-08-12 02:06:03 -07:00
benmcmahon100
05afe79320 First four OOP challenges and the final slot machine challenge. 2015-08-12 00:11:56 +01:00
benmcmahon100
1827857eed Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-11 15:39:07 +01:00
Quincy Larson
f2356c6767 Merge branch 'staging' into jquery 
Conflicts:
	seed/challenges/bootstrap.json
 2015-08-10 22:03:51 -07:00
sonorangirl
0670f73b6d Made some spaces optional for 4th test 2015-08-10 19:32:52 -07:00
sonorangirl
f8c63c9dba Fixed RegEx so that 4th test would pass 2015-08-10 19:22:18 -07:00
sonorangirl
e7f1f12a6f Fixed typos in 1st slot machine challenge 2015-08-10 18:05:07 -07:00
Isabell Long
2f714f1541 Fix typos in the Basic Javascript challenge 
- Partially fixes #1519 - looks like some of those typos had already
  been fixed.
 2015-08-09 19:32:10 +00:00
Berkeley Martinez
d2069827d5 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-08-09 22:58:46 -07:00
Shouvik Roy
30b913b2d8 Update basic-javascript.json to fix #1642 
Fixed following issues
#1639 : Fixed ```description``` to have "In JavaScript" instead of "in JavaScript" and added punctuation.
#1640 #1641 Added punctuation and fixed typo to have "perform mathematical functions" instead of "preform mathematical functions".
 2015-08-10 07:32:57 +05:30
Berkeley Martinez
24e45d18ce add type to challenges 2015-08-07 23:37:32 -07:00
Berkeley Martinez
d31b53da2a rename top level title to name 2015-08-07 18:43:45 -07:00
ahstro
75919c63f3 Everything is horrible 2015-08-08 02:38:16 +02:00
Quincy Larson
9f926c8f08 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-06 23:19:18 -07:00
Quincy Larson
aa58671ee3 restructure curriculum to split jQuery and Ajax into seperate sections 2015-08-06 23:19:05 -07:00
Samuel Plumppu
0624b65292 fixed typos 2015-08-06 20:45:59 +02:00
benmcmahon100
7284bbf7a7 Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1593 2015-08-06 14:54:44 +01:00
benmcmahon100
a82265e883 Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1599 2015-08-06 14:51:26 +01:00
Quincy Larson
73ab630e0b update dashed name 2015-08-06 02:26:09 -07:00
Quincy Larson
ac44b5b481 rename all of Ben's JavaScript challenges to be more in line with other waypoints 2015-08-06 02:06:53 -07:00
Marcin Flotyński
d90bb6a4f4 Fixed a few typos in javascript-basic 2015-08-06 09:03:03 +02:00
benmcmahon100
59991365f5 Merge pull request #1576 from cristianvnica/cristianvnica-1575 
Fixing #1575
 2015-08-05 21:24:05 +01:00
Cristian V. Nica
241147a5c8 Fixing #1575 
Fixing small typo
 2015-08-05 23:22:37 +03:00
benmcmahon100
585ef7db12 Merge pull request #1572 from cristianvnica/cristianvnica-1571 
Trying to fix: #1571
 2015-08-05 20:43:17 +01:00
Quincy Larson
0254a9bd57 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-05 11:58:09 -07:00
Quincy Larson
40c371238d new final-ish curriculum structure 2015-08-05 11:57:58 -07:00
Cristian V. Nica
367bcdf35c Trying to fix: #1571 
I have found a small typo on challenge: An Array Of new Information
 2015-08-05 21:55:25 +03:00
benmcmahon100
a784d9e960 Changed the object lessons to use dot notation instead of bracket 
Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1564
 2015-08-05 17:31:42 +01:00
benmcmahon100
b6dc52cf08 fix https://github.com/FreeCodeCamp/freecodecamp/issues/1559 2015-08-05 16:54:57 +01:00
benmcmahon100
92091cea96 Fix some typos 2015-08-05 15:38:54 +01:00
Quincy Larson
d838036ed2 add a span challenge and replace more old outside images with s3 images 2015-08-05 00:06:20 -07:00
benmcmahon100
e944889f69 Fixed typos in magical maths waypoints and restored server.js to a previous working state 2015-08-04 13:28:41 +01:00
Quincy Larson
1de4de80eb quick sweep to make sure all tests run properly 2015-08-03 23:03:12 -07:00
Quincy Larson
5a4560c0fb Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-03 21:17:55 -07:00
benmcmahon100
de124a4f81 Fixed two typos and fixed a no tests tun error 2015-08-03 20:43:23 +01:00
benmcmahon100
6fd7e7663c Generalised RegEx for waypoint-make-it-functional fix https://github.com/FreeCodeCamp/freecodecamp/issues/1476 added comment to show where to block exploits in jsframework 2015-08-03 18:02:26 +01:00
benmcmahon100
f7e842ca78 Hardened The check-the-length-property-of-a-string-variable challenge to make it hard to get no tests run 2015-08-03 17:01:27 +01:00
Quincy Larson
2f74b3f795 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-02 19:06:32 -07:00
Quincy Larson
e5fe98b1bb fix minor grammar issue in javascript challenges 2015-08-02 19:06:25 -07:00
benmcmahon100
5bfd381e65 Allows users to add values to the inner arrays 2015-08-02 21:24:13 +01:00
benmcmahon100
df6465da3e Fixed the fact it was myDecimal instead of myFloat 2015-08-02 21:15:39 +01:00
benmcmahon100
4e7c681d90 Added extra regex moving on to fix scroller without those new images 2015-08-01 19:13:37 +01:00
benmcmahon100
fdd16820ef Added extra regex moving on to fix scroller without those new images 2015-08-01 19:12:44 +01:00
benmcmahon100
d4fc4cc8c3 All done without extra regex 2015-08-01 16:11:57 +01:00
benmcmahon100
8225ce3cdb All done without the extra regex 2015-08-01 16:10:21 +01:00
benmcmahon100
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
Quincy Larson
b75a8e3138 fix storage and reset functionality for js and html challenge views 2015-07-31 13:37:06 -07:00
benmcmahon100
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
benmcmahon100
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
benmcmahon100
f49f0ccf07 Ready JavaScript Curriculum 2015-07-31 00:22:56 +01:00
benmcmahon100
60dbeb07fd Ready JavaScript Curriculum 2015-07-30 23:46:47 +01:00
benmcmahon100
e78a39cb8d Ready JavaScript Curriculum 2015-07-30 20:58:02 +01:00
Berkeley Martinez
d6a27326a3 Fix dup id's in basic javascript 2015-07-25 20:22:13 -07:00
Quincy Larson
cf7da2a7d5 Merge branch 'staging' into js-curriculum 
Conflicts:
	seed/challenges/basic-javascript.json
 2015-07-24 16:08:45 -07:00
Quincy Larson
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
benmcmahon100
50f356f16f Ready Js Curriculum 
Added Regex, Random Numbers and If else Challenges
 2015-07-24 00:38:13 +01:00
Berkeley Martinez
3046c14196 fix 'id' not _id. 
fix spacing after semi colon
 2015-07-23 16:14:45 -07:00