greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,313 Commits
3 Branches
0 Tags
959 MiB
Commit Graph

979 Commits (2f54153b16985db993c0829cef57a91d9d2fbb5e)

Author SHA1 Message Date
Michael Q Larson a22e472fb2 update the showVideo view 2015-02-13 18:40:39 -08:00
Nathan Leniz efa4b2d9bc Factor all challenges button out of showvideo 2015-02-13 21:07:56 -05: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
Nathan Leniz 0eededde36 merge master into coderbye 2015-02-13 16:56:09 -05:00
Michael Q Larson bafba0b16f make some copy changes reflecting our shift to coderbyte 2015-02-13 11:01:12 -08:00
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
Nathan Leniz 995ca3d376 Refactor moment scripts to only be included in live-pair-programming view instead of being required in layout-wide 2015-02-13 00:24:57 -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
Michael Q Larson 23a0c33c81 add screen reader only copy 2015-02-11 22:31:57 -08:00
Michael Q Larson 5f4fe74b16 attempt to make footer more accessible 2015-02-10 16:26:59 -08:00
Michael Q Larson dd0c202024 Revert "move navbar below content to improve screen reading experience" 
This reverts commit b8ef6f3fb2.
 2015-02-10 15:24:14 -08:00
Michael Q Larson c07a75e4ba add several more coursewares 2015-02-10 12:46:34 -08:00
Michael Q Larson b8ef6f3fb2 move navbar below content to improve screen reading experience 2015-02-09 11:22:53 -08:00
Nathan Leniz 9808db4f30 Fixing undefined challengeName on info pages 2015-02-08 14:24:42 -05: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
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 6333f3fa7d Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-05 13:56:53 -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 51e8cd410e Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-02-05 10:02:24 -05:00
Nathan Leniz 995ba0b9ed Fixed accessibility issue whereby completion button for bonfires was set to be hidden to screenreaders 2015-02-05 10:01:55 -05:00
Nathan Leniz c22a38972b Cleaning up generator pages 2015-02-04 23:59:05 -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 7344a74c01 Configuring the modal 2015-02-04 21:35:20 -05: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 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 e55a85a18c Media queries everywhere to size iframe correctly 2015-02-04 02:29:38 -05:00
Nathan Leniz 3abac70998 Absolute positioning of iphone frame and rendering view 2015-02-04 01:50:14 -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
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
Quincy Larson f7e136e3d3 Merge pull request #70 from FreeCodeCamp/ga-bonfire 
Ga bonfire
 2015-02-02 23:04:54 -08: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
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 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
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
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 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
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 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
Michael Q Larson 74acf75c0c left align font on bonfire challenges 2015-01-28 21:14:26 -08:00
Michael Q Larson 2f59dd5e5b improve the tweet button functionality for both bonfire and challenges 2015-01-28 21:00:14 -08:00
Michael Q Larson 7aed4c152c Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-27 22:32:00 -08: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
Nathan Leniz 40d52a5a3b BONFIRE READY TO SHIP 2015-01-28 00:59:30 -05:00
Michael Q Larson 3b0c082b56 update live-pair-programming page 
;
 2015-01-27 17:17:21 -08:00
Nathan Leniz 3844542651 Refactor routing, minor display tweaks 2015-01-27 20:12:51 -05:00
Michael Q Larson 547b9757b1 set wide layout background to white 2015-01-27 15:05:51 -08:00
Nathan Leniz 504838083e Fixed display issue of difficulty iconography 2015-01-27 03:31:59 -05:00
Nathan Leniz 2e5dd6ea73 Strange user behavior, model not updating correctly 2015-01-26 18:28:14 -05:00
Michael Q Larson f8343d4c13 full layout now works. refactor files and routes to have more conventional names and redirects where necessary 2015-01-26 11:38:19 -08:00
Michael Q Larson 48e535b9c5 now have both full width layout and normal layout 2015-01-26 11:02:22 -08: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 413d89cf18 minor improvements to the navbar and layout in general 2015-01-25 14:05:56 -08:00
Nathan Leniz 00dfdb2e1e More layout improvements, adding in contextual icons for test success/failure and styling font of test output 2015-01-25 15:22:21 -05:00
Michael Q Larson 17312f43f5 moved components to correct sides of the view and cleaned up pair name entry 2015-01-25 09:41:07 -08:00
Michael Q Larson f593ebbbf2 start widescreen refactor 2015-01-25 09:06:30 -08: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
Michael Q Larson a2c2388e75 Merge branch 'bonfire' of https://github.com/FreeCodeCamp/freecodecamp into bonfire 2015-01-24 22:29:29 -08:00
Nathan Leniz 3c3dc803c5 Show long/short form instructions based on user input 2015-01-24 20:49:59 -05:00
Michael Q Larson 0ba1ecd30a add @freecodecamp to generated tweet messages 2015-01-24 15:40:11 -08:00
Nathan Leniz 7502dc0689 Allowing user to delete attempted username input from bonfire challenges completion modal 2015-01-24 18:33:00 -05:00
Michael Q Larson 65384b2913 add @ sign and autofocus to twitter form 2015-01-24 15:20:48 -08:00
Michael Q Larson 54c3305281 change bonfire path to playground and update links, and also add a should example test to playground 2015-01-24 14:42:34 -08:00
Michael Q Larson c4bd0e4dc3 make bonfire dynamically direct to best subsequent bonfire after completion 2015-01-24 14:29:50 -08:00
Michael Q Larson 1b75a6a7b8 only pad navbar rightmost element if not authenticated 2015-01-24 11:31:56 -08:00
Michael Q Larson e115e6da22 Merge branch 'master' into bonfire 2015-01-24 11:29:43 -08:00
Michael Q Larson 34f106387d Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-24 11:28:48 -08:00
Nathan Leniz 4128b3b765 Existing username check now working, error box showing and hiding properly, UI tweaks 2015-01-24 12:51:53 -05:00
Nathan Leniz 022b8daddc Adding in existing username checking, NOT WORKING AT THE MOMENT 2015-01-24 04:14:41 -05:00
Nathan Leniz a3cf6c3ee2 Persisting completion of bonfire challenges into User model, split routes for bonfires and challenges, refactored class selectors to be challenge type specific 2015-01-24 03:11:01 -05: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
Michael Q Larson d690f976f3 update the complete all the challenges flow and copy 2015-01-23 15:13:36 -08:00
Jason Rueckert 37daf55719 Remove extra spaces in word 2015-01-23 07:45:47 -08:00
Michael Q Larson 1f6cb10a32 fix a jquery exercise regression and make jquery exercises run in firefox 2015-01-23 00:30:34 -08:00
Free Code Camp ff05c9fbca Merge pull request #47 from FreeCodeCamp/bonfire-challenge-framework 
Bonfire challenge framework
 2015-01-23 00:11:37 -08:00
Michael Q Larson 1a9beef081 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 
Conflicts:
	views/resources/live-pair-programming.jade
 2015-01-22 16:53:49 -08:00
Michael Q Larson 95f5581d19 improve the live code view 2015-01-22 16:52:43 -08:00
Jason Rueckert 54470e6c46 added past events 2015-01-22 16:00:26 -08:00
Nathan Leniz e0311210e0 Improving bonfire flow, working on seed.js 2015-01-22 18:44:25 -05:00
Michael Q Larson 129000a986 minor refactor of jquery exercises. Still not working in firefox 2015-01-22 13:32:00 -08:00
Nathan Leniz 5881a14de3 Layout improvements to bonfire challenges view 2015-01-22 15:58:41 -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
Michael Q Larson 20cc2aa1b7 remove container from live-pair-programming view so more horizontal real-estate for twitch 2015-01-22 11:29:45 -08: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
Michael Q Larson 3810b4d9ae Merge branch 'master' into bonfire-improvement 
Conflicts:
	views/bonfire/bonfire.jade
 2015-01-21 15:42:08 -08:00
Michael Q Larson 6202c03d13 Merge branch 'bonfire-improvement' of https://github.com/FreeCodeCamp/freecodecamp into bonfire-improvement 
Conflicts:
	controllers/bonfire.js
 2015-01-21 15:37:14 -08:00
Michael Q Larson 93e15a6d1f get a better info footer icon 2015-01-21 15:36:07 -08:00
Michael Q Larson 9385b666e3 specify that we're using English in the layout file and state the npm and node version in package.json' 2015-01-21 14:29:16 -08:00
Michael Q Larson 14bd902eec Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-21 14:14:52 -08:00
Michael Q Larson e5a407eacd make Mark Howard's SEO changes, make navbar look better, hide footer on landing page, update meta tags' 2015-01-21 14:12:19 -08:00
Nathan e6930c58c4 Merge pull request #41 from iheartkode/master 
Added a title to bonfire for seo
 2015-01-21 10:22:46 -05:00
jmcshane 03d635c65f Test evaluation complete, need to hook pre-submit 2015-01-20 23:31:36 -05:00
Michael Q Larson da0180e7eb update twitch.tv link 2015-01-20 20:28:01 -08:00
Michael Q Larson 92a8107fcd add twitch to footer and update the live pair programming page 2015-01-20 20:05:23 -08:00
Michael Q Larson 9e3f5eadc6 update live code 2015-01-20 18:17:25 -08:00
Michael Q Larson 38de94138d update live-pair-programming 2015-01-20 18:14:35 -08:00
Nathan Leniz 7e46af3d42 Major refactor of Bonfire.jade to pull out all JS and put into framework.js, resizing font to 14px and setting to Ubuntu Mono, permanently change layout of bonfire.jade to 2 column responsive 2015-01-20 15:21:11 -05:00
Nathan Leniz bfb711166c further improvement of bonfire view 2015-01-20 03:10:24 -05:00
Nathan Leniz bb87cc4bb3 Pre View configurating 2015-01-20 02:19:39 -05:00
Nathan Leniz cc3fa8e5f7 Configurating Console.log 2015-01-20 00:36:14 -05:00
Michael Q Larson 88d353a3ca add new counselors and add legacy route for about path 2015-01-19 10:31:31 -08:00
Michael Q Larson 0dcce67763 Merge branch 'bonfire-improvement' of https://github.com/FreeCodeCamp/freecodecamp into bonfire-improvement 
Conflicts:
	public/css/main.less
 2015-01-18 16:13:23 -08:00
Nathan Leniz 53e5d06147 Improving bonfire and adding testing 2015-01-18 19:10:03 -05:00
Michael Q Larson f6603aadae work with @brndnb to improve usability of completion modals and write client-side jquery to prevent post if user isn't authenticated, which fixes a javascript error we were experiencing on serverside 2015-01-18 13:36:24 -08:00
iheartkode 1c6f95bdca Added a title to bonfire for seo 2015-01-18 08:30:44 -08:00
Michael Q Larson bae9e41b42 improve bonfire and start adding model and controller 2015-01-17 18:52:58 -08:00
Michael Q Larson 7722c20877 Merge branch 'twitter-auth' of https://github.com/FreeCodeCamp/freecodecamp into one-column-challenges 
Conflicts:
	app.js
 2015-01-17 17:46:12 -08:00
Michael Q Larson a9d52c82c0 improve footer and add navbar link to bonfire 2015-01-17 17:30:10 -08:00
Michael Q Larson be2e224f93 Merge branch 'footer' into one-column-challenges 
Conflicts:
	public/css/main.less
 2015-01-17 17:05:52 -08:00
Michael Q Larson c3a114c45a Simplify challenge view and make bolder modals. Remove duplicate bootstrap.js inclusion that was causing glitches. 2015-01-17 16:36:10 -08:00
Michael Q Larson 0c935623b7 Fix hamburger menu weirdness 2015-01-17 16:09:35 -08:00