Shane Kilkelly 158afbb157 Merge branch 'master' into pr-email-tokens ...

Conflicts:
	app/coffee/Features/Notifications/NotificationsBuilder.coffee
	public/coffee/ide/share/controllers/ShareController.coffee

2016-08-15 10:29:21 +01:00

..

admin

- make system messages default tab in admin panel

2016-06-06 16:11:26 +01:00

beta_program

Add id's to buttons on beta program page

2016-06-16 10:56:16 +01:00

blog

Style blog and lighten text

2014-07-22 17:09:44 +01:00

general

created buildCssPath img and js path funcs

2016-07-18 17:18:51 +01:00

layout

Better namespacing of sprite CSS classes.

2016-07-05 11:08:58 +01:00

project

Merge branch 'master' into pr-email-tokens

2016-08-15 10:29:21 +01:00

referal

added null check on Facebook

2015-02-18 22:25:58 +00:00

subscriptions

created buildCssPath img and js path funcs

2016-07-18 17:18:51 +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

broken free trial func into own file. added ab test on upgrade button colour

2014-11-24 23:59:55 +00:00

contact-us-modal.jade

Make 'knowledge base' a link to the KB index page.

2016-07-12 11:44:48 +01:00

layout.jade

Remove Countly integration.

2016-08-10 17:34:32 +01:00

restore.jade

changed team@sharelatex.com to support@sharelatex.com

2014-06-18 14:47:29 +01:00

scribtex-modal.jade

change the scribtex modal to be bootstrap3/angular, same content and same logic if it should be shown or not

2014-07-17 17:05:39 +01:00

sentry.jade

don’t fingerprint sentry

2016-07-20 16:03:01 +01:00

tests.jade

Intial open source comment

2014-02-12 10:23:40 +00:00