560e66527b
add jobs
2015-05-28 16:40:22 -07:00
6b9044febd
Add migration middleware to map route
2015-05-26 03:17:50 -04:00
95ab51986e
challenges are working when authenticated
2015-05-25 17:52:00 -07:00
5f169001f6
Change migration middleware to not rely on boolean flag in User model
2015-05-25 19:55:18 -04:00
0debdc5fd6
Use middleware to migrate users
2015-05-25 19:02:09 -04:00
3ee2c29324
more challenge-related view and copy improvements
2015-05-24 23:51:56 -07:00
1949005632
remove modal from field guide and create index view
2015-05-23 18:39:30 -07:00
a3ab32f339
improve get help and add find a pair
2015-05-23 00:53:41 -07:00
b626c811d0
Add initial I need help button and slack webhook integration
2015-05-23 02:26:29 -04:00
7279559c41
Merge branch 'staging' into nonprofit-improvements
...
Conflicts:
controllers/resources.js
seed_data/bonfires.json
views/partials/navbar.jade
2015-05-22 19:36:15 -07:00
b9adbd5976
add jobs page
2015-05-22 19:30:56 -07:00
5ed5d5cd63
Factor out more mentions of courseware and bonfire. Remove extraneous methos from resources.js. Refactor sitemap to use new structure.
2015-05-20 22:45:19 -04:00
5e918bdd7c
Remove bonfire and courseware controller, relying on all challenge related logic in challenge.js. Remove bonfire folder. Move necessary JS to coursewares folder and rename.
2015-05-20 22:31:20 -04:00
16ca72f716
Update views for new variable names. Get profile view working. Update challenge map.
2015-05-20 21:50:31 -04:00
a174a1c630
Work on challenge flow from block to block, start refactoring the name courseware to challenges in main.js
2015-05-19 22:31:01 -04:00
8981be2dca
add more courseware and a working submit route
2015-05-15 18:43:07 -07:00
682146b3f5
fix #443
2015-05-12 00:05:08 -07:00
13e3d2dd77
Merge pull request #427 from QuincyLarson/field-guide-updates
...
adds field guide updates
2015-05-07 23:25:54 -07:00
8d2b82111b
refine field guides
2015-05-07 22:31:20 -07:00
ab74e7819e
Update helmet js and use newer middleware, update reference to freecodecamp in trusted group
2015-05-06 19:10:03 -04:00
ceb5c23be2
re-add commented out master header section
2015-05-06 18:17:01 -04:00
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
c9e7b30867
fix privacy policy link and remove redundant field guide entry
2015-05-05 18:31:03 -07:00
82a1680943
Resolve merge conflicts
2015-05-05 14:18:28 -04: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
077a97c941
Remove new-relic
2015-05-04 17:42:59 -04: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
c7c11cf7f6
get closer to all bower static assets
2015-05-03 01:37:22 -07:00
7cbcf46377
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
...
Conflicts:
app.js
views/challengeMap/show.jade
2015-05-01 23:12:56 -07:00
f376460755
fix show all nonprofits route
2015-05-01 22:22:10 -07:00
d492afb4f5
Merge branch 'mobile-news'
...
Conflicts:
views/challengeMap/show.jade
2015-05-01 21:54:10 -07:00
cbdba845df
Resolve merge conflicts
2015-05-02 00:41:38 -04:00
1347a8ba30
Use forcedomain express middleware
2015-05-01 16:34:07 -04:00
322fce8c3e
Merge remote-tracking branch 'upstream/staging' into staging
2015-05-01 07:52:50 -04:00
19456f2e23
add unsubscribe path
2015-04-30 23:41:40 -07:00
2cb02176a4
more camper news improvements
2015-04-30 15:56:14 -07:00
cc13b325d6
fix some issues with @terakilobyte and beautify the camper news index view
2015-04-30 14:55:00 -07:00
55afd8518c
Add missing semi-colon
2015-04-29 20:55:47 -04:00
e77eae2643
Edited per instructions in codepen to let users specify additional screen names
2015-04-29 20:07:38 -04:00
1e21d5d7aa
Fix some linting errors in app.js and highlight questionable code with todo comments
2015-04-29 19:30:51 -04:00
ffa2404993
Added API endpoint for twitter calls to use in codepen. NOTE added tokens to env file
2015-04-29 08:00:57 -04:00
35515c2da5
Merge branch 'videos' into pmi
2015-04-28 12:12:20 -07:00
fd456ec9be
make new landing pages and forms for project managers and nonprofits
2015-04-27 16:17:29 -07:00
941d261b7c
remove console.log statements, improve coursewares.json
2015-04-25 12:12:26 -07:00
a9feb269f6
Remove some debug/console.log statements.
...
Fix allFieldGuideIds method in resources.js to return an array of _ids, not an array of objects.
Field guide controller now correctly completes field guides. Closes #367 .
2015-04-25 12:28:14 -04:00
Quincy Larson
terakilobyte
Berkeley Martinez
A. Drake