Commit Graph

3001 Commits

Author SHA1 Message Date
77a15ed591 Remove unsafe inline, add blob: to trusted sources for compatibility with webkit 2015-05-06 18:14:00 -04:00
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
68420149b0 Revert "whitelist freecodecamp specifically in script src for helmet"
This reverts commit 3919919daf.
2015-05-06 12:49:59 -04:00
3919919daf whitelist freecodecamp specifically in script src for helmet 2015-05-06 09:24:27 -04:00
adaa3cdece Remove template path, load correct javascript in universal header 2015-05-06 09:10:15 -04:00
c61e3c8ed2 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-05-05 18:40:34 -07:00
c9e7b30867 fix privacy policy link and remove redundant field guide entry 2015-05-05 18:31:03 -07:00
ba78710c82 Go with calculating streaks with fresh data as cached mongo can"t be relied upon 2015-05-05 21:21:13 -04:00
517c37f633 More fixes to streak calculation 2015-05-05 21:13:46 -04:00
30c4085d21 Quick fix for longest streak logic 2015-05-05 20:03:27 -04:00
7b42757c9f Tilde bug 2015-05-05 20:00:14 -04:00
0c4e6e2762 Linkify the bonfire names in profile view. 2015-05-05 19:53:54 -04:00
9c938f7978 Merge pull request #423 from QuincyLarson/master
Bonfire display fix and new field-guide
2015-05-05 16:42:16 -07:00
52f7dcc96b Merge remote-tracking branch 'upstream/staging'
Conflicts:
	views/account/show.jade
2015-05-05 16:41:28 -07:00
e52c0a1578 Make bonfire sample code wrap properly within responsive div 2015-05-05 16:24:16 -07:00
f5a7195e42 add deploy a website without code field guide 2015-05-05 16:23:51 -07:00
b73c7eac62 Ensure all bonfires have names in account profile view. Add more aptly names state flag for future user data massaging. 2015-05-05 16:12:53 -04:00
1df3b2671b Stylize bonfires in account view 2015-05-05 15:36:56 -04:00
1b393bb685 Closed #348. 2015-05-05 15:35:55 -04:00
f204e48ce9 Merge pull request #416 from pahlsson/pahlsson-bonfire-args-optional-fix
Fix typo and add tests for bonfire Arguments Optional
2015-05-05 15:25:28 -04:00
d3aaa5a11e Ensure twit exists in package.json and remove unecessary console statement 2015-05-05 14:24:07 -04:00
2dc1ee26d2 Merge branch 'aldraco-twitterZipline' into staging 2015-05-05 14:18:34 -04:00
82a1680943 Resolve merge conflicts 2015-05-05 14:18:28 -04:00
1d5392e5c1 Merge pull request #420 from terakilobyte/staging
Delete newrelic.js file. Move static routes to bottom of express configu...
2015-05-05 10:17:15 -07:00
92b2d912d9 Delete newrelic.js file. Move static routes to bottom of express configuration as suggested in stackoverflow article. Closes #417 2015-05-05 13:14:07 -04:00
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
200fa53012 add campwide meeting and fix user show points 2015-05-05 09:22:38 -07:00
c305f1f5cd Fix typo and add tests for Arguments Optional
Add tests for the second argument and fix a typo.
2015-05-05 11:49:18 +02:00
077a97c941 Remove new-relic 2015-05-04 17:42:59 -04:00
c170bef08c Hotfix fontawesome for site layout. Update package.json to lock to major version # 2015-05-04 17:37:29 -04:00
8480fe57fc Update README.md 2015-05-04 14:03:42 -07:00
87c6f324a8 Update .gitignore file 2015-05-04 17:03:05 -04:00
f53b8fafcb Merge pull request #413 from terakilobyte/news-mailer-fix
News mailer fix
2015-05-04 13:53:03 -07:00
1c7e29c0b1 Merge pull request #414 from QuincyLarson/minor-fixes
Fix CDN and asset pipeline and other minor improvements
2015-05-04 16:52:27 -04:00
714ff14ea8 fix typo in field guide 2015-05-03 22:43:23 -07:00
749ff0cc74 Fix mailer to point to new news route instead of stories 2015-05-03 20:41:35 -04:00
289a757401 fix moment and update .gitignore 2015-05-03 16:55:25 -07:00
ca1121b721 remove Saturday Summit announcement modal 2015-05-03 16:49:05 -07:00
961096cf49 finish moving away from connectAssets 2015-05-03 16:45:34 -07:00
14b99b7b67 finish making cdns gracefully fallback to bower 2015-05-03 16:31:45 -07:00
a0b7b0b653 heatmap looks better 2015-05-03 14:45:46 -07:00
8867fe42d7 get angular working in bower 2015-05-03 14:28:03 -07:00
c7c11cf7f6 get closer to all bower static assets 2015-05-03 01:37:22 -07:00
451e3c75f2 improvements to portfolios and heatmaps 2015-05-03 00:34:46 -07:00
6d015212e4 add tips to all bonfire views 2015-05-02 18:56:42 -07:00
04ed00f4b7 fix #412 2015-05-02 18:55:27 -07:00
ca189c5d71 remove Saturday Summit announcement modal 2015-05-02 18:52:15 -07:00
b269ca08a0 fix mobile news-nav 2015-05-02 17:08:07 -07:00
d65f66e03f fix mobile camper news headlines 2015-05-02 17:06:31 -07:00
ef48efe8a8 improve sitemap 2015-05-02 16:50:59 -07:00