Shane Kilkelly 97a6ac0f00 Merge branch 'master' into sk-passport ... # Conflicts: # app/coffee/Features/Authorization/AuthorizationMiddlewear.coffee		2016-09-15 14:48:51 +01:00
..
admin	- make system messages default tab in admin panel	2016-06-06 16:11:26 +01:00
beta_program	added syntax check to beta page, removed mendeley	2016-08-11 13:43:33 +01:00
blog
general	created buildCssPath img and js path funcs	2016-07-18 17:18:51 +01:00
layout	wip refactor	2016-09-06 15:22:13 +01:00
project	Preserve line formatting in word count error message	2016-09-14 11:21:00 +01:00
referal
subscriptions	Also hide button, when viewing student plans.	2016-08-31 11:40:27 +01:00
translations	created buildCssPath img and js path funcs	2016-07-18 17:18:51 +01:00
university	added contentful uni pages as fallback	2016-06-06 09:28:53 +01:00
user	Add redir query string to login link	2016-07-27 13:51:52 +01:00
view_templates
contact-us-modal.jade	Make 'knowledge base' a link to the KB index page.	2016-07-12 11:44:48 +01:00
layout.jade	Don't redirect Google to nocdn=true, and remove canonical URL until we sort out translated domains	2016-09-15 10:21:12 +01:00
restore.jade
scribtex-modal.jade
sentry.jade	don’t fingerprint sentry	2016-07-20 16:03:01 +01:00
tests.jade