Commit Graph

480 Commits

Author SHA1 Message Date
Michael Q Larson
1742be2efa Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-16 17:56:13 -08:00
Michael Q Larson
03f8ddf6c0 slight changes to announcements and remove errant debug statement. 2015-02-16 17:56:01 -08:00
Michael Q Larson
d279ac6d1b add announcements and make the github api calls more robust 2015-02-16 17:48:42 -08:00
Michael Q Larson
762ee8aa26 fix about view to render data from github 2015-02-16 01:21:40 -08:00
Michael Q Larson
9dd1558f1c update the about page and make it the root 2015-02-15 23:59:03 -08:00
Nathan Leniz
d0c2f6ccca Fixing up more bonfires 2015-02-16 00:03:35 -05:00
Nathan Leniz
3d7c7cf6b3 Remove debug statements from the server 2015-02-14 22:42:10 -05:00
Nathan Leniz
68ad6f9831 Added in debug statements to diagnose problem in production 2015-02-14 21:55:24 -05:00
Nathan Leniz
d66f6bebf5 Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-02-14 21:49:04 -05:00
Nathan Leniz
4f6a6bd8f0 Clean up username validation in bonfires and remove red border from input field if user deletes all input 2015-02-14 21:48:48 -05:00
Michael Q Larson
a22e472fb2 update the showVideo view 2015-02-13 18:40:39 -08:00
Nathan Leniz
b5c0ad9942 Building out new challenge framework to allow controller to determine view type for challenge 2015-02-13 20:55:49 -05:00
Michael Q Larson
bafba0b16f make some copy changes reflecting our shift to coderbyte 2015-02-13 11:01:12 -08:00
Michael Q Larson
43da6d16ff fix trello integration and make minor changes to courseware.json 2015-02-12 22:59:06 -08:00
Nathan Leniz
d8baf3d588 Fix so routing handles /coursewares and /coursewares/ 2015-02-09 14:29:03 -05:00
Michael Q Larson
b32d0219af remove errant comma 2015-02-09 07:57:53 -08:00
Michael Q Larson
b84c514c29 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-08 23:46:23 -08:00
Michael Q Larson
b71453f4e2 update the first 13 courseware challenges and remove some silly compliments 2015-02-08 23:46:08 -08:00
Nathan Leniz
0689793ef8 Remove debug statement 2015-02-08 14:25:26 -05:00
Nathan Leniz
9808db4f30 Fixing undefined challengeName on info pages 2015-02-08 14:24:42 -05:00
Nathan Leniz
f572e4cb77 Simple fix for requesting challenges over challenge 53 2015-02-08 12:39:00 -05:00
Nathan Leniz
2b0428fe51 Fix old redirect in courseware.js 2015-02-08 00:57:37 -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
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
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
0313fd9751 Fixed routing for unfound coursewares 2015-02-06 14:28:28 -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
Nathan Leniz
dcb057a175 Fixing routing issue for unfound bonfires 2015-02-06 01:51:54 -05:00
Michael Q Larson
2314ab91c2 remove comma from resources that was haphazardly left there 2015-02-05 14:02:02 -08:00
Michael Q Larson
bccc37f55d add more compliments and remove image validation from the profile image field 2015-02-05 13:56:44 -08:00
Nathan Leniz
5898de7ab9 Changes to courseware and bonfire controller to handle direction to next challenge if the user has completed all offerings, also show a flash message letting them know why they are being redirected 2015-02-04 23:27:57 -05:00
Michael Q Larson
adfe5588d6 wire in points for courseware and bonfire 2015-02-04 19:39:57 -08: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
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
Nathan Leniz
c487ddf18e Cleaning up bonfire.js 2015-02-04 14:59:45 -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
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
78e473b4d2 another minor change to compliments 2015-02-02 23:03:50 -08:00
Nathan Leniz
43234825cf Removing needless CDN call, optimizing account view for slow page loads 2015-02-03 01:00:12 -05: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
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
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