gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,209 Commits 9 Branches 0 Tags
f4fcb565f43c659f85692872b8009b5c00844571
Commit Graph

97 Commits

Author SHA1 Message Date
Michael Q Larson
f4fcb565f4 Merge branch 'master' into ux-improvements 
Conflicts:
	seed_data/coursewares.json
 2015-02-22 18:17:47 -08:00
Michael Q Larson
19e8795055 some minor ux improvements and use nice ghost-style buttons for more information and less information on challenges and bonfires 2015-02-22 17:32:30 -08:00
Nathan Leniz
90caed3369 More UX improvements 2015-02-22 16:46:55 +09:00
Michael Q Larson
85f6c6eb4d make both score and picture redirect to portfolio, make chat and forum links redirect universally regardless of completion of challenges, simplify accounts page 2015-02-19 16:33:08 -08:00
Michael Q Larson
749954542f refactor learn-to-code view to look more visual and have fewer components 2015-02-18 22:58:10 -08:00
Michael Q Larson
9dd1558f1c update the about page and make it the root 2015-02-15 23:59:03 -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
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
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
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
3abac70998 Absolute positioning of iphone frame and rendering view 2015-02-04 01:50:14 -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
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
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
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
Michael Q Larson
48e535b9c5 now have both full width layout and normal layout 2015-01-26 11:02:22 -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
fa5a1a8618 make test results look better 2015-01-25 10:35:41 -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
Nathan Leniz
3c3dc803c5 Show long/short form instructions based on user input 2015-01-24 20:49:59 -05: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
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
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
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
Nathan Leniz
bf1d8cd81a Improving bonfire layout to remove the need for scrolling and allow the input and output elements to grow dynamically with user input 2015-01-21 18:10:21 -05: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 Leniz
202805dc52 preparing for integration of testing 2015-01-20 20:35:25 -05:00
Nathan Leniz
15eb0c0ef0 Turn off css boxing for view debugging 2015-01-20 15:22:04 -05: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
4755bfcb56 Reset to working condition 2015-01-19 23:52:39 -05: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
Michael Q Larson
bae9e41b42 improve bonfire and start adding model and controller 2015-01-17 18:52:58 -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
Michael Q Larson
7727368f34 turned the challenges list into a modal 2015-01-17 14:41:30 -08:00