Quincy Larson 51af4e4b0d Merge branch 'google-cdns' into remove-angular ...

Conflicts:
	server/boot/user.js
	server/views/account/show.jade
	server/views/account/signin.jade
	server/views/coursewares/showBonfire.jade
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade

2015-09-23 09:56:01 -07:00

..

a-extendUser.js

update csp

2015-08-16 08:03:34 -07:00

a-extendUserIdent.js

add descriptive message to failed account linking attempt

2015-08-24 17:52:12 -07:00

a-react.js

add job subroutes

2015-09-10 16:27:08 -07:00

a-services.js

jobs store fetching

2015-07-25 15:42:03 -07:00

authentication.js

use app instead of server in boot directories

2015-06-03 12:26:11 -07:00

challenge.js

add further code to be QAd after sleeping

2015-09-08 23:48:11 -07:00

explorer.js

remove passport file

2015-06-09 16:45:14 -07:00

home.js

update meta and other references to new short tagline

2015-09-02 17:42:18 -07:00

nonprofits.js

fix some linting issues

2015-08-29 01:48:01 -07:00

randomAPIs.js

make more progress QAing challenges

2015-08-13 17:20:52 -07:00

redirectHttps.js

Fixes a typo in source code

2015-08-24 11:57:14 +04:00

redirects.js

add redirect for now vanished field guide articles

2015-08-04 18:00:01 -07:00

restApi.js

use app instead of server in boot directories

2015-06-03 12:26:11 -07:00

story.js

fix cannot read property id of user durring upvote

2015-08-18 19:48:42 -07:00

user.js

Merge branch 'google-cdns' into remove-angular

2015-09-23 09:56:01 -07:00