178 commits

Author	SHA1	Message	Date
Alberto Fernández Capel	553878064b	Resend email if the user has already been invited	2018-06-06 15:36:53 +01:00
Alberto Fernández Capel	e753ef3af5	Invite users in the invited_emails array ... We'll remove that attribute soon, but for the time being we want users to still be able to join the team.	2018-06-06 15:36:53 +01:00
Alberto Fernández Capel	6fb6119ca8	Merge remote-tracking branch 'origin' into afc-email-tokens	2018-06-05 15:42:17 +01:00
Jessica Lawshe	b63384cbf1	Merge pull request #537 from sharelatex/jel-pricing-plans ... Plans and pricing variant	2018-06-05 09:30:43 -05:00
Hayden Faulds	0bb37d4991	move tk call to before sandboxed module call	2018-06-05 13:42:26 +01:00
Jessica Lawshe	8b672dea0d	Add unit tests	2018-06-04 14:42:26 -05:00
Alberto Fernández Capel	58c4e72b2a	Update references to UserLocator ... UserLocator was refactored in another branch: UserLocator -> UserGetter	2018-06-01 16:53:16 +01:00
Alberto Fernández Capel	25d7196570	Merge remote-tracking branch 'origin/master' into afc-email-tokens	2018-06-01 16:49:47 +01:00
Alberto Fernández Capel	7fcdf68296	Remove dead code	2018-06-01 16:05:44 +01:00
Alberto Fernández Capel	3bd18715db	Add some tests	2018-06-01 15:37:09 +01:00
Hugh O'Brien	a79c9b94a8	Merge pull request #613 from sharelatex/hb-extract-v1-templates-to-web ... Extract v1 templates code to web	2018-06-01 11:29:36 +01:00
Alberto Fernández Capel	9b18e58b68	Choose a better method name ... This method is now only notifying users about a potential domain licence	2018-06-01 11:28:06 +01:00
Alberto Fernández Capel	385fec1914	Clean up code that uses invited_emails	2018-06-01 11:23:25 +01:00
hugh-obrien	d47e845367	add v1 template tests	2018-05-31 13:26:54 +01:00
Shane Kilkelly	d3ae276091	Merge pull request #579 from sharelatex/sk-linked-files-from-project ... Linked Files from Project	2018-05-31 11:08:08 +01:00
Tim Alby	5fbe5c5537	remove UserLocator ... Use UserGetter instead	2018-05-28 14:11:13 +02:00
Tim Alby	bbaca91e57	add UserGetter#getUserByMainEmail ... Use only that method to find users by email.	2018-05-28 14:11:09 +02:00
Tim Alby	5a590aa021	remove getUserOrCreateHoldingAccount function ... The function is deprecated	2018-05-28 14:09:13 +02:00
Shane Kilkelly	0cb5beb689	Merge branch 'master' into sk-linked-files-from-project	2018-05-24 13:47:28 +01:00
Alasdair Smith	81fdca91c1	Fix failing test	2018-05-24 10:27:36 +01:00
Shane Kilkelly	3181f624a7	Remove obsolete auth check	2018-05-24 10:22:17 +01:00
Shane Kilkelly	4daf062be9	Add unit test for ProjectController.projectEntitiesJson	2018-05-22 16:40:39 +01:00
Shane Kilkelly	b1c1cdecef	Add unit test for ProjectController.userProjectsJson	2018-05-22 16:17:59 +01:00
Shane Kilkelly	bc5769cd73	Stub out the ProjectEntityHandler in ProjectController tests	2018-05-22 15:56:01 +01:00
James Allen	1d0be569a6	Fix SubscriptionUpdater -> FeaturesUpdater miscall	2018-05-22 10:05:08 +01:00
James Allen	50bd60dd51	Split FeaturesUpdater out of SubscriptionUpdater	2018-05-22 10:05:08 +01:00
James Allen	0830c473ad	Update unit tests and refactor to make more testable	2018-05-22 10:05:08 +01:00
Hugh O'Brien	346f37011f	Merge pull request #546 from sharelatex/ns-allow-latexmkrc ... Allow for latexmkrc files in project zip upload	2018-05-21 09:03:40 +01:00
Michael Mazour	e34dd90a1f	Add project export route and controller	2018-05-16 14:58:34 +01:00
Michael Mazour	a661084485	Add ExportsHander for project exports performed via v1	2018-05-16 14:58:34 +01:00
Shane Kilkelly	06c0b45ef7	Merge branch 'master' into sk-fix-references-full-index	2018-05-14 13:45:12 +01:00
Shane Kilkelly	43d00a2e5f	Account for the new referencesSearch flag when deciding to do fullIndex	2018-05-14 11:31:59 +01:00
Nate Stemen	d108b11bc0	Add latexmkrc in FileTypeManager	2018-05-10 16:59:58 -04:00
Hayden Faulds	9ccdf073c4	accept attributes rather than projectHistoryId to ProjectCreationHandler	2018-05-10 11:39:23 +01:00
Brian Gough	1278e2da45	fix project structure version when deleting folder	2018-05-08 13:37:33 +01:00
Brian Gough	afd4a10a19	retry lock with exponential backoff	2018-05-04 15:02:36 +01:00
Brian Gough	e414100c41	add support for unique lock values	2018-05-04 13:22:33 +01:00
James Allen	40da785363	Fix test for sampling front users	2018-05-01 09:02:43 +01:00
James Allen	6399621d1f	Show front widget for paid and sampled free users	2018-04-30 17:13:57 +01:00
Alasdair Smith	ad1df3532f	Merge pull request #490 from sharelatex/hof-deleted-project-history ... Pass project history id with updates	2018-04-23 10:05:07 +01:00
James Allen	d1b68ddf7c	Fix RestoreManager unit tests	2018-04-16 16:27:24 +01:00
James Allen	9e525702c1	Merge branch 'master' into ja-restore-files	2018-04-16 16:14:31 +01:00
Hayden Faulds	7755a7cc1f	add overleaf to projections for project structure updates	2018-04-13 13:45:07 +01:00
Hayden Faulds	3006d018d9	send projectHistoryId with project structure updates	2018-04-13 13:45:03 +01:00
Hayden Faulds	e5f3c472e3	return projectHistoryId in DocumentController.getDoc	2018-04-13 13:45:02 +01:00
Hayden Faulds	50686090c8	push doc pathname logic into DocController	2018-04-12 16:16:44 +01:00
Brian Gough	882b555433	create new file on replace	2018-04-09 12:05:08 +01:00
Brian Gough	baec4eb195	move uploads outside the lock	2018-04-09 12:05:07 +01:00
James Allen	1e8439a2c6	Fix restore of docs from old deleted docs	2018-04-06 10:30:13 +01:00
James Allen	b4fa47d664	Add unit tests for RestoreManager	2018-04-06 10:30:13 +01:00