Commit Graph

269 Commits

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