Commit Graph

301 Commits (aba76b4b3516a874af8e35a45ef614fdb9cf34ec)

Author SHA1 Message Date
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