Commit Graph

2854 Commits (c7c11cf7f6bb78639e7ad41781ad29add4a027fd)

Author SHA1 Message Date
Quincy Larson c7c11cf7f6 get closer to all bower static assets 2015-05-03 01:37:22 -07:00
Quincy Larson 451e3c75f2 improvements to portfolios and heatmaps 2015-05-03 00:34:46 -07:00
Quincy Larson 6d015212e4 add tips to all bonfire views 2015-05-02 18:56:42 -07:00
Quincy Larson 04ed00f4b7 fix #412 2015-05-02 18:55:27 -07:00
Quincy Larson ca189c5d71 remove Saturday Summit announcement modal 2015-05-02 18:52:15 -07:00
Quincy Larson b269ca08a0 fix mobile news-nav 2015-05-02 17:08:07 -07:00
Quincy Larson d65f66e03f fix mobile camper news headlines 2015-05-02 17:06:31 -07:00
Quincy Larson ef48efe8a8 improve sitemap 2015-05-02 16:50:59 -07:00
Quincy Larson 80d8fe7e81 add some alt tags to landing page 2015-05-02 16:11:37 -07:00
Quincy Larson 7cbcf46377 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
Conflicts:
	app.js
	views/challengeMap/show.jade
2015-05-01 23:12:56 -07:00
Quincy Larson 0f0adac85c stylize search results 2015-05-01 23:05:37 -07:00
Quincy Larson f376460755 fix show all nonprofits route 2015-05-01 22:22:10 -07:00
Quincy Larson e1d577b035 fix show all nonprofits route 2015-05-01 22:21:53 -07:00
Quincy Larson d492afb4f5 Merge branch 'mobile-news'
Conflicts:
	views/challengeMap/show.jade
2015-05-01 21:54:10 -07:00
terakilobyte 1d7f74a0f6 Reset head 2015-05-02 00:46:10 -04:00
terakilobyte d07bd24a5e Merge branch 'QuincyLarson-mobile-news' into staging 2015-05-02 00:41:42 -04:00
terakilobyte cbdba845df Resolve merge conflicts 2015-05-02 00:41:38 -04:00
Quincy Larson f3c99d90a7 Merge pull request #406 from QuincyLarson/auth
potentially fix the too many redirects issue
2015-05-01 21:32:57 -07:00
Quincy Larson ec5c542d07 potentially fix the too many redirects issue 2015-05-01 21:32:24 -07:00
terakilobyte 4729ef31b4 Get rid of duplicate field guide for mac keyboard shortcuts 2015-05-01 17:17:12 -04:00
terakilobyte 1fc3595145 Fix twitter link in bonfire/show 2015-05-01 16:56:09 -04:00
terakilobyte 1347a8ba30 Use forcedomain express middleware 2015-05-01 16:34:07 -04:00
terakilobyte a9b2e546de Fix twitter link on bonfire 2015-05-01 16:33:49 -04:00
terakilobyte 665e43d85e Merge remote-tracking branch 'upstream/staging' into staging 2015-05-01 16:26:51 -04:00
Quincy Larson c907b2abc5 Merge pull request #405 from QuincyLarson/master
make / path redirect to landing in case of old account issue
2015-05-01 10:20:38 -07:00
Quincy Larson 18d9f06c14 make / path redirect to landing in case of old account issue 2015-05-01 10:18:24 -07:00
terakilobyte 322fce8c3e Merge remote-tracking branch 'upstream/staging' into staging 2015-05-01 07:52:50 -04:00
Quincy Larson 6c9a039a01 Merge pull request #403 from QuincyLarson/master
Unsubscribe mechanism for email campaigns
2015-05-01 00:10:05 -07:00
Quincy Larson d8b5028619 update announcement modal 2015-05-01 00:07:34 -07:00
Quincy Larson f17d8abf01 revert logo to free code camp logo 2015-05-01 00:05:32 -07:00
Quincy Larson 1ec3ef7433 remove errant console.log 2015-04-30 23:42:46 -07:00
Quincy Larson 19456f2e23 add unsubscribe path 2015-04-30 23:41:40 -07:00
Quincy Larson fb3a116fff Merge branch 'master' into mobile-news
Conflicts:
	controllers/story.js
	seed_data/field-guides.json
	views/coursewares/showVideo.jade
2015-04-30 19:10:10 -07:00
Quincy Larson d6da385b92 remove some whitespace 2015-04-30 19:03:55 -07:00
Quincy Larson fefd7e19f5 update the sitemap to new news path 2015-04-30 17:22:14 -07:00
Quincy Larson 222f9b9a64 fix some of the news functionality 2015-04-30 17:18:08 -07:00
Quincy Larson 2cb02176a4 more camper news improvements 2015-04-30 15:56:14 -07:00
Quincy Larson 7b61e9daa2 More view beautification for mobile. 2015-04-30 15:19:38 -07:00
Quincy Larson cc13b325d6 fix some issues with @terakilobyte and beautify the camper news index view 2015-04-30 14:55:00 -07:00
Nathan 58981252cc Merge pull request #393 from Munsterberg/munsterberg-391
Fixed typo on nonprofit detail page
2015-04-30 16:13:40 -04:00
Quincy Larson 164411e2c4 fix spelling of pinterest 2015-04-30 08:53:48 -07:00
Quincy Larson 15efe19971 Merge pull request #395 from QuincyLarson/staging
update coursewares with videos
2015-04-29 22:35:46 -07:00
Quincy Larson c856658360 update coursewares with videos 2015-04-29 22:35:04 -07:00
Quincy Larson 026f210b6e fix the button hotkeys in the showZiplineOrBasejump view 2015-04-29 22:32:52 -07:00
Quincy Larson 0c1ba64a83 fix copy around git commits on basejumps 2015-04-29 22:13:03 -07:00
Quincy Larson 19a556af80 add videos to some challenges 2015-04-29 22:05:21 -07:00
terakilobyte 55afd8518c Add missing semi-colon 2015-04-29 20:55:47 -04:00
terakilobyte 1e21d5d7aa Fix some linting errors in app.js and highlight questionable code with todo comments 2015-04-29 19:30:51 -04:00
Quincy Larson a201633e09 improvements and fixes for our field guide. Add 20 day announcement modal 2015-04-29 15:31:49 -07:00
Quincy Larson 22f8cc2b65 improvements to field guide 2015-04-29 12:30:53 -07:00