terakilobyte
adaa3cdece
Remove template path, load correct javascript in universal header
2015-05-06 09:10:15 -04:00
Quincy Larson
c9e7b30867
fix privacy policy link and remove redundant field guide entry
2015-05-05 18:31:03 -07:00
terakilobyte
82a1680943
Resolve merge conflicts
2015-05-05 14:18:28 -04: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
terakilobyte
077a97c941
Remove new-relic
2015-05-04 17:42:59 -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
c7c11cf7f6
get closer to all bower static assets
2015-05-03 01:37:22 -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
f376460755
fix show all nonprofits route
2015-05-01 22:22:10 -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
terakilobyte
1347a8ba30
Use forcedomain express middleware
2015-05-01 16:34:07 -04:00
terakilobyte
322fce8c3e
Merge remote-tracking branch 'upstream/staging' into staging
2015-05-01 07:52:50 -04:00
Quincy Larson
19456f2e23
add unsubscribe path
2015-04-30 23:41:40 -07:00
Quincy Larson
2cb02176a4
more camper news improvements
2015-04-30 15:56:14 -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
terakilobyte
55afd8518c
Add missing semi-colon
2015-04-29 20:55:47 -04:00
A. Drake
e77eae2643
Edited per instructions in codepen to let users specify additional screen names
2015-04-29 20:07:38 -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
A. Drake
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
Quincy Larson
35515c2da5
Merge branch 'videos' into pmi
2015-04-28 12:12:20 -07:00
Quincy Larson
fd456ec9be
make new landing pages and forms for project managers and nonprofits
2015-04-27 16:17:29 -07:00
Quincy Larson
941d261b7c
remove console.log statements, improve coursewares.json
2015-04-25 12:12:26 -07:00
terakilobyte
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
Nathan
15ea7f3473
Merge pull request #363 from FreeCodeCamp/root
...
Root
2015-04-24 19:16:43 -04:00
terakilobyte
e7371b0a7b
Configure for production on DO.
2015-04-24 19:11:17 -04:00
terakilobyte
b3929f693b
Clean up privacy policy routing. Adopt same pattern from courseware/bonfire mongo lookup to fieldguides.
2015-04-24 13:49:32 -04:00
Quincy Larson
32d1a605ff
fix www redirect to include full path
2015-04-24 02:55:14 -07:00
Quincy Larson
bf723b522b
start making ux changes
2015-04-23 23:46:58 -07:00
Quincy Larson
f2179c6be6
non-www now points to www
2015-04-22 14:53:58 -07:00
MrRenter
b2f18a790a
Changed from post to put for since updating not creatings
2015-04-18 11:53:46 -04:00
MrRenter
349dbbc2af
Added functuality to the edit button. Added router to /commets/:id/edit as well as commentEdit method in story js.
2015-04-18 02:40:48 -04:00
Michael Q Larson
d2fae63310
fix a few minor issues post merge
2015-04-16 23:16:55 -07:00
terakilobyte
04d9856d4f
Remove vomit route.
2015-04-17 01:48:06 -04:00
terakilobyte
b9372b9af6
Resolve merge conflicts using Webstorm's merge integration tool. v2
2015-04-17 00:39:48 -04:00
terakilobyte
b49d2fd343
Resolve merge conflicts using Webstorm's merge integration tool.
2015-04-17 00:11:13 -04:00
terakilobyte
9c67d4988f
Add new currying challenge to bonfires and allow inspectlet through protective helmet
2015-04-14 23:04:54 -04:00
terakilobyte
18bdefbfac
Add in message about twitter authorization being down temporarily to error handler
2015-04-14 16:17:58 -04:00
brndnb
a6d5721458
Switch from debug to console.log
2015-04-14 15:42:46 -04:00
brndnb
4fb119ab68
Add debug to app.js to troubleshoot twitter signin in production, unable to repliate locally
2015-04-14 15:36:02 -04:00
Michael Q Larson
9145e959de
able to use the api upon button click
2015-04-08 22:42:40 -07:00
Michael Q Larson
7da6f69cd8
start process of moving wiki over to field guide
2015-04-08 17:18:51 -07:00
Michael Q Larson
c02fafa6a9
add status, turn hours into integer, create a directory view of all nonprofits
2015-04-08 14:36:05 -07:00
Michael Q Larson
bd7c5310b1
improve the footer
2015-04-07 00:11:31 -07:00
Michael Q Larson
840930d967
get bonfire solutions showing up in the view; eliminate a lot of old views in favor of new challenge map
2015-04-05 18:37:58 -07:00
Michael Q Larson
60fee94574
create infrastructure for advancing through wiki
2015-04-05 16:44:07 -07:00
Michael Q Larson
fbeff58477
build a functional challenge map and change navbar links
2015-04-03 20:05:53 -07:00
Michael Q Larson
1248cde97f
continue work on nonprofit show views
2015-04-01 22:31:08 -07:00
Michael Q Larson
fa74a1b454
got show all nonprofits button working and improved nonprofit show view
2015-03-31 17:38:33 -07:00
