4071 commits

Author	SHA1	Message	Date
Alberto Fernández Capel	66b492ba5f	Use id to find subscription ... It's the new method signature.	2018-07-16 14:42:41 +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
Alberto Fernández Capel	a72dec4b6e	Merge remote-tracking branch 'origin/master' into afc-multiple-managers	2018-07-16 09:45:11 +01:00
James Allen	a238c74440	Remove inline style	2018-07-13 11:19:49 +01:00
Alasdair Smith	b00cad19ff	Merge pull request #751 from sharelatex/as-fix-loading-toolbar ... Fix bug where loading panel was showing over toolbar	2018-07-13 11:17:46 +01:00
James Allen	452d698a47	ng-show -> ng-if	2018-07-13 11:17:05 +01:00
James Allen	476f4e55c3	Just generate a new token on resending confirmation email	2018-07-13 10:42:31 +01:00
James Allen	d7e0b8c369	Show unconfirmed email status in UI and add link to resend confirmation	2018-07-12 17:13:26 +01:00
James Allen	33b28db061	Add backend endpoint for resending confirmation email	2018-07-12 16:39:04 +01:00
Paulo Reis	59008b4a51	Show university custom departments when changing affiliations; fix Features typo.	2018-07-12 16:37:09 +01:00
Paulo Reis	a759828ece	Update feature flag for affiliations; use it in the router; minor style adjustments.	2018-07-12 16:37:09 +01:00
Paulo Reis	85cf518457	Avoid showing the email input when viewing the full affiliations UI; disable affiliations when using SAML and LDAP authentication strategies.	2018-07-12 16:37:09 +01:00
Paulo Reis	c817094a2d	Add i18n keys; minor style adjustments.	2018-07-12 16:37:09 +01:00
Paulo Reis	4d1b6c6ba8	Add error handling.	2018-07-12 16:37:09 +01:00
Paulo Reis	c630c5d952	Preemptively remove front-end data when removing user emails.	2018-07-12 16:37:09 +01:00
Paulo Reis	19b57571bf	Basic affiliation change implementation.	2018-07-12 16:37:08 +01:00
Paulo Reis	1514e5e071	Isolate affiliations form in a component.	2018-07-12 16:37:08 +01:00
Alberto Fernández Capel	abcfa0b0d2	Store manager ids in an array	2018-07-12 16:35:27 +01:00
Alasdair Smith	ba6560ce04	Fix bug where loading panel was showing over toolbar	2018-07-12 11:18:09 +01:00
Alasdair Smith	dc56ffb8a6	Improve copy	2018-07-11 15:22:20 +01:00
Alasdair Smith	b1a47ddae4	Improve copy	2018-07-11 15:15:22 +01:00
Alasdair Smith	538aba323a	Add first pass at unsupported message and style	2018-07-11 15:15:22 +01:00
Alasdair Smith	00c089448e	Add review panel unsupported message	2018-07-11 15:15:22 +01:00
Alasdair Smith	9d81cf20f9	Add new unsupported class to control visibility while rich text is open	2018-07-11 15:15:22 +01:00
Alberto Fernández Capel	40c1f67561	Check that the subscription is a group before exporting it to csv ... I removed this check by mistake, just taking it back.	2018-07-11 12:10:43 +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	cb449f4b75	Delete a subscription on expiry, rather than set personal plan code	2018-07-10 10:31:25 +01:00
James Allen	f5ea7f2d77	Merge pull request #730 from sharelatex/sk-handle-orphaned-mendeley-linked-files ... Add a new error type to LinkedFiles: FileCannotRefreshError	2018-07-06 11:06:51 +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
James Allen	dad4bad9eb	Merge pull request #700 from sharelatex/ew-fix-undefined-last-name ... fix undefined last name	2018-07-06 11:06:12 +01:00
Tim Alby	b78212290a	handle dynamic Proxy URLs	2018-07-06 12:03:47 +02:00
James Allen	b902821c07	Return blank features, not default features if no bonuses	2018-07-06 09:09:41 +01: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	08aab38470	Merge pull request #725 from sharelatex/ta-disable-emails-endpoint ... Disable Emails Endpoint when externalAuthenticationSystemUsed is True	2018-07-05 15:57:31 +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
Shane Kilkelly	f125a755bf	Add a new error type to LinkedFiles: FileCannotRefreshError	2018-07-05 12:13:07 +01: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
Tim Alby	3581aa3ccb	disable emails endpoint when externalAuthenticationSystemUsed is true	2018-07-04 15:19:15 +02: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
Alberto Fernández-Capel	a1c49b0cf9	Merge pull request #694 from sharelatex/sk-linked-files-warning-when-no-projects ... Add a warning message when there are no other projects to choose.	2018-07-03 13:38:33 +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
Alasdair Smith	04a98c4d91	Merge pull request #697 from sharelatex/pr-user-affilitations ... User affiliations	2018-07-02 11:36:04 +01:00