4090 commits

Author	SHA1	Message	Date
Alberto Fernández-Capel	f260f42466	Revert "add v2 history labels endpoints"	2018-07-20 12:39:01 +01:00
Alberto Fernández-Capel	da632c3117	Merge pull request #750 from sharelatex/hof-labels ... add v2 history labels endpoints	2018-07-20 11:07:29 +01:00
Henry Oswald	413721ebf9	look at more chars for if the server is in dark mode ... v2-dark.overleaf.com also needs to be marked as dark	2018-07-18 13:49:53 +01:00
Alasdair Smith	d36d3f2a0e	Actually enable rich text	2018-07-18 09:26:03 +01:00
Alasdair Smith	ffe3bc2977	Switch review panel to use richTextEnabled variable	2018-07-18 09:26:03 +01:00
Alasdair Smith	62f69a4bcd	Fix case sensitivity	2018-07-18 09:26:03 +01:00
Alasdair Smith	9cd3f32365	Use hasFeature function instead of new standalone function	2018-07-18 09:26:03 +01:00
Alasdair Smith	4202b9c717	Use hard-coded feature flag for rich text	2018-07-18 09:26:03 +01:00
Alasdair Smith	fba0cd04f5	Fix TC underlines being offset because review panel above editor toolbar	2018-07-17 17:34:09 +01:00
Jessica Lawshe	64a257dae2	Merge pull request #708 from sharelatex/jel-mathjax ... MathJax - library path, directive, and use `Safe` extension	2018-07-17 09:32:06 -05:00
Alberto Fernández-Capel	e7738b851d	Merge pull request #764 from sharelatex/afc-import-managers ... Import managers	2018-07-17 10:10:51 +01:00
Alberto Fernández-Capel	5821d2c981	Merge pull request #755 from sharelatex/afc-import-team-names ... Import team names	2018-07-17 10:05:38 +01:00
Hayden Faulds	f6def039bf	code review feedback	2018-07-16 16:06:17 +01:00
Hayden Faulds	04bb83f3de	add v2 history labels endpoints	2018-07-16 16:06:17 +01:00
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
Alberto Fernández Capel	0bf807fa9f	Remove SubscriptionLocator.getManagedSubscription ... It was used as a kind of access control check, but it's clearer if the check is in the only controller that actually needs it.	2018-07-13 11:47:26 +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
Alberto Fernández Capel	79ada88b13	Add team name to subscription model	2018-07-13 11:15:58 +01:00
James Allen	476f4e55c3	Just generate a new token on resending confirmation email	2018-07-13 10:42:31 +01:00
Alberto Fernández Capel	46a1cdc510	Use the admin_ids array to query for subscriptions	2018-07-13 09:38:58 +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