Commit Graph

426 Commits (4a043e151e169173383d4b6ba2fdb53c7509b9f0)

Author SHA1 Message Date
Michael Q Larson 687eb6c477 add font-awesome 2015-03-07 00:09:04 -08:00
Michael Q Larson e049951b88 remove CDN call for bootstrap and font awesome and get them loading locally 2015-03-06 23:56:22 -08:00
Michael Q Larson 9df29350ed update the search UI 2015-03-05 17:30:05 -08:00
Nathan Leniz 41442a540f Need to work on story redirect after submission, fix url link in stories/show 2015-03-05 19:21:26 +09:00
Michael Q Larson 6a9bfc5ebf remove together.js and add a non-functioning submit form to the index view of news 2015-03-04 23:44:30 -08:00
Nathan Leniz 3fac5cb70e Improve comment view, re-enable upvoting for articles 2015-03-05 09:13:22 +09:00
Nathan Leniz ba97c984e7 Improve view for individual news story 2015-03-05 07:49:55 +09:00
Michael Q Larson d8b8373b70 do some refactoring of the camper news views 2015-03-03 19:55:04 -08:00
Michael Q Larson 260c25a482 some minor UI improvements on news 2015-03-03 14:35:35 -08:00
Nathan Leniz 4b84b49d07 Added start of individual post view and post lists view, wired upvoting functionality for individual posts 2015-03-03 22:03:33 +09:00
Michael Q Larson d962e3afe5 fix a line spacing issue 2015-02-27 14:00:47 -08:00
Michael Q Larson a524ffdde0 beautify learn-to-code 2015-02-26 14:38:22 -08:00
Michael Q Larson dfa15d8fc1 add menu text to the hamburger menu on mobile 2015-02-26 13:22:12 -08:00
Michael Q Larson 120cc113b9 current work on d3 2015-02-22 23:47:30 -08:00
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
Nathan Leniz 3f8c0c5c41 Change layout to grab ionicons css framework from local files 2015-02-02 20:53:48 -05: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
Michael Q Larson 044f89b8cc add footer 2015-01-17 14:16:29 -08:00
Michael Q Larson 08f4383f62 clean up whitespace on the landing page and add new camp counselors to about page 2015-01-15 22:25:04 -08:00
Michael Q Larson 2493f159dd minor improvements to landing page 2015-01-15 21:39:01 -08:00
Michael Q Larson a95da3307c update simplified landing page 2015-01-15 19:04:24 -08:00
Michael Q Larson 8d9c0c0605 improve landing page 2015-01-15 17:21:12 -08:00
Michael Q Larson 13faedc86e Add email functionality to done-with-first-100-hours page and refactor nonprofit link to be on same controller in same view folder 2015-01-14 13:28:20 -08:00
Michael Q Larson fc00ef3f29 restyle portfolio and make all portfolio paths off of root and hide angular form until loaded 2015-01-11 22:19:56 -08:00
Michael Q Larson 0ce9f103f0 improve look of profile page 2015-01-08 23:27:14 -08:00
Michael Q Larson 063f1f3bb2 finish initial public profiles 2015-01-08 22:31:15 -08:00
Michael Q Larson bfe75a180d improve the profile layout and start building the public profile view 2015-01-08 18:39:16 -08:00
Michael Q Larson b07ce48ce5 update ionic icons 2015-01-08 18:08:44 -08:00
Michael Q Larson 0ec2e0a759 finished validation on the form fields 2015-01-08 14:56:44 -08:00
Michael Q Larson f9337c57ea update profile edit view 2015-01-07 16:10:40 -08:00
terakilobyte 7e34ea340d More angular validation 2015-01-06 10:28:57 -05:00
terakilobyte 3490ff197d Finish proof of concept of angular forms, added validation 2015-01-06 02:27:08 -05:00
Michael Q Larson db9622a2e5 public profile accessible and start updating form 2015-01-05 16:38:56 -08:00
Michael Q Larson ba800ee54b Fix spacing between elements on landing page and interior - specificially alter the top padding on the body globally 2015-01-04 12:18:55 -08:00
Michael Q Larson d70bea506a update the navigation to have publicly available menu items 2014-12-30 20:26:12 -08:00
Michael Q Larson dc9296146e navbar is fully responsive and does not wrap 2014-12-30 13:15:22 -08:00
Michael Q Larson 4ede5662b9 got navbar button looking right 2014-12-30 12:38:45 -08:00
Michael Q Larson c8d2be67c7 navbar looks right and hamburger works 2014-12-30 11:40:37 -08:00
Michael Q Larson cb7ff19564 navbar looks right at full width 2014-12-30 10:45:19 -08:00
Michael Q Larson 049e2d0a8e start working on redoing navbar and mobile footer 2014-12-29 22:40:27 -08:00
Michael Q Larson d39804053c finished with profile page for now 2014-12-24 00:07:20 -08:00
Michael Q Larson fcd457b958 email validations work, now on to username validations 2014-12-23 18:20:53 -08:00
Michael Q Larson 46f217f548 update navigation to include links to chatroom and forum. 2014-12-21 15:43:07 -08:00
Michael Q Larson 860171d5a5 update meta files and make landing page look better with Retina 2014-12-20 22:15:50 -08:00
Michael Q Larson fd0250884b fix landing page images 2014-12-18 00:45:31 -08:00
Michael Q Larson a7dc7d4c5a minor improvements to hamburger 2014-12-17 23:59:28 -08:00
Michael Q Larson 22bfe0dec1 fix a console error related to trying to use font weight 500 2014-12-16 16:44:03 -08:00
Michael Q Larson 6aac48951e update the challenges.json with more comprehensive CS101 descriptions and add line breaks for long urls and add some additional tweets 2014-12-16 16:38:33 -08:00
Michael Q Larson 1d56a2572a tweaked challenges 2014-12-14 09:01:37 -08:00
Michael Q Larson c7a5a51c8d Merge branch 'timestamp' into challenges
Conflicts:
	config/passport.js
	public/css/main.less
2014-12-13 21:09:11 -08:00
Michael Q Larson d38e31d065 update the chromebook raffle page 2014-12-11 23:07:33 -08:00
Michael Q Larson 5de070aca4 more changes recommended by Ryan 2014-12-11 17:59:01 -08:00
Michael Q Larson 5db002570d update colors per Rybar suggestions 2014-12-11 15:36:46 -08:00
Michael Q Larson b29ba117a3 increase size of advance buttons on challenge page 2014-12-10 22:26:09 -08:00
Michael Q Larson e174972cbb update font weight on landing page and buttons 2014-12-10 13:32:00 -08:00
Michael Q Larson d5fa19779b Revert "change font weight on landing page and buttons"
This reverts commit eba969af992288133fe898fbb26212474729273b.
2014-12-10 13:28:38 -08:00
Michael Q Larson 38715b9dfc change font weight on landing page and buttons 2014-12-10 13:11:16 -08:00
Michael Q Larson 6b7ca4fe70 update landing page with we are Free Code Camp content including masonry for twitter embeds 2014-12-09 22:30:18 -08:00
Michael Q Larson bedddde945 make the profile page look better 2014-12-05 23:10:02 -08:00
Michael Q Larson 8b9045195b add cta css 2014-12-04 15:55:37 -08:00
Michael Q Larson 73deffd707 improve landing page with Mark Howard 2014-11-30 19:05:06 -08:00
Michael Q Larson 21370b83a5 start adding omniauth functionality back in and debugging in production 2014-11-29 22:22:27 -08:00
Michael Q Larson ba0380bfd9 got app to actually run 2014-11-29 21:46:40 -08:00
Michael Q Larson 00c92176cb update the hackathon starter base app 2014-11-29 21:32:59 -08:00
Michael Q Larson 13a66962ca update chatroom challenge and mildly reshuffle challenges 2014-11-28 17:33:05 -08:00
Michael Q Larson 7de6ebe17f update colors 2014-11-24 10:02:35 -08:00
Michael Q Larson d8d2fe694d update h2 text on home page and possibly fix persistant challenge.js bug 2014-11-11 00:58:22 -08:00
Sahat Yalkabov 6bd807b6db renamed styles.less to main.less 2014-11-08 20:42:22 -08:00
Sahat Yalkabov 266c9ed3ee updated flatly theme to 3.3.0 plus css cleanup 2014-11-08 20:27:32 -08:00
Sahat Yalkabov 001484ab45 updated bootstrap-social 2014-11-08 20:05:45 -08:00
Sahat Yalkabov 13bd6baa09 updated bootstrap 3.3.0 2014-11-08 14:27:02 -08:00
Michael Q Larson d12014aa23 darken shade of links for better visibility 2014-11-08 13:08:47 -08:00
Michael Q Larson 3a27655e2c fixed fonts 2014-11-07 17:00:27 -08:00
Michael Q Larson 9fed29699f minor style improvements 2014-11-07 16:45:19 -08:00
Michael Q Larson d5397f5b43 everything looks better except the damn font 2014-11-07 15:43:10 -08:00
Michael Q Larson f6229ef94b make pages look better by putting them into panels 2014-11-07 14:46:17 -08:00
Michael Q Larson 9739f9b43d start work on color redesign 2014-11-07 13:47:39 -08:00
Michael Q Larson 09c89a904e start redesign with new logo 2014-11-07 13:25:08 -08:00
Michael Q Larson ce07e9d188 conditionally striking through 2014-11-06 23:20:20 -08:00
Michael Q Larson 5a2de8c47b start grooming the challenges 2014-11-02 12:24:37 -08:00
Michael Q Larson de29af1e8a update views and add routes to app.js 2014-11-02 09:07:40 -08:00
Michael Q Larson e39dc056f9 add footer to challenge panel 2014-11-01 18:37:20 -07:00
Michael Q Larson ff5f12cda8 update views and remove additional cruft 2014-11-01 18:07:59 -07:00
Sahat Yalkabov 656591f3c3 font-awesome 4.2.0 2014-10-27 19:40:07 -07:00
Michael Q Larson 029daa816f rename non-profit to nonprofit 2014-10-26 09:32:57 -07:00
Michael Q Larson 10ca4ebd01 style divs a little better 2014-10-25 10:27:09 -07:00
Michael Q Larson 121a9339e1 add lots of fun animations 2014-10-24 18:51:32 -07:00
Michael Q Larson 60c4e24495 create password cancellation confirmation page and minify animate.css 2014-10-24 16:41:09 -07:00
Michael Q Larson 64a792e831 fix style a little 2014-10-23 23:07:52 -07:00
Michael Q Larson e0c63eef31 update navbar height 2014-10-22 07:59:39 -07:00
Michael Q Larson ef874e2754 fix curriculum page 2014-10-22 07:42:37 -07:00
Michael Q Larson a3de81f88c responsive challenge videos 2014-10-21 21:36:47 -07:00
Michael Q Larson e05195e47a improve the style 2014-10-21 18:00:56 -07:00
Michael Q Larson fa76554a5b finish setting up layouts 2014-10-20 15:35:42 -07:00
Michael Q Larson eb2de28f6a update landing page 2014-10-18 14:53:32 -07:00
Michael Q Larson d9e68463be completely purge websockets 2014-10-17 19:23:53 -07:00
Michael Q Larson cd90333bca first attempt at expanding landing page 2014-10-16 13:17:03 -07:00
Michael Q Larson ac0ab1de37 start fixing chat 2014-10-16 09:07:06 -07:00
Michael Q Larson 2106cbdbf2 twitter username now persisted 2014-10-13 21:38:10 -07:00
Michael Q Larson 254740c065 socket io is connecting 2014-10-13 18:00:37 -07:00
Michael Q Larson ad929be410 able to write to the db 2014-10-13 16:01:52 -07:00
Michael Q Larson a5985cd73d start building out views 2014-10-13 14:14:51 -07:00