Commit Graph

50 Commits (16add147e4805ef868d424022cf8e2d889d52994)

Author SHA1 Message Date
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
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
Quincy Larson 1cc82ab469 restructure entire curriculum sequence and json files 2015-07-23 15:49:03 -07:00
benmcmahon100 a2bae52c65 Added start of the random number challenges 2015-07-16 11:06:04 +01:00
benmcmahon100 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
benmcmahon100 90f7e33f42 almost complete js challenges 2015-07-13 00:48:58 +01:00
benmcmahon100 4060d7fdc9 Update to 30! 2015-07-10 17:22:58 +01:00
benmcmahon100 35fff3ed57 Third commit to the new curriculum 2015-07-10 00:56:30 +01:00
benmcmahon100 b117341e72 Update 2 of the new js curriculum!
7 more challenges added!
2015-07-09 00:26:16 +01:00
Quincy Larson aa6a96a4fd add basic javascript.json 2015-07-05 17:12:52 -07:00
Quincy Larson 7d2029780e clear basic-javascript.json 2015-07-05 17:03:41 -07:00
Quincy Larson 25c5bd769a add an ajax challenge 2015-07-02 17:31:08 -07:00
Quincy Larson 9589b6abeb add dashedName attributes to JSON 2015-06-14 00:55:27 -07:00
Quincy Larson 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
Quincy Larson 323ec3d587 change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Quincy Larson 67d35540cd Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-04 12:24:30 -07:00
Berkeley Martinez 9032880e27 Update seed directory to use loopback 2015-06-02 20:32:10 -07:00