Commit Graph

1255 Commits (2d981d833cf9ba190e60b8b01b9f6853faec7811)

Author SHA1 Message Date
Quincy Larson 48a9bcbb52 Merge branch 'master' into courseware 2015-05-13 13:37:54 -07:00
Quincy Larson 06a92202be hotfix to fix #440 2015-05-11 23:46:38 -07:00
Quincy Larson 4d0017a4d4 bower install jshint and build more coursewares 2015-05-11 23:40:04 -07:00
Quincy Larson d63b8f01be improve bonfires and js coursewares 2015-05-10 21:59:55 -07:00
Quincy Larson 1033d74ccb hotfixes for field guide 2015-05-09 23:40:28 -07:00
terakilobyte 66914b9b51 Fix layout issue with validation on account page 2015-05-09 19:46:07 -04:00
Quincy Larson f3646b0aae give points for upvoting, add facebook profile attribute, improve social profile icons 2015-05-09 16:23:45 -07:00
Quincy Larson 70503528d2 give user a point for submitting to news, remove broken javascript path, remove unnecessary empty js lib 2015-05-09 15:53:01 -07:00
Quincy Larson b5747c7712 add facebook groups challenge, field guide and footer link 2015-05-09 10:52:02 -07:00
terakilobyte 72339f9183 Set correct mime type in jailed. Set correct types on script imports in bonfire/show. Open helmet up to potentially unsafe levels by allowing "* unsafe-inline" in scriptSrc. 2015-05-06 14:06:10 -04:00
terakilobyte adaa3cdece Remove template path, load correct javascript in universal header 2015-05-06 09:10:15 -04:00
terakilobyte 7b42757c9f Tilde bug 2015-05-05 20:00:14 -04:00
terakilobyte 0c4e6e2762 Linkify the bonfire names in profile view. 2015-05-05 19:53:54 -04:00
Quincy Larson 52f7dcc96b Merge remote-tracking branch 'upstream/staging'
Conflicts:
	views/account/show.jade
2015-05-05 16:41:28 -07:00
Quincy Larson e52c0a1578 Make bonfire sample code wrap properly within responsive div 2015-05-05 16:24:16 -07:00
terakilobyte 1df3b2671b Stylize bonfires in account view 2015-05-05 15:36:56 -04:00
Nathan 770e298b65 Merge pull request #419 from QuincyLarson/point-fix
add campwide meeting and fix user show points
2015-05-05 12:48:32 -04:00
Quincy Larson 200fa53012 add campwide meeting and fix user show points 2015-05-05 09:22:38 -07:00
terakilobyte c170bef08c Hotfix fontawesome for site layout. Update package.json to lock to major version # 2015-05-04 17:37:29 -04:00
Quincy Larson 961096cf49 finish moving away from connectAssets 2015-05-03 16:45:34 -07:00
Quincy Larson 14b99b7b67 finish making cdns gracefully fallback to bower 2015-05-03 16:31:45 -07:00
Quincy Larson a0b7b0b653 heatmap looks better 2015-05-03 14:45:46 -07:00
Quincy Larson 8867fe42d7 get angular working in bower 2015-05-03 14:28:03 -07:00
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 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 d492afb4f5 Merge branch 'mobile-news'
Conflicts:
	views/challengeMap/show.jade
2015-05-01 21:54:10 -07: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 1fc3595145 Fix twitter link in bonfire/show 2015-05-01 16:56:09 -04:00
terakilobyte a9b2e546de Fix twitter link on bonfire 2015-05-01 16:33:49 -04:00
Quincy Larson 18d9f06c14 make / path redirect to landing in case of old account issue 2015-05-01 10:18:24 -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 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