1365 commits

Author	SHA1	Message	Date
James Allen	c2777918fa	Add some missing unit test mocks	2018-07-17 11:26:07 +01:00
James Allen	2c25cbaf25	Update error handling on backend	2018-07-17 11:12:09 +01:00
James Allen	ca97698724	Handle v1 response when email is already in use	2018-07-16 17:27:01 +01:00
James Allen	d0f77abc70	Update email in v1 when setting default in v2	2018-07-16 13:26:52 +01:00
James Allen	b150a7b4ae	Merge pull request #735 from sharelatex/pr-affiliations-ui-adjustments ... Affiliations UI, second round	2018-07-16 10:08:47 +01:00
James Allen	476f4e55c3	Just generate a new token on resending confirmation email	2018-07-13 10:42:31 +01:00
James Allen	33b28db061	Add backend endpoint for resending confirmation email	2018-07-12 16:39:04 +01:00
Alberto Fernández Capel	abcfa0b0d2	Store manager ids in an array	2018-07-12 16:35:27 +01:00
Alberto Fernández Capel	3586fe8406	Update var name	2018-07-11 11:50:14 +01:00
Alberto Fernández Capel	4e8185d369	Use the id in methods that modify a subscription ... This will make it easier to allow a user to manage multiple groups.	2018-07-11 09:56:36 +01:00
Tim Alby	791dc0df5b	check institution features on features update	2018-07-10 17:53:37 +02:00
James Allen	91079f3af2	Fix unit tests	2018-07-10 11:32:19 +01:00
James Allen	cb449f4b75	Delete a subscription on expiry, rather than set personal plan code	2018-07-10 10:31:25 +01:00
James Allen	7a1bb30952	Merge pull request #699 from sharelatex/ja-fix-bonus-feature-allocation ... Don't consider current features when assigning bonus	2018-07-06 11:06:34 +01:00
Tim Alby	b78212290a	handle dynamic Proxy URLs	2018-07-06 12:03:47 +02:00
Tim Alby	cfd5c65be4	add affiliation before confirming email	2018-07-05 16:02:55 +02:00
Tim Alby	9d4df4271a	try adding affiliation on user creation	2018-07-05 16:01:15 +02:00
Tim Alby	3e1d61438f	add endpoint to endorse affiliation	2018-07-05 15:59:36 +02:00
Timothée Alby	958012533d	Merge pull request #724 from sharelatex/ta-parse-email ... parse email in UserUpdater	2018-07-05 15:57:20 +02:00
Hugh O'Brien	a230b5efab	Merge pull request #720 from sharelatex/mm-export-v1projectid ... Include project's and user's v1 ID in export requests	2018-07-05 12:12:35 +01:00
Shane Kilkelly	0777e44abf	Merge branch 'sk-linked-files-mendeley'	2018-07-04 12:16:39 +01:00
Shane Kilkelly	b32c9be8ca	Linked files from Mendeley.	2018-07-04 10:05:03 +01:00
Tim Alby	3a541307b4	parse email in UserUpdater	2018-07-03 20:59:38 +02:00
Alberto Fernández-Capel	f1ef053caf	Merge pull request #705 from sharelatex/afc-import-team-from-v1 ... Changes to allow importing a team from v1	2018-07-03 13:39:19 +01:00
Alberto Fernández-Capel	d904622b05	Merge pull request #695 from sharelatex/sk-fix-validation-on-refresh-output-file ... Fix validation of project-output-file, no build_id when imported from v1	2018-07-03 13:38:59 +01:00
Michael Mazour	235534d269	Also include user's v1 ID in export requests	2018-07-03 10:15:51 +01:00
Douglas Lovell	260f927980	Merge pull request #719 from sharelatex/dcl-test-fix ... Small repair to SubscriptionController Test	2018-07-02 13:16:10 -03:00
Paulo Reis	80b7641652	Update UserEmails acceptance tests to use the new POST-based email deletion endpoint.	2018-07-02 12:31:36 +01:00
Alasdair Smith	ec1dbc47bf	Merge pull request #703 from sharelatex/as-cm-pos-assertion ... Add assertion method for CodeMirror Pos objects	2018-07-02 11:35:26 +01:00
Michael Mazour	8436b67260	Include project's v1 ID in export requests ... If a project was imported from v1, include its v1 ID when making an export request back to v1. Use case: v1 project exported via ScholarOne and then migrated to v2 needs to be linked up to its earlier v1 export records.	2018-07-02 11:12:42 +01:00
Douglas Lovell	1df5b0b942	Fixup mixed indentation	2018-06-29 19:36:59 -03:00
Douglas Lovell	20835a79e2	Repair not logged in subscription controller test	2018-06-29 19:36:40 -03:00
Alberto Fernández Capel	18ded60619	Fix unit tests	2018-06-28 15:28:44 +01:00
Alberto Fernández Capel	193579070c	Ensure features are updated for users but not for stubs	2018-06-28 13:25:04 +01:00
Tim Alby	fe0fdd11bf	call v1 affiliation deletion endpoint with POST instead of DELETE	2018-06-28 13:48:28 +02:00
Tim Alby	1d80878bf8	delete affiliations on user deletion	2018-06-28 13:47:19 +02:00
Tim Alby	837f614df4	refactor affiliation requests	2018-06-28 13:47:16 +02:00
Alberto Fernández Capel	4366a0ea2c	Remove trailing whitespace	2018-06-28 11:08:20 +01:00
Tim Alby	8c70ba88b7	Add missing greater-than character in tests	2018-06-28 10:15:55 +02:00
Alberto Fernández Capel	c19fc6d245	Fetch the whole user doc ... Other attributes are needed to calculate features.	2018-06-27 12:52:47 +01:00
Alberto Fernández Capel	8b8742d60f	Fix ReferalFeatures tests	2018-06-27 12:28:22 +01:00
Alasdair Smith	3a90a2d004	Add custom assertion method to chai for comparing CM Pos objects	2018-06-27 11:28:29 +01:00
James Allen	156c417df0	Don't consider current features when assignin bonus	2018-06-26 11:26:07 +01:00
Henry Oswald	c1a8d8b31a	Merge branch 'master' into ho-clsi-double-backend	2018-06-25 13:43:40 +01:00
Tim Alby	c6de896bb5	decorate emails list with affiliation data	2018-06-25 13:47:04 +02:00
Tim Alby	c81f9c24ed	mock affiliations API in acceptance tests	2018-06-25 13:45:46 +02:00
Tim Alby	e41391fb4a	ignore affiliations if v1 is not configured	2018-06-25 13:45:46 +02:00
Tim Alby	d3b2a2650f	add/remove affiliations when adding/removing emails	2018-06-25 13:45:46 +02:00
Shane Kilkelly	04be842b30	Fix validation of project-output-file, no build_id for imported v1 projects	2018-06-25 12:27:56 +01:00
Tim Alby	b65ba388ba	replace OldAssetProxy	2018-06-25 12:36:51 +02:00