1915 commits

Author	SHA1	Message	Date
James Allen	16b7bf222a	Merge branch 'contacts'	2015-11-05 10:14:25 +00:00
James Allen	21f702a42e	Fix bug with click on share button registering	2015-11-04 14:33:27 +00:00
James Allen	34d13d5b2d	Include latest translations	2015-11-03 12:00:57 +00:00
James Allen	c46f62cfc1	Ensure that a user can only be added to project once	2015-11-02 15:21:41 +00:00
James Allen	7359fc16ee	Add in show-on-hover CSS classes	2015-11-02 13:59:34 +00:00
Shane Kilkelly	c05c5ac7c8	Clear drag/drop highlight explicitly after the drop has completed. ... Solves a problem where sometimes the Jquery drag/drop plugin fails to remove the highlight class from drop target.	2015-10-28 12:17:50 +00:00
Henry Oswald	730088b6ab	set button colour to red for free trial	2015-10-27 23:35:13 +00:00
Henry Oswald	2d03410c42	removed some editor actions sent to google analytics as we are sending too much data	2015-10-27 23:28:54 +00:00
Henry Oswald	6c75a6dbe5	change six pack key and add into default settings	2015-10-27 11:37:11 +00:00
Henry Oswald	97c2b5fb11	removed excess logging for sixpack	2015-10-27 11:20:54 +00:00
Henry Oswald	b9187ebd08	added test to wording for datajoy popup	2015-10-27 10:58:51 +00:00
Henry Oswald	8f1d09beea	added six pack to web	2015-10-27 10:58:27 +00:00
Henry Oswald	5e19d710ba	change error handling on spelling	2015-10-22 20:15:50 +01:00
Henry Oswald	084b0d8548	update ldap default settings for server pro	2015-10-22 10:42:50 +01:00
Henry Oswald	1c91de0395	added function to get project with only folders for quicker adding of files to large projects	2015-10-21 16:56:06 +01:00
Henry Oswald	885915916a	check if user exists on recurly callback	2015-10-21 11:27:13 +01:00
Henry Oswald	d9734953a6	don't archive project in track changes for moment	2015-10-20 17:36:37 +01:00
Henry Oswald	79a694b5c8	for spelling attach error handler first	2015-10-20 09:55:12 +01:00
Henry Oswald	f61d97a4f6	added null check on user when checking permissions	2015-10-19 22:29:36 +01:00
Henry Oswald	2b8dd7248a	added subscription handler null check	2015-10-19 22:29:11 +01:00
Henry Oswald	d80179ecc6	added missing null check in	2015-10-19 22:14:52 +01:00
Henry Oswald	a94a03fc3e	added missing stubbed module call breaking tests	2015-10-19 15:48:59 +01:00
Henry Oswald	0c74673e04	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-10-19 15:44:54 +01:00
Henry Oswald	2c32126f68	archive in track changes as well as docstore	2015-10-19 15:44:50 +01:00
James Allen	36678301e6	Try to put a new doc in the docstore first so that if it fails it doesn't leave a broken doc_id in the project	2015-10-16 12:34:33 +01:00
James Allen	bafd3a1cb4	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2015-10-16 12:31:21 +01:00
James Allen	144f1396b7	Fix problem with pasting multiple emails	2015-10-15 17:03:22 +01:00
James Allen	fb42489803	Improve formatting of users, groups and tags	2015-10-15 16:43:53 +01:00
James Allen	b0895cc6aa	Support adding groups to projects via share modal	2015-10-15 13:53:46 +01:00
Henry Oswald	bbe510099e	change auto disconnect to 24 hours and expose it publicly for easier testing	2015-10-15 11:38:23 +01:00
Henry Oswald	2f48568f76	fix free trial button on timeout view	2015-10-15 11:38:01 +01:00
Henry Oswald	9eb4dd1b3b	on firefox don't show retrying connected message if the user clicked to change page ... it creates a bit of worry for the user as it looks like the connection was not there.	2015-10-14 18:07:12 +01:00
James Allen	d996ed6e47	Refactor addUserToProject for better access by groups	2015-10-14 17:29:58 +01:00
Henry Oswald	a1f57f220b	inline ng-clock as it does not work for firefox in base.less quickly enough	2015-10-14 16:22:32 +01:00
Henry Oswald	aba8f164fc	copy right 2015 not 2014	2015-10-14 14:44:48 +01:00
Henry Oswald	f5162d424f	if a user is inactive for 12 hours disconect them.	2015-10-14 14:28:24 +01:00
Henry Oswald	28e507b007	Revert "A tiny cache-busting change" ... This reverts commit 1241b397d32cf982c9bb92865c725ce1e431e409.	2015-10-09 10:12:08 +01:00
Henry Oswald	ea5046ef20	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-10-09 10:11:57 +01:00
Henry Oswald	e593b3f717	append string to ide.js min which we can use for testing via status cake	2015-10-09 10:11:38 +01:00
Shane Kilkelly	8676ce9538	A tiny cache-busting change	2015-10-09 08:45:50 +01:00
James Allen	c4e4f2c77a	Add modules hook for contacts and support groups in auto complete	2015-10-08 18:17:53 +01:00
James Allen	78c5741d06	Add contact when adding collaborator	2015-10-08 16:42:23 +01:00
James Allen	d11d536994	Refactor adding and removing collaborators to not go through EditorController	2015-10-08 14:15:36 +01:00
James Allen	8cc7869b03	Pull in contacts from contacts api and send to tag-input for autocomplete	2015-10-07 17:32:35 +01:00
Henry Oswald	f1d07811df	update the entire users features on assign bonus bu don't update ... the user features if there is nothing to update when assigning bonus	2015-10-07 13:50:51 +01:00
Henry Oswald	a73b2ceb37	Merge branch 'connect-failed'	2015-10-07 11:30:48 +01:00
Henry Oswald	b69ec9768d	bonus allocater does not need to check if user has subscription any more.	2015-10-05 16:50:34 +01:00
James Allen	64ffcde3df	Namespace subscription groups as SubscriptionGroup	2015-10-05 16:37:03 +01:00
Henry Oswald	fae7d431f4	after subscription is updated always check bonus	2015-10-05 16:33:13 +01:00
Henry Oswald	9a60617162	change referral allocated to only upgrade features and to find highest level ... i.e. user has referred 5 users, there are bonus levels for 3 & 6 shares, auto takes 3 users now.	2015-10-05 12:30:03 +01:00