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

..

Authentication

Unit test tracking code.

2016-08-11 14:09:57 +01:00

Authorization

Allow admin access to projects

2016-03-21 17:03:41 +00:00

BetaProgram

Add opt-out action to beta page

2016-06-08 15:11:39 +01:00

Blog

blog returns 404's if the page does not exist in blog

2014-07-23 12:16:52 +01:00

Chat

patched xss hole with messages not setting the content type correctly

2015-05-19 11:04:52 +01:00

Collaborators

Address feedback, add ? checks where appropriate

2016-08-12 15:26:20 +01:00

Compile

fix tests

2016-07-29 14:59:48 +01:00

Contact

Add modules hook for contacts and support groups in auto complete

2015-10-08 18:17:53 +01:00

Docstore

added inactive and reactivate project logic

2015-08-13 22:40:28 +01:00

Documents

Standardise on one Errors file

2016-03-23 15:14:49 +00:00

DocumentUpdater

sped up unit tests to improve speed

2016-03-09 12:51:19 +00:00

Downloads

Add in backend multiple project downloading

2014-06-18 16:37:18 +01:00

Editor

Load invites on project load, rather than asynchronously.

2016-08-01 17:05:37 +01:00

Email

sped up unit tests to improve speed

2016-03-09 12:51:19 +00:00

FileStore

Update FileStoreHandlerTests

2016-05-18 09:58:57 +01:00

helpers

improve send calls and return correct stuff from _makeRequest

2016-04-20 17:08:11 +01:00

InactiveData

don't archive project in track changes for moment

2015-10-20 17:36:37 +01:00

infrastructure

sped up unit tests to improve speed

2016-03-09 12:51:19 +00:00

Notifications

Rework how invite expiry functions.

2016-08-12 14:40:59 +01:00

PasswordReset

clear sessions on password reset

2016-07-05 14:19:59 +01:00

Project

Add an endpoint to access project members

2016-08-04 16:47:48 +01:00

Referal

update the entire users features on assign bonus bu don't update

2015-10-07 13:50:51 +01:00

References

use underscore.each so it doesn’t blow up on non array.

2016-08-02 15:33:41 +01:00

Security

Merge branch 'master' into ja_email_tokens

2016-03-17 17:01:26 +00:00

Subscription

Include invites count in canAddXCollaborators

2016-08-02 15:42:50 +01:00

SystemMessages

Add in system messages

2014-07-24 13:24:08 +01:00

Tags

Explicitly create tags and get their id

2016-02-01 10:18:56 +00:00

ThirdPartyDataStore

Merge branch 'master' into ja_email_tokens

2016-03-17 17:01:26 +00:00

TrackChanges

archive in track changes as well as docstore

2015-10-19 15:44:50 +01:00

Uploads

listen for close not exit when working with unzip command

2016-03-21 16:37:29 +00:00

User

Unit test tracking code.

2016-08-11 14:09:57 +01:00