Commit Graph

430 Commits (f0fff1e1b92d7ca7594aebf201fd38bbc6838251)

Author SHA1 Message Date
Nathan Leniz a0427b3e18 Fix for bonfire to allow people to prototype objects properly but lose default insertion point injection (i.e. they will get an error if they forget to call their function 2015-02-13 12:14:12 -05:00
Jason Rueckert 54b5870fc9 Merge pull request #91 from phlacin/automaticDating-livepair
Added Moment.js library and time logic to next Live session
2015-02-12 20:44:27 -08:00
phlacin 2d447f0bb0 added automatic time logic to live-pair-programming page 2015-02-12 20:31:11 -08:00
Michael Q Larson f8f0c3454a subtle completed challenge button for courseware and add completionMessage to coursewares 2015-02-12 16:48:35 -08:00
phlacin 6455d80a6e Added Moment.js library and added logic to the time for the next Live session. 2015-02-11 23:08:10 -08:00
Michael Q Larson a1507a969b Add should and assert to coursewares and write code to test multiple instances of an element for a condition 2015-02-10 22:22:40 -08:00
Michael Q Larson 5f4fe74b16 attempt to make footer more accessible 2015-02-10 16:26:59 -08:00
Michael Q Larson c07a75e4ba add several more coursewares 2015-02-10 12:46:34 -08:00
Nathan Leniz 4fa6c9c65d iFrame cleanup for courseware to get rid of domain error, rename both framework files to force browser fetches to most recent code 2015-02-08 01:12:40 -05:00
Michael Q Larson 180699adb2 Wiring up analytics for courseware, unifying analytics between coursewares and bonfires, general housekeeping tasks for live push 2015-02-07 21:11:26 -08:00
Michael Q Larson 07c5757538 Code cleanup 2015-02-07 20:43:39 -08:00
Michael Q Larson 4f9474bc3a Add hotkey to go to next challenge/bonfire from completion modal, keep editor in focus on exiting completion modal, allow for courseware to theoretically work in production and development. 2015-02-06 16:55:48 -08:00
Michael Q Larson 319b537e5b add a hotkey for advancing to the next challenge 2015-02-06 15:18:02 -08:00
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 f627c156fc Tab now inserts two spaces, the path "coursewares/" is no longer broken 2015-02-06 12:36:55 -05:00
Michael Q Larson 98286e19d1 fix formatting of modals and make them less likely to accidentally wrap the compliment text 2015-02-04 19:00:40 -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 70d704d975 Correctly display modal on challenge completion 2015-02-04 20:41:02 -05:00
Nathan Leniz 161582f6c9 courseware testing implemented 2015-02-04 19:59:51 -05:00
Michael Q Larson 0d854de438 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-04 16:43:11 -08:00
Michael Q Larson f2ad94d7c6 add h1 text to bonfire, challenge and account views 2015-02-04 13:04:51 -08:00
Nathan Leniz c487ddf18e Cleaning up bonfire.js 2015-02-04 14:59:45 -05:00
Nathan Leniz e55a85a18c Media queries everywhere to size iframe correctly 2015-02-04 02:29:38 -05:00
Nathan Leniz d5231fc43f Add default padding to iframe iphone view 2015-02-04 01:57:00 -05:00
Nathan Leniz 3abac70998 Absolute positioning of iphone frame and rendering view 2015-02-04 01:50:14 -05:00
Nathan Leniz 5241ed5de6 Adding in missing file to reduce 404 log clutter 2015-02-04 01:05:57 -05:00
Nathan Leniz c1b995b465 Bonfire Analytics 2015-02-03 18:37:56 -05:00
Michael Q Larson 5ce1eb18db get cdns working in courseware 2015-02-02 23:47:47 -08: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
Nathan Leniz 6c48e1170e Coursewares framework for codemirror, not working 2015-02-03 02:17:36 -05:00
Quincy Larson f7e136e3d3 Merge pull request #70 from FreeCodeCamp/ga-bonfire
Ga bonfire
2015-02-02 23:04:54 -08:00
Nathan Leniz 040d687f20 Removing duplicate analytics call 2015-02-03 01:59:19 -05:00
Nathan Leniz c3926423af Adding analytics to bonfire 2015-02-03 01:57:35 -05:00
Nathan Leniz 3f8c0c5c41 Change layout to grab ionicons css framework from local files 2015-02-02 20:53:48 -05: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 36bcc5fea7 update the favicons and add recommended items to public folder 2015-02-02 16:23:24 -08: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 afab456ad9 start adding Courseware controllers, routes etc. 2015-02-01 14:22:34 -08:00
Michael Q Larson e7da57401e fix the icons after an accidental breaking change on completion modals 2015-01-30 17:42:17 -08:00
Michael Q Larson 027d1a61d4 improve size of landing icons 2015-01-30 14:01:54 -08:00
Michael Q Larson 0739934c50 make path relative 2015-01-28 14:48:18 -08:00
Quincy Larson de94719e67 Merge pull request #55 from FreeCodeCamp/race-conditions
Ensure order of post/save/fetch operation in bonfire completions.
2015-01-28 14:44:31 -08:00
Nathan Leniz d443f92f33 Prevent success from showing if no tests or other errors are encountered 2015-01-28 17:32:21 -05:00
Nathan Leniz 9fa0323049 Sequence request for new bonfire to wait until save operation, making bonfire fetch unsolved bonfires at a much faster rate to ensure data sync 2015-01-28 17:17:45 -05:00
Michael Q Larson fa357a401f Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-27 23:23:50 -08:00
Nathan Leniz 7ea08f3074 Add callback to and settimeout functions to prevent race conditions with write 2015-01-28 02:22:12 -05:00
Michael Q Larson e9efc039ec Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
Conflicts:
	views/resources/live-pair-programming.jade
2015-01-27 22:23:58 -08:00