Commit Graph

6839 Commits

Author SHA1 Message Date
Jessica Lawshe baa321fa1a Merge pull request #628 from sharelatex/ns-only-one-doc-env
only suggest one document environment per project
2018-06-12 08:44:14 -05:00
James Allen ea8f2fc7a3 Merge pull request #653 from sharelatex/ja-group-notification
Update group notification for new group invite URL
2018-06-12 10:06:26 +01:00
James Allen 1d7accabdd Update group notification for new group invite URL 2018-06-12 09:54:54 +01:00
James Allen f7532e5854 Merge pull request #619 from sharelatex/afc-email-tokens
Use emails with tokens for team invites
2018-06-12 08:30:23 +01:00
James Allen dbd6ea30e9 Improve robustness of email validation 2018-06-11 15:22:42 +01:00
James Allen ed5bc70350 Tweak front-end layout 2018-06-11 14:20:46 +01:00
James Allen 155102df64 Use Error classes, and ensure invited_emails is cleared on new invite 2018-06-11 14:20:35 +01:00
James Allen b716f59442 Remove deprecated removeEmailInviteFromGroup 2018-06-11 14:19:47 +01:00
Timothée Alby bc6a38a4f1 Merge pull request #644 from sharelatex/ta-use-multi-emails-2
Use Multiple Emails Take 2
2018-06-11 10:31:25 +02:00
Tim Alby 5438a565b9 use multiple emails when relevant 2018-06-08 17:53:45 +02:00
Tim Alby 31827ae6b5 add emails attribute on user creation 2018-06-08 17:53:45 +02:00
Jessica Lawshe 07aedaa92b Merge pull request #645 from sharelatex/jel-add-cms
Existence check for data from CMS
2018-06-08 10:14:23 -05:00
Jessica Lawshe 43da34098e Existence check 2018-06-08 10:07:44 -05:00
Jessica Lawshe ba5b3bb06a Merge pull request #581 from sharelatex/jel-add-cms
Add CMS
2018-06-08 07:18:03 -05:00
Jessica Lawshe d57660aeb5 Merge pull request #632 from sharelatex/jel-plans-pricing-fix
Plans and Pricing fixes
2018-06-08 07:17:28 -05:00
Alberto Fernández Capel 59688efb56 Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-08 12:21:17 +01:00
Alberto Fernández-Capel e7e429a963 Merge pull request #605 from sharelatex/afc-update-user-references
Add method to update user references
2018-06-08 11:29:25 +01:00
Alberto Fernández Capel 57775e60b1 Merge remote-tracking branch 'origin/master' into afc-update-user-references 2018-06-08 11:28:58 +01:00
Alberto Fernández-Capel 10da4fc5f7 Merge pull request #585 from sharelatex/afc-team-overleaf-id
Add overleaf id to the Subscription (team) schema
2018-06-08 11:27:15 +01:00
Alasdair Smith c53ff0fa84 Merge pull request #618 from sharelatex/as-toolbar-btns
Rich text toolbar styles
2018-06-08 10:09:27 +01:00
Alberto Fernández Capel c45b4463bb Fix unit test 2018-06-08 10:05:26 +01:00
Alberto Fernández Capel 5159f6f33d Check the subscription is in a group plan before adding new members 2018-06-08 09:58:51 +01:00
Timothée Alby 27bd7a16b2 Merge pull request #643 from sharelatex/revert-603-ta-use-multi-emails
Revert "Use Multiple Emails"
2018-06-07 18:45:49 +02:00
Timothée Alby 7cdcd725fd Revert "Use Multiple Emails" 2018-06-07 18:44:59 +02:00
Alberto Fernández Capel c4250e601e Minor copy change Registered -> Accepted invite 2018-06-07 16:53:19 +01:00
Alberto Fernández Capel 85f4a31585 Proper coffee syntax 2018-06-07 16:49:17 +01:00
Jessica Lawshe 6c92238f37 Fix analytics event label for when shouldABTestPlans: false 2018-06-07 10:30:21 -05:00
Jessica Lawshe 484ee9ad61 Should not AB test when signed up before 2018-06-06 2018-06-07 10:30:21 -05:00
Alberto Fernández Capel a3bb99d755 Honour invited_emails for the team being
We'll remove them soon, but we want to keep them for a while so
recent invites can join their teams.
2018-06-07 16:22:38 +01:00
Alberto Fernández Capel 670f24ef6f Simplify method name 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel 30b935befd Prevent double rendering error 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel d1b1e6c299 Do not include the Licence ending in domain invites
So the message reads like "University of Notre Dame has invited
you to join a team on Overleaf" instead of ""University of Notre
Dame licence..."
2018-06-07 16:12:02 +01:00
Alberto Fernández Capel 88d12b43ac Make CTA message match regular message 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel 5e70825c94 Rename view variable to invite
Makes the meaning more explicit
2018-06-07 16:12:02 +01:00
Hugh O'Brien 6f5c777163 Merge pull request #622 from sharelatex/hb-take-emis-names-as-input
Take user entered first and last names for EMIS
2018-06-07 15:52:33 +01:00
Timothée Alby 0516a7ed79 Merge pull request #630 from sharelatex/ta-multi-emails-script
Script to Backfill Secondary Emails
2018-06-07 15:40:55 +02:00
Timothée Alby f422b7242d Merge pull request #603 from sharelatex/ta-use-multi-emails
Use Multiple Emails
2018-06-07 15:40:43 +02:00
Alasdair Smith c4c9441995 Adjust caret down 2018-06-07 14:13:19 +01:00
Alasdair Smith ad13eccfa7 Flatten rules for readability 2018-06-07 14:13:19 +01:00
Alasdair Smith 9ae92dbeef Small icon & math icon styling 2018-06-07 14:13:19 +01:00
Alasdair Smith ea18d606c4 Nicer v2 styles 2018-06-07 14:13:19 +01:00
Alasdair Smith 12d7eb8a46 Adjust styling to work with wrapper 2018-06-07 14:13:19 +01:00
Alasdair Smith 611a6f9c0b Reduce width of overflowed button menu 2018-06-07 14:13:19 +01:00
Alasdair Smith c5f62d3aa3 Style dropdown & clean up naming 2018-06-07 14:13:19 +01:00
Alasdair Smith aaf5da877e Style different buttons 2018-06-07 14:10:33 +01:00
Alasdair Smith 7384cfba1a Style wrapped buttons so the toolbar can be resized 2018-06-07 14:09:02 +01:00
Alasdair Smith bfaa6d8dcc Improve styling of buttons 2018-06-07 14:05:21 +01:00
Alberto Fernández Capel 6639f61a43 Remove extra space between rows 2018-06-07 14:05:10 +01:00
James Allen c2ef93b212 Merge pull request #610 from sharelatex/ja-sync-from-v2
Tell v1 when refreshing features in v2
2018-06-07 13:30:34 +01:00
hugh-obrien c684fc3383 fix first/last name check bug 2018-06-07 12:57:01 +01:00