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
6,251 Commits 6 Branches 0 Tags 1.2 GiB
5976fa5ee0
Commit Graph

313 Commits

Author SHA1 Message Date
Arsen Melikyan
d54bbaaf2d 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
8136443f87 Fix #2605 2015-08-24 00:22:35 +01:00
suhussai
2cc09ce374 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
ba0ff40604 Fixed #1876; fixed some grammar issues; adhered to JS comment conventions 2015-08-23 05:19:45 -04:00
Quincy Larson
9fc3fd72b1 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-22 18:08:37 -07:00
Quincy Larson
ebf1530d6f update JavaScript copy from pull request 2015-08-22 17:40:59 -07:00
Berkeley Martinez
810e40e4db 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
3b6da88e7f Fix error in string 2015-08-23 03:26:20 +05:30
Abhisek Pattnaik
e87913edad Fix Add your JavaScript Slot Machine Instructions 2015-08-23 03:22:05 +05:30
Isabell Long
1206655940 In the while loop iterator section, advise while loops, not for loops 
- Fixes #2504.
 2015-08-22 20:27:08 +01:00
Berkeley Martinez
f90f59f0c6 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
a816dc5a19 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
7fad44e648 Fixed grammar - replaced 'but' with 'by' 2015-08-22 22:21:15 +08:00
Abhisek Pattnaik
c5c68c252c 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
cd511ad314 Merge remote-tracking branch 'origin/staging' into staging 2015-08-21 22:40:18 +01:00
benmcmahon100
ae6746f978 Fix a syntax(ish) error 2015-08-21 22:37:34 +01:00
benmcmahon100
ae43cb0fa3 Merge pull request #2451 from ahstro/ahstro-2440 
Moved myArray into 'Only change code'-block
 2015-08-21 22:34:16 +01:00
benmcmahon100
0f1baeeb68 Merge remote-tracking branch 'origin/staging' into staging 2015-08-21 22:01:11 +01:00
benmcmahon100
e33a929f0c Fix #2444 2015-08-21 22:01:03 +01:00
Berkeley Martinez
c32e89baff fix delete is a keyword not a function 2015-08-21 12:37:47 -07:00
ahstro
ae6271964f Moved myArray into 'Only change code'-block 2015-08-21 21:22:25 +02:00
benmcmahon100
9584c7870a Update JSON 2015-08-21 20:20:56 +01:00
benmcmahon100
4de75fc9e7 Fix #2364 2015-08-20 23:38:16 +01:00
dokkillo
87c01aae52 issue 2270 2015-08-20 17:21:10 +02:00
benmcmahon100
f1053a2f68 Merge pull request #2235 from dokkillo/dokkillo-2218 
issue #2218
 2015-08-19 23:14:09 +01:00
dokkillo
2d06e35afe issue #2218 2015-08-19 23:45:58 +02:00
benmcmahon100
576dcf1345 Merge pull request #1975 from AryanJ-NYC/AryanJ-NYC-1909 
Fixed #1909 #1972
 2015-08-19 21:31:16 +01:00
benmcmahon100
e05aab352d Merge pull request #1977 from AryanJ-NYC/AryanJ-NYC-1944 
Fixed #1944
 2015-08-19 21:30:58 +01:00
benmcmahon100
c6cb1a0742 Merge pull request #1985 from AryanJ-NYC/AryanJ-NYC-1982 
Fixed #1982
 2015-08-19 21:30:25 +01:00
benmcmahon100
c3da5e9373 Merge pull request #1990 from AryanJ-NYC/AryanJ-NYC-1924 
Fixes #1924
 2015-08-19 21:30:17 +01:00
benmcmahon100
e18c3547e3 Merge pull request #1998 from itxchy/patch-2 
Issue: Grammar #1994
 2015-08-19 21:29:25 +01:00
benmcmahon100
7f712ffca3 Merge pull request #2003 from michael-krebs/michael-krebs-1986 
fix #1986
 2015-08-19 21:28:13 +01:00
benmcmahon100
c8de9d63fb Merge pull request #2004 from michael-krebs/michael-krebs-1988 
fix #1988
 2015-08-19 21:27:54 +01:00
benmcmahon100
a2d48f8b60 Merge pull request #2006 from itxchy/patch-4 
Fixed: Misspell #1877
 2015-08-19 21:27:34 +01:00
benmcmahon100
502a255253 Merge pull request #2069 from AryanJ-NYC/AryanJ-NYC-2036 
Fixes #2036
 2015-08-19 21:24:24 +01:00
benmcmahon100
45f0de877a Merge pull request #2074 from jbmartinez/jbmartinez-2049 
Fixed #2049
 2015-08-19 21:23:05 +01:00
benmcmahon100
79e259a0e7 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
ca80196412 Merge pull request #2213 from dokkillo/staging 
issue #2191
 2015-08-19 19:11:27 +01:00
dokkillo
933d1edeee issue #2191 2015-08-19 19:12:51 +02:00
Ionut Costica
8e705b14ec Fix for Issue #2179, #2141, #2077, #1999 
Fixes #2179, #2141, #2077, #1999
 2015-08-19 15:43:39 +03:00
Ionut Costica
a519565edf Fix for Issue #2175 
Fixes #2175
 2015-08-19 15:08:57 +03:00
Pavel Tsurbeleu
0df76dc7b7 fix issue #2124 and rephrase the challenge a bit to avoid confusion 2015-08-18 15:17:26 -07:00
Juan Martínez
91795de83f Fixed #2049 2015-08-18 14:05:51 +00:00
Aryan Jabbari
1822a207d3 Fixes #2036 2015-08-18 09:34:34 -04:00
Matt Trifilo
e06b348918 Fixed: Misspell #1877 
Issue #1877's description's hint mentioned the wrong variable.
 2015-08-17 23:29:11 -05:00
Michael Krebs
3e520811d0 fix #1988 2015-08-18 00:22:33 -04:00
Michael Krebs
817684de4e fix #1986 2015-08-18 00:17:56 -04:00
Matt Trifilo
9a828c9d3e 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
5d54d98190 Fixes #1924 2015-08-17 22:54:08 -04:00
Aryan Jabbari
b3875a3d6e Fixed #1982 2015-08-17 22:31:37 -04:00
Aryan Jabbari
fa31cdca0e Fixed #1944 2015-08-17 22:21:57 -04:00
Aryan Jabbari
32eeefa439 Fixed #1909 #1972 2015-08-17 22:19:14 -04:00
Aryan Jabbari
4d56972e21 Fixed #1926 2015-08-17 16:42:20 -04:00
Aryan Jabbari
0cab1ebfe5 Moved closing code to line 961 2015-08-17 16:34:45 -04:00
Aryan Jabbari
8722a0a294 Fixes #1878 2015-08-17 16:19:02 -04:00
benmcmahon100
7c360285aa Spaced out code a bit more on the shift challenge 2015-08-17 21:12:19 +01:00
benmcmahon100
0bbb5cf122 fixed the moved some comments in a seed that were causing confusion 2015-08-17 21:11:01 +01:00
benmcmahon100
9727f3e520 Merge pull request #1812 from AryanJ-NYC/AryanJ-NYC-1807 
Fixes #1807
 2015-08-17 20:22:55 +01:00
benmcmahon100
b35c77deb7 Fix #1871 2015-08-17 20:11:04 +01:00
benmcmahon100
93a7fa1c34 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
4b2a53f974 Merge pull request #1857 from AryanJ-NYC/AryanJ-NYC-1856 
Fixes #1856
 2015-08-17 14:53:40 +01:00
Aryan Jabbari
6cf25e6a35 Fixes #1856 2015-08-17 09:52:34 -04:00
benmcmahon100
d601240b98 Merge remote-tracking branch 'origin/staging' into staging 2015-08-17 14:28:54 +01:00
benmcmahon100
946717fc65 Fix #1838 2015-08-17 14:28:30 +01:00
benmcmahon100
06c3d78c64 Update basic-javascript.json 2015-08-17 14:16:16 +01:00
benmcmahon100
e63c387ef7 Merge pull request #1815 from AryanJ-NYC/AryanJ-NYC-1813 
Fixed #1813
 2015-08-17 14:15:37 +01:00
Aryan Jabbari
fda754f187 Fixed #1813 2015-08-16 20:47:43 -04:00
Aryan Jabbari
854406e5fa Fixes #1807 2015-08-16 20:14:12 -04:00
Aryan Jabbari
ae4ec8e9fd Deleted extra comma 2015-08-16 20:08:37 -04:00
Aryan Jabbari
1790b14808 Fixes #1801 2015-08-16 20:06:47 -04:00
benmcmahon100
9c7b651827 Fixed a challenge test on modify array data with indexes 2015-08-16 20:17:06 +01:00
Quincy Larson
bce3b34f9b improvements to javascript challenges 2015-08-16 04:05:15 -07:00
Quincy Larson
1fbb2a32f8 fix nested array challenge 2015-08-15 15:56:56 -07:00
Quincy Larson
40e14c3999 fix critical failing test in early waypoint 2015-08-15 15:33:21 -07:00
Quincy Larson
f2ee2e4031 update JavaScript challenges 2015-08-15 13:57:44 -07:00
Quincy Larson
98bf10a7d3 QA javascript challenges and remove slot machine for now 2015-08-15 11:11:25 -07:00
Quincy Larson
2bbad67141 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-14 17:29:28 -07:00
Quincy Larson
aed4b6bfe1 improvements to copy of text and test output 2015-08-14 17:26:24 -07:00
benmcmahon100
326c22276d Added a helper function to main.js for challenge making 2015-08-15 01:08:33 +01:00
Quincy Larson
e6297de282 add semicolons to end of all tests in js-style challenges 2015-08-14 14:48:59 -07:00
Quincy Larson
3a81e6efb3 improve javascript challenge copy 2015-08-14 14:40:02 -07:00
Quincy Larson
338485db8e Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-14 13:50:31 -07:00
Quincy Larson
28e0ad29cf more improvements to javascript challenges 2015-08-14 13:50:20 -07:00
benmcmahon100
d0b5bcd0b0 Fixed a weird error involving RegEx and single quotes 2015-08-14 20:26:05 +01:00
benmcmahon100
8a9a8710da Allow optional white space when nesting arrays 2015-08-14 12:08:40 +01:00
Quincy Larson
af3f6bb109 more improvements to javascript challenges 2015-08-14 01:13:07 -07:00
Quincy Larson
99e7116ee5 make additional improvements to JavaScript challenge copy 2015-08-13 23:44:13 -07:00
Quincy Larson
f3cef6de46 finish jquery and start modifying javascript 2015-08-13 22:07:54 -07:00
Quincy Larson
fea723efbd 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
3f05565739 use double quotes for all string literals in waypoints 2015-08-13 15:32:40 -07:00
benmcmahon100
095552dbbe Added a more specific example 2015-08-13 21:25:31 +01:00
Quincy Larson
d138757c52 Merge branch 'staging' into jquery 
Conflicts:
	seed/challenges/bootstrap.json
	seed/challenges/jquery.json
 2015-08-12 02:06:03 -07:00
benmcmahon100
1dc66b7671 First four OOP challenges and the final slot machine challenge. 2015-08-12 00:11:56 +01:00
benmcmahon100
9df99eb635 Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-11 15:39:07 +01:00
Quincy Larson
db6db2e403 Merge branch 'staging' into jquery 
Conflicts:
	seed/challenges/bootstrap.json
 2015-08-10 22:03:51 -07:00
sonorangirl
fb44b50941 Made some spaces optional for 4th test 2015-08-10 19:32:52 -07:00
sonorangirl
8efe8ee825 Fixed RegEx so that 4th test would pass 2015-08-10 19:22:18 -07:00
sonorangirl
8a16942036 Fixed typos in 1st slot machine challenge 2015-08-10 18:05:07 -07:00
Isabell Long
76e4fc2d33 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
1d724f145e Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-08-09 22:58:46 -07:00
Shouvik Roy
02717582d8 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
26e69c8621 add type to challenges 2015-08-07 23:37:32 -07:00
Berkeley Martinez
f241a362d5 rename top level title to name 2015-08-07 18:43:45 -07:00
ahstro
e7c8589d08 Everything is horrible 2015-08-08 02:38:16 +02:00
Quincy Larson
c5ad1ad851 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-06 23:19:18 -07:00
Quincy Larson
629eaa6ef9 restructure curriculum to split jQuery and Ajax into seperate sections 2015-08-06 23:19:05 -07:00
Samuel Plumppu
4349d06d16 fixed typos 2015-08-06 20:45:59 +02:00
benmcmahon100
e68bc0272d Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1593 2015-08-06 14:54:44 +01:00
benmcmahon100
5eb9c060e1 Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1599 2015-08-06 14:51:26 +01:00
Quincy Larson
dfb48fbdad update dashed name 2015-08-06 02:26:09 -07:00
Quincy Larson
2e0e7d5a74 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
5882b9b84f Fixed a few typos in javascript-basic 2015-08-06 09:03:03 +02:00
benmcmahon100
117306de33 Merge pull request #1576 from cristianvnica/cristianvnica-1575 
Fixing #1575
 2015-08-05 21:24:05 +01:00
Cristian V. Nica
caef8c9da8 Fixing #1575 
Fixing small typo
 2015-08-05 23:22:37 +03:00
benmcmahon100
974bf503ec Merge pull request #1572 from cristianvnica/cristianvnica-1571 
Trying to fix: #1571
 2015-08-05 20:43:17 +01:00
Quincy Larson
40cdf76035 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-05 11:58:09 -07:00
Quincy Larson
01e408d48c new final-ish curriculum structure 2015-08-05 11:57:58 -07:00
Cristian V. Nica
5ff371fc6f 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
f68c6d0fa3 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
e7cac3ccf9 fix https://github.com/FreeCodeCamp/freecodecamp/issues/1559 2015-08-05 16:54:57 +01:00
benmcmahon100
ceed3c4877 Fix some typos 2015-08-05 15:38:54 +01:00
Quincy Larson
959fde64fc add a span challenge and replace more old outside images with s3 images 2015-08-05 00:06:20 -07:00
benmcmahon100
fc0ccf3aea 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
aa10e1ff69 quick sweep to make sure all tests run properly 2015-08-03 23:03:12 -07:00
Quincy Larson
eb8b9df5ad Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-03 21:17:55 -07:00
benmcmahon100
6c0049803d Fixed two typos and fixed a no tests tun error 2015-08-03 20:43:23 +01:00
benmcmahon100
4be714aa97 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
c9c2a74461 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
dfa45edb7c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-02 19:06:32 -07:00
Quincy Larson
686017006b fix minor grammar issue in javascript challenges 2015-08-02 19:06:25 -07:00
benmcmahon100
c8f2b4a571 Allows users to add values to the inner arrays 2015-08-02 21:24:13 +01:00
benmcmahon100
b7324b4155 Fixed the fact it was myDecimal instead of myFloat 2015-08-02 21:15:39 +01:00
benmcmahon100
fd0307ffcf Added extra regex moving on to fix scroller without those new images 2015-08-01 19:13:37 +01:00
benmcmahon100
7443236912 Added extra regex moving on to fix scroller without those new images 2015-08-01 19:12:44 +01:00
benmcmahon100
f6564884a2 All done without extra regex 2015-08-01 16:11:57 +01:00
benmcmahon100
9370561579 All done without the extra regex 2015-08-01 16:10:21 +01:00
benmcmahon100
d52525f1f4 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
2547868854 fix storage and reset functionality for js and html challenge views 2015-07-31 13:37:06 -07:00
benmcmahon100
4b47e5282c 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
dd9984fc2d 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
972ae79b22 Ready JavaScript Curriculum 2015-07-31 00:22:56 +01:00
benmcmahon100
b9adf97a91 Ready JavaScript Curriculum 2015-07-30 23:46:47 +01:00
benmcmahon100
1e412b1498 Ready JavaScript Curriculum 2015-07-30 20:58:02 +01:00
Berkeley Martinez
fe51774814 Fix dup id's in basic javascript 2015-07-25 20:22:13 -07:00
Quincy Larson
37d5efed4e Merge branch 'staging' into js-curriculum 
Conflicts:
	seed/challenges/basic-javascript.json
 2015-07-24 16:08:45 -07:00
Quincy Larson
ea26455c4c 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
a24ef288b4 Ready Js Curriculum 
Added Regex, Random Numbers and If else Challenges
 2015-07-24 00:38:13 +01:00
Berkeley Martinez
01c72656c8 fix 'id' not _id. 
fix spacing after semi colon
 2015-07-23 16:14:45 -07:00
Quincy Larson
fe03ee557d restructure entire curriculum sequence and json files 2015-07-23 15:49:03 -07:00
benmcmahon100
003805d834 Added start of the random number challenges 2015-07-16 11:06:04 +01:00
benmcmahon100
7af3c1c67d 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
benmcmahon100
ffd0d7e905 almost complete js challenges 2015-07-13 00:48:58 +01:00
benmcmahon100
a39c398b8c Update to 30! 2015-07-10 17:22:58 +01:00
benmcmahon100
46066e5be1 Third commit to the new curriculum 2015-07-10 00:56:30 +01:00
benmcmahon100
27df132367 Update 2 of the new js curriculum! 
7 more challenges added!
 2015-07-09 00:26:16 +01:00
Quincy Larson
3098a6dc60 add basic javascript.json 2015-07-05 17:12:52 -07:00
Quincy Larson
655c7eef52 clear basic-javascript.json 2015-07-05 17:03:41 -07:00
Quincy Larson
c2a9a1ca62 add an ajax challenge 2015-07-02 17:31:08 -07:00
Quincy Larson
2b7177e856 add dashedName attributes to JSON 2015-06-14 00:55:27 -07:00
Quincy Larson
61486c2d7c 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
Quincy Larson
3654bb7e6f change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Quincy Larson
618cedddb0 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-04 12:24:30 -07:00
Berkeley Martinez
272d9b4ad5 Update seed directory to use loopback 2015-06-02 20:32:10 -07:00