Commit Graph

99 Commits

Author SHA1 Message Date
Quincy Larson
92db9e5aba fix the sitemap 2015-04-23 11:56:37 -07:00
Quincy Larson
be36f3dafd remove confusing modal 2015-04-23 07:57:14 -07:00
Michael Q Larson
820fbb99c7 finalize the way zipline and basejump challenges will look, fix twitch view 2015-04-17 15:01:08 -07:00
Michael Q Larson
d10011acc3 Pull some useful changes from aborted branch 2015-04-16 23:54:26 -07:00
terakilobyte
b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04:00
Michael Q Larson
62cabd56ff update camper news and chat challenges to have new videos and updated copy 2015-04-09 12:58:30 -07:00
Michael Q Larson
9fb048183c finish up adding the slack functionality with a redirect on the chat navbar button 2015-04-08 22:52:14 -07:00
Michael Q Larson
9145e959de able to use the api upon button click 2015-04-08 22:42:40 -07:00
Michael Q Larson
73b536de95 update sitemap 2015-04-08 15:05:24 -07:00
Michael Q Larson
bd7c5310b1 improve the footer 2015-04-07 00:11:31 -07:00
Michael Q Larson
840930d967 get bonfire solutions showing up in the view; eliminate a lot of old views in favor of new challenge map 2015-04-05 18:37:58 -07:00
Michael Q Larson
23a3e235a7 Update routes for all static pages and leave redirects for existing routes to get to new wiki routes 2015-03-30 15:15:07 -07:00
Michael Q Larson
660214f87e able to seed and view wiki content 2015-03-30 13:48:54 -07:00
Michael Q Larson
5bb084120e create a styleguide from @brndbr's sample style guide 2015-03-29 17:28:25 -07:00
Michael Q Larson
70f812dc78 Merge branch 'master' into ux-improvements
Conflicts:
	controllers/bonfire.js
	controllers/resources.js
	views/bonfire/show.jade
2015-03-29 13:05:39 -07:00
Michael Q Larson
ef27fda537 remove references to meeting from announcements and notification modal 2015-03-28 10:14:49 -07:00
Michael Q Larson
c69d919d46 Merge branch 'master' into ux-improvements 2015-03-27 10:28:31 -07:00
Michael Q Larson
683498e62a remove calls to trello and blogger, camp counselor photos, and update the notice about Saturday's meeting 2015-03-27 00:20:50 -07:00
Michael Q Larson
88e261ccf6 Merge branch 'master' into ux-improvements
Conflicts:
	controllers/resources.js
	controllers/user.js
	seed_data/challenges.json
	views/account/show.jade
	views/coursewares/showHTML.jade
	views/coursewares/showJS.jade
	views/partials/bonfires.jade
2015-03-21 16:25:39 -07:00
Michael Q Larson
2f240655a2 update announcements and move announcement modal back into learn-to-code view 2015-03-19 23:24:44 -07:00
Michael Q Larson
29a0701e71 update link to nodeschool challenges video 2015-03-19 23:09:50 -07:00
Michael Q Larson
56d7301d25 refactor announcement modal and add nodeschool-challenges 2015-03-19 22:34:36 -07:00
Michael Q Larson
76d0467758 update nonprofit project guide copy 2015-03-18 16:01:21 -07:00
Michael Q Larson
47507471ff update the stories view to have ghost discuss button and update chat instructions 2015-03-09 22:10:09 -07:00
Michael Q Larson
792d72c6b4 alias /news to /stories 2015-03-09 08:54:45 -07:00
Michael Q Larson
09e42df355 update sitemap 2015-03-09 07:18:31 -07:00
Michael Q Larson
3bd979ad08 Merge branch 'news' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-08 12:16:35 -07:00
Michael Q Larson
aacb0070b3 add the nonprofit projects guide view and change all our nonbreaking spaces to smaller, more natural looking spaces 2015-03-08 01:36:09 -08:00
Michael Q Larson
61435283d0 fix issue with chat page showing 304 in firefox 2015-03-07 01:37:41 -08:00
Michael Q Larson
1ee1ff4052 sitemap now works and can be deployed 2015-03-06 00:20:39 -08:00
Michael Q Larson
c8c396981a update sitemap 2015-03-06 00:13:58 -08:00
Nathan Leniz
33c302eaa6 Revert from tight-h3 class to prevent text overlapping when the text wrapped on devices with lower resolution 2015-02-27 18:17:42 +09:00
Michael Q Larson
a524ffdde0 beautify learn-to-code 2015-02-26 14:38:22 -08:00
Michael Q Larson
907415e13d add alt text to learn-to-code images 2015-02-26 12:44:32 -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
Michael Q Larson
67ff808734 Merge branch 'master' into ux-improvements
Conflicts:
	views/bonfire/show.jade
2015-02-22 15:26:22 -08:00
Michael Q Larson
bc2bf90d51 fix a bug in a view 2015-02-22 15:00:05 -08:00
Michael Q Larson
80485a9ad6 one in 100 page loads will show dinosaur in the free code camp graphic 2015-02-20 22:32:39 -08: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
884ff62bcc make the footer look better on desktop with more descript links and make the go to next challenge button the CTA button style and added the difficulty label to the flames in bonfire 2015-02-18 21:20:44 -08:00
Michael Q Larson
0d3ee3c2b4 add screen hero installation view 2015-02-17 14:10:15 -08:00
Michael Q Larson
449589827c add ajax for github calls 2015-02-17 13:31:59 -08:00
Michael Q Larson
44ea0039f6 fix a button link issue 2015-02-16 18:31:40 -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
9dd1558f1c update the about page and make it the root 2015-02-15 23:59:03 -08:00
Michael Q Larson
bafba0b16f make some copy changes reflecting our shift to coderbyte 2015-02-13 11:01:12 -08: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