dbd6ea30e9
Improve robustness of email validation
2018-06-11 15:22:42 +01:00
ed5bc70350
Tweak front-end layout
2018-06-11 14:20:46 +01:00
155102df64
Use Error classes, and ensure invited_emails is cleared on new invite
2018-06-11 14:20:35 +01:00
b716f59442
Remove deprecated removeEmailInviteFromGroup
2018-06-11 14:19:47 +01:00
59688efb56
Merge remote-tracking branch 'origin/master' into afc-email-tokens
2018-06-08 12:21:17 +01:00
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
57775e60b1
Merge remote-tracking branch 'origin/master' into afc-update-user-references
2018-06-08 11:28:58 +01:00
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
5159f6f33d
Check the subscription is in a group plan before adding new members
2018-06-08 09:58:51 +01:00
7cdcd725fd
Revert "Use Multiple Emails"
2018-06-07 18:44:59 +02:00
c4250e601e
Minor copy change Registered -> Accepted invite
2018-06-07 16:53:19 +01:00
85f4a31585
Proper coffee syntax
2018-06-07 16:49:17 +01:00
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
670f24ef6f
Simplify method name
2018-06-07 16:12:02 +01:00
30b935befd
Prevent double rendering error
2018-06-07 16:12:02 +01:00
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
88d12b43ac
Make CTA message match regular message
2018-06-07 16:12:02 +01:00
5e70825c94
Rename view variable to invite
...
Makes the meaning more explicit
2018-06-07 16:12:02 +01:00
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
f422b7242d
Merge pull request #603 from sharelatex/ta-use-multi-emails
...
Use Multiple Emails
2018-06-07 15:40:43 +02:00
6639f61a43
Remove extra space between rows
2018-06-07 14:05:10 +01:00
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
c684fc3383
fix first/last name check bug
2018-06-07 12:57:01 +01:00
959db80177
Check all emails to prevent invite duplicates
2018-06-07 12:49:46 +01:00
f3c871a972
Merge pull request #640 from sharelatex/as-fix-leave-quick-action
...
Show leave quick action instead of archive for unowned projects
2018-06-07 11:44:36 +01:00
566c41cafd
Merge remote-tracking branch 'origin/master' into afc-email-tokens
2018-06-07 11:40:03 +01:00
1fc047d08e
Fix invitation resend
2018-06-06 17:11:25 +01:00
8f71b104c5
Fix bug where unowned project would show archive quick action instead of leave
...
If the user does not own the project, the project can only be left, not
archived. Previously the quick action button was only showing the archive icon
but clicking the button would correctly leave the project. This is confusing,
so this commit corrects to show the leave icon for projects not owned by the
current user
2018-06-06 16:59:13 +01:00
4885b70016
Better translation key
2018-06-06 16:33:01 +01:00
06efe1910b
Replace hardcoded string
2018-06-06 15:36:53 +01:00
b308dcef63
Clean up markup
...
- Avoid nested rows without cols in them
- Use .row-spaced instead of empty rows to space content
2018-06-06 15:36:53 +01:00
553878064b
Resend email if the user has already been invited
2018-06-06 15:36:53 +01:00
16cb5e0d35
Propagate the error further up the stack
...
Useful for error reporting and metrics.
2018-06-06 15:36:53 +01:00
8a317b5bfe
Better wording
2018-06-06 15:36:53 +01:00
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
3cb499a3c2
add comment
2018-06-06 15:46:41 +02:00
e4da748257
add filter to query on emails attribute
2018-06-06 14:52:09 +02:00
813289f5de
use multiple emails when relevant
2018-06-06 11:45:01 +02:00
c5530163f5
add emails attribute on user creation
2018-06-06 11:45:01 +02:00
1f6fcafce6
remove default emails attribute on user model
2018-06-06 11:11:57 +02:00
6fb6119ca8
Merge remote-tracking branch 'origin' into afc-email-tokens
2018-06-05 15:42:17 +01:00
613c9193e3
implement multi emails logic
2018-06-05 16:42:12 +02:00
b63384cbf1
Merge pull request #537 from sharelatex/jel-pricing-plans
...
Plans and pricing variant
2018-06-05 09:30:43 -05:00
bfad95ae61
File restore button needs to be smaller to fit the new toolbar height.
2018-06-05 13:59:27 +01:00
4088c164c9
Update translations; use underscores for keys.
2018-06-05 11:15:39 +01:00
8e5032fb34
Merge branch 'master' into pr-v2-history-ui
2018-06-05 10:55:42 +01:00
1624639bc8
Merge branch 'pr-v2-history-ui' of github.com:sharelatex/web-sharelatex-internal into pr-v2-history-ui
2018-06-05 10:32:06 +01:00
f858786f2d
Add i18n.
2018-06-05 10:14:16 +01:00
10cf5825a5
Add plans variant
...
Also, fix for multiple quotes. Without a closing quote subsequent quotes are considered nested, and
will use a ‘ instead of “
Also, move repeated elements to partials
2018-06-04 14:42:26 -05:00
54ce196500
test custom first and last name for exports
2018-06-04 13:16:21 +01:00
James Allen