Commit Graph

2246 Commits (6fc72de232c0e9238dff32c308f2dfbcd1bc8d28)

Author SHA1 Message Date
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 829ace0365 fix a strange edge case on public portfolio pages 2015-02-04 16:42:54 -08:00
Michael Q Larson 1f36c26264 minor changes to landing page 2015-02-04 16:11:48 -08:00
Michael Q Larson 62abc4b3ee update nonprofit project text and add footer back into landing page 2015-02-04 15:26:13 -08:00
Michael Q Larson f2ad94d7c6 add h1 text to bonfire, challenge and account views 2015-02-04 13:04:51 -08:00
Michael Q Larson 62bd350a29 expand landing page copy and update the faq parital 2015-02-04 12:52:19 -08:00
Nathan Leniz 26ee23ddf9 Fix for fibonacci challenge, fix routing issue for bonfire lookup 2015-02-04 15:32:31 -05: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 9193ba04e0 Fix pathing bug for users who are not logged in and type /bonfires/ 2015-02-04 00:41:25 -05:00
Quincy Larson 65700f549d Merge pull request #73 from FreeCodeCamp/ga-bonfire
Bonfire Analytics
2015-02-03 15:40:18 -08: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
Michael Q Larson 6464241b2e fix a bug that was preventing html from rendering in courseware 2015-02-02 23:31:43 -08:00
Nathan Leniz 6c48e1170e Coursewares framework for codemirror, not working 2015-02-03 02:17:36 -05:00
Michael Q Larson dda901872e Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-02 23:05:04 -08:00
Quincy Larson f7e136e3d3 Merge pull request #70 from FreeCodeCamp/ga-bonfire
Ga bonfire
2015-02-02 23:04:54 -08:00
Michael Q Larson 78e473b4d2 another minor change to compliments 2015-02-02 23:03:50 -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 e1a08d433c Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-02-03 01:00:24 -05:00
Nathan Leniz 43234825cf Removing needless CDN call, optimizing account view for slow page loads 2015-02-03 01:00:12 -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 f059bc33d8 add courseware controller and routes 2015-02-01 23:35:27 -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 6ece608f01 update compliments 2015-02-01 22:00:19 -08:00
Michael Q Larson afab456ad9 start adding Courseware controllers, routes etc. 2015-02-01 14:22:34 -08:00
Michael Q Larson c85c2689e6 add Patrick Ly to our team 2015-02-01 10:25:04 -08:00
Nathan 44933401aa Merge pull request #69 from FreeCodeCamp/edit-profile-button
edit profile button if logged in and looking at own profile, and update ...
2015-01-31 17:35:02 -08:00
Nathan 186c090a20 Merge pull request #66 from FreeCodeCamp/update-url
update bonfire URL on regex match if incomplete url
2015-01-31 17:34:52 -08:00
Michael Q Larson 258515014a edit profile button if logged in and looking at own profile, and update a CDN 2015-01-31 17:32:43 -08:00
Nathan 81ce81c3a8 Merge pull request #68 from FreeCodeCamp/angular-images
Angular images
2015-01-31 17:31:35 -08:00
Michael Q Larson 4c8c346a77 Revert "first commit with working iframe pulling data from code editor"
This reverts commit d7d4727c0f.
2015-01-31 16:56:23 -08:00
Michael Q Larson 0a49890517 Merge branch 'master' into angular-images
Conflicts:
	controllers/user.js
	views/account/account.jade
2015-01-31 16:44:56 -08:00
Michael Q Larson d26a4efea4 improve angular validation on images and trim input so trailing whitespace is ignored on save 2015-01-31 16:41:33 -08:00
Michael Q Larson 613f332bb8 add back in twitch chat that was somehow dropped from view (probably my fault) 2015-01-31 00:12:09 -08:00
Michael Q Larson 4d49875b8e Revert "start process of updating youtube videos on live-pair-programming"
This reverts commit 7b0b12d348.
2015-01-31 00:07:05 -08:00
Michael Q Larson a660e832b8 add welcome mailer for email signups and fix an issue with the angular validations 2015-01-31 00:04:35 -08:00
Michael Q Larson 7b0b12d348 start process of updating youtube videos on live-pair-programming 2015-01-30 23:59:21 -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