Commit Graph

133 Commits (c7b1668dcd6518cf3152b8764217bb8df7382d4f)

Author SHA1 Message Date
Michael Q Larson a1c5d665e6 Merge branch 'courseware' of https://github.com/FreeCodeCamp/freecodecamp into courseware 2015-02-06 13:54:55 -08:00
Michael Q Larson 57db67aa82 update the courseware.json to treat challengeSeed as an array, and update schema and write logic to strinify this array 2015-02-06 12:11:22 -08:00
Nathan Leniz e2ab4438f5 Merge branch 'master' into courseware
Conflicts:
	controllers/bonfire.js
	controllers/resources.json
	views/bonfire/show.jade
2015-02-06 14:39:16 -05:00
Nathan Leniz dcb057a175 Fixing routing issue for unfound bonfires 2015-02-06 01:51:54 -05:00
Michael Q Larson 1c3bb66848 figure out a test for inline styles 2015-02-05 22:31:15 -08:00
Michael Q Larson 480a8493fc add a bunch of raw material to the coursewares 2015-02-05 21:59:21 -08:00
Nathan Leniz 3ef334ac6f New bonfire challenges added 2015-02-05 23:35:09 -05:00
Michael Q Larson 471bd575e2 more work on courseware 2015-02-05 16:51:25 -08:00
Michael Q Larson f35b1332da start creation of courseware challenges 2015-02-05 15:33:38 -08:00
Branden Byers fc3ae2a623 Fix typo in Bonfire Challenge
Challenge id:  a3566b1109230028080c9345
2015-02-05 16:22:42 -06:00
Michael Q Larson adfe5588d6 wire in points for courseware and bonfire 2015-02-04 19:39:57 -08:00
Nathan Leniz d47482fdcc Merge branch 'master' into courseware 2015-02-04 21:28:41 -05:00
Nathan Leniz 9246d7f663 Hooked courseware up to mongo correctly, persisting solutions and configured controller to correctly pass user to next course or return to first if all are completed 2015-02-04 21:28:10 -05:00
Nathan Leniz 161582f6c9 courseware testing implemented 2015-02-04 19:59:51 -05:00
Nathan Leniz 26ee23ddf9 Fix for fibonacci challenge, fix routing issue for bonfire lookup 2015-02-04 15:32:31 -05:00
Michael Q Larson f1000c3189 Merge branch 'master' into courseware
Conflicts:
	controllers/bonfire.js
	views/layout.jade
2015-02-02 23:32:46 -08:00
Quincy Larson f7e136e3d3 Merge pull request #70 from FreeCodeCamp/ga-bonfire
Ga bonfire
2015-02-02 23:04:54 -08:00
Nathan Leniz a558777382 Cleaning up angular, preparing to make new editor framework for coursewares 2015-02-02 20:39:05 -05:00
Michael Q Larson 9944f1b685 start adding new favicons and make the seed task run with each push to heroku 2015-02-02 15:27:12 -08:00
Michael Q Larson 0ee291878a remove term code campers from codebase - replace with camper. Move bulky function from app.js to bonfire.js 2015-02-01 22:39:59 -08:00
Michael Q Larson afab456ad9 start adding Courseware controllers, routes etc. 2015-02-01 14:22:34 -08:00
Branden Byers 0526375c5e Update challenges.json 2015-01-30 00:58:21 -06:00
Nathan Leniz 29db5f8b94 Adding person challenge, need to inspect execution failure in testing. 2015-01-29 00:17:49 -05:00
Nathan Leniz b7ed227116 Fix for largest of arrays 2015-01-28 21:53:47 -05:00
Nathan Leniz e163864829 Fix for challenge Title Case 2015-01-28 21:46:06 -05:00
Maxim Orlov 4604ede346 fix typo Title Case a Sentence 2015-01-29 00:23:04 +01:00
Nathan Leniz 40d52a5a3b BONFIRE READY TO SHIP 2015-01-28 00:59:30 -05:00
Nathan Leniz 2e5dd6ea73 Strange user behavior, model not updating correctly 2015-01-26 18:28:14 -05:00
Nathan Leniz ead9fe56d1 Fixed bonfire to allow users to enter contractions 2015-01-26 12:30:04 -05:00
Michael Q Larson c20aa1697c generator now publishes directly to a view where you can interact with your new bonfire 2015-01-25 23:10:05 -08:00
Michael Q Larson 3f6ee44248 add the first new bonfire and resequence bonfire form slightly 2015-01-25 21:16:44 -08:00
Nathan Leniz 26c041826b Fixed bonfire to not overwrite user entry point but still allow user error by not defining entry point, create web form to give challenge json back, improved layout of bonfire even more 2015-01-25 23:56:04 -05:00
Michael Q Larson 0e63521ee0 refactor verbs, compliments and phrases into resources controller and require them where necessary. Create tutorial bonfire. Clean up existing bonfires. Fix minor ui issues. 2015-01-24 23:03:25 -08:00
Nathan Leniz 6b4475a5b8 Major refactor of bonfireFramework to differentiate tests, refactor tests in Bonfire schema to remove public/private tests and only have tests, fire modal on successful run of all tests in bonfire/show, added bonfiresHash to User schema, and we should have committed a while ago because there is too much too list 2015-01-24 00:44:08 -05:00
Nathan Leniz bc1f01f67b More bonfire improvements, restoring functionality to original bonfire module after growing it to accept the challenge framework 2015-01-22 22:47:15 -05:00
Nathan Leniz e9f24347b4 Improving seeding function to also seed bonfires 2015-01-22 19:04:16 -05:00
Nathan Leniz e0311210e0 Improving bonfire flow, working on seed.js 2015-01-22 18:44:25 -05:00
Nathan Leniz 0e9523ab72 More steps towards integrating the bonfire challenge framework. Importing challnge seed, public tests, private tests, entry point and entry point negator 2015-01-22 15:49:16 -05:00
Nathan Leniz 378277f0e1 More steps towards building the bonfire challenge interface 2015-01-22 13:20:46 -05:00
Nathan Leniz 094b937148 Incremental steps towards building the bonfire challenge views 2015-01-22 11:59:55 -05:00
Nathan Leniz 74291d2299 More bonfire improvements. Removed redundant console statements, improved test scraping, comment scraping included, better reset behavior 2015-01-21 23:54:59 -05:00
Nathan Leniz 6ea5f5c895 Preparing for bonfire challenges, create Bonfire model, BonfireCompletion model, update bonfire controller, create initial bonfire seed data 2015-01-21 21:32:13 -05:00
Michael Johnson ac3b01dd8b Update challenges.json
Fixing typo in reference to issue https://github.com/FreeCodeCamp/freecodecamp/issues/25
2015-01-14 11:54:34 -05:00
Michael Q Larson 406ebf58c2 update challenge.json to reflect removal of sql 2015-01-06 23:14:08 -08:00
Michael Q Larson f5d00c5ea9 minor change to attribution on the GA Dash tutorial 2015-01-06 16:03:28 -08:00
Michael Q Larson 9350fff6d5 minor fix to challenges and jquery-exercises answer 2015-01-06 12:01:52 -08:00
Michael Q Larson dc66d86d3b add additional note about navigation links to two of the challenges 2015-01-01 23:46:07 -08:00
Michael Q Larson 62e07db09a fix a typo in the challenges, add a note about the navigation links to the chat room and forchallenges, and revert the jumbotrons to falling after the navbar instead of being tucked under it - @rybar recommended this but it really bugs me. We can discuss further later 2015-01-01 23:45:39 -08:00
Michael Q Larson 1aa503e646 add a link to our new help chatroom and add a missing video 2014-12-31 14:17:51 -08:00
Michael Q Larson f683982575 fix teamviewer link in challenges 2014-12-30 23:34:25 -08:00
Michael Q Larson 1dda38eaaa Update challenges to remove SQL challenges. Make minor improvements to challenges.son 2014-12-30 22:02:19 -08:00
Michael Q Larson 0276771bc3 add omitted link to challenges.json 2014-12-26 21:50:03 -08:00
Michael Q Larson b4be1f859f minor random post-merge fixes 2014-12-23 13:30:20 -08:00
Michael Q Larson ef2eba7b14 Merge branch 'master' into refactor
Conflicts:
	app.js
	controllers/api.js
	controllers/challenges.js
	gulpfile.js
2014-12-23 12:34:09 -08:00
Michael Q Larson a032be6a0b fix finished challenges button 2014-12-23 11:20:31 -08:00
Berkeley Martinez 86fcfe8296 Major refactor. Add error handlers everywhere. 2014-12-23 08:48:28 -08:00
Michael Q Larson ca6652a791 refactor views to remove hardcoded challenge data 2014-12-23 08:22:50 -08:00
Michael Q Larson c06b8683c9 remove github auth again until I can figure out the issue 2014-12-22 10:22:04 -08:00
Michael Q Larson cead8d3d81 update the seed task to delete existing challenges first 2014-12-17 14:22:23 -08:00
Michael Q Larson 6aac48951e update the challenges.json with more comprehensive CS101 descriptions and add line breaks for long urls and add some additional tweets 2014-12-16 16:38:33 -08:00
Michael Q Larson 0fb55fd9ff update challenges.json 2014-12-16 12:38:27 -08:00
Michael Q Larson e8d8b90461 update challenges 2014-12-16 09:55:52 -08:00
Michael Q Larson 1d485f1b33 update challenge copy 2014-12-16 09:06:20 -08:00
Michael Q Larson c8944884f1 make some changes to copy 2014-12-15 22:11:13 -08:00
Michael Q Larson 91c829ac19 revise to have both screen hero and team viewer pair programming sections 2014-12-15 21:10:13 -08:00
Michael Q Larson ab1845cd03 update challenge.json 2014-12-15 20:14:31 -08:00
Michael Q Larson 80582b70bd make more updates to challenges and view 2014-12-15 14:17:20 -08:00
Michael Q Larson 782218f020 update partials and data 2014-12-14 22:01:57 -08:00
Michael Q Larson 1d56a2572a tweaked challenges 2014-12-14 09:01:37 -08:00
Michael Q Larson 675b0ebd47 continue work on challenges 2014-12-13 21:07:33 -08:00
Michael Q Larson a73e0f0027 add angular challenges and standin video 2014-12-13 14:23:13 -08:00
Michael Q Larson 3bfc37c127 make significant progress on documentation for new challenges 2014-12-12 13:17:28 -08:00
Michael Q Larson de0d77d4e8 continue work on challenges 2014-12-11 20:44:21 -08:00
Michael Q Larson a7658d68b0 start working on challenge notes 2014-12-11 17:50:53 -08:00
Michael Q Larson 1a4ee74e8f page loads now 2014-11-06 15:26:38 -08:00
Michael Q Larson d21e83eced start making challenge seed data 2014-11-06 13:06:19 -08:00
Michael Q Larson fa76554a5b finish setting up layouts 2014-10-20 15:35:42 -07:00
Michael Q Larson 972c52ca47 add named routes to courses 2014-10-20 13:28:23 -07:00
Michael Q Larson 8f3c7b44c5 start creating partials and views 2014-10-20 12:37:48 -07:00
Michael Q Larson ac0ab1de37 start fixing chat 2014-10-16 09:07:06 -07:00
Dominique Schuwey 468e1631f3 fix json syntax 2014-10-15 16:34:53 -04:00
Michael Q Larson 1bae5f439f start work on challenge model but getting an error; add all project euler challenges 2014-10-15 12:09:28 -07:00
Michael Q Larson a5985cd73d start building out views 2014-10-13 14:14:51 -07:00