Commit Graph

1982 Commits (c487ddf18e4c2e9a47af0566423b652561d8f85e)

Author SHA1 Message Date
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
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
Michael Q Larson 68df7b218e update URL on regex match if incomplete url 2015-01-30 17:27:24 -08:00
Michael Q Larson 027d1a61d4 improve size of landing icons 2015-01-30 14:01:54 -08:00
Michael Q Larson 3b8b195110 update the angular CDN and remove the optimizely cdn which was hanging. Improve angular notifications on email signup page 2015-01-30 13:43:41 -08:00
Michael Q Larson d8d117f52f Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-30 13:16:11 -08:00
Michael Q Larson 380a7ce8c9 add ng-cloak to our ng-show alert messages to prevent them from showing while the page is loading 2015-01-30 12:06:21 -08:00
Nathan 2f1e357502 Merge pull request #65 from FreeCodeCamp/profile-redirect
Michael Johnson asked for public profile redirection from navbar user image
2015-01-30 02:05:46 -05:00
Quincy Larson 07ca394ffe Merge pull request #64 from FreeCodeCamp/brndnb-screenhero-links
Update challenges.json with direct Screenhero download links
2015-01-29 23:02:45 -08:00
Branden Byers 0526375c5e Update challenges.json 2015-01-30 00:58:21 -06:00
Michael Q Larson e82b45e34c make the account page purely settings and make the photo redirect to the user public profile 2015-01-29 22:01:27 -08:00
Michael Q Larson d7d4727c0f first commit with working iframe pulling data from code editor 2015-01-29 17:01:50 -08:00
Michael Q Larson b49846a504 Add some clever new compliment messages 2015-01-29 16:10:49 -08:00
Michael Q Larson 0210c19309 add Kamal to counselors and update the about page to include our twitter feed instead of old embedded tweets. Also add @rybar\'s new landing icons 2015-01-29 11:38:07 -08:00
Nathan Leniz 29db5f8b94 Adding person challenge, need to inspect execution failure in testing. 2015-01-29 00:17:49 -05:00
Michael Q Larson 74acf75c0c left align font on bonfire challenges 2015-01-28 21:14:26 -08:00