Commit Graph

3735 Commits

Author SHA1 Message Date
terakilobyte
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
terakilobyte
1df3b2671b Stylize bonfires in account view 2015-05-05 15:36:56 -04:00
terakilobyte
1b393bb685 Closed #348. 2015-05-05 15:35:55 -04:00
Nathan
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
terakilobyte
d3aaa5a11e Ensure twit exists in package.json and remove unecessary console statement 2015-05-05 14:24:07 -04:00
terakilobyte
2dc1ee26d2 Merge branch 'aldraco-twitterZipline' into staging 2015-05-05 14:18:34 -04:00
terakilobyte
82a1680943 Resolve merge conflicts 2015-05-05 14:18:28 -04:00
Quincy Larson
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
terakilobyte
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
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
Victor Påhlsson
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
terakilobyte
077a97c941 Remove new-relic 2015-05-04 17:42:59 -04: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
8480fe57fc Update README.md 2015-05-04 14:03:42 -07:00
terakilobyte
87c6f324a8 Update .gitignore file 2015-05-04 17:03:05 -04:00
Quincy Larson
f53b8fafcb Merge pull request #413 from terakilobyte/news-mailer-fix
News mailer fix
2015-05-04 13:53:03 -07:00
Nathan
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
Quincy Larson
714ff14ea8 fix typo in field guide 2015-05-03 22:43:23 -07:00
terakilobyte
749ff0cc74 Fix mailer to point to new news route instead of stories 2015-05-03 20:41:35 -04:00
Quincy Larson
289a757401 fix moment and update .gitignore 2015-05-03 16:55:25 -07:00
Quincy Larson
ca1121b721 remove Saturday Summit announcement modal 2015-05-03 16:49:05 -07: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
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