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
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
Alberto Fernández Capel
959db80177
Check all emails to prevent invite duplicates
2018-06-07 12:49:46 +01:00
Alasdair Smith
3fa6f4743d
Merge pull request #637 from sharelatex/as-fix-clone-owner
...
Set the owner object to the current user when cloning a project
2018-06-07 11:54:09 +01:00
Hayden Faulds
87f6c65b99
Merge pull request #625 from sharelatex/hof-container-teardown-timeout
...
reduce acceptance test container teardown timeout to 0
2018-06-07 11:50:16 +01:00
Alasdair Smith
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
Alasdair Smith
89ecb9f01b
Merge pull request #641 from sharelatex/as-fix-autocomplete-blur
...
Fix blurry autocomplete highlight on Chrome
2018-06-07 11:44:25 +01:00
Alberto Fernández Capel
566c41cafd
Merge remote-tracking branch 'origin/master' into afc-email-tokens
2018-06-07 11:40:03 +01:00
Alasdair Smith
4a1c2cf0e0
Set cloned project's owner to current user
...
Fixes a bug where cloning a project then selecting to delete it, the wrong
button for deletion is shown (leave instead of archive/delete). This is
because we are using the owner object (which was undefined after cloning) to
determine which button to show
2018-06-07 11:19:11 +01:00
Tim Alby
458650d456
create script to backfill secondary emails
2018-06-07 11:26:56 +02:00
Alasdair Smith
0900559579
Fix blurrly autocomplete highlight on Chrome
...
The blurrly text shadow is back on Chrome. I suspect it maybe intended, not a
bug, so I've fixed it for all versions of Chrome.
I've replaced with font-weight: bold, which visually has the same appearance
2018-06-06 17:19:12 +01:00
Alberto Fernández Capel
1fc047d08e
Fix invitation resend
2018-06-06 17:11:25 +01:00
Alasdair Smith
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
Alberto Fernández Capel
4885b70016
Better translation key
2018-06-06 16:33:01 +01:00
Alberto Fernández Capel
06efe1910b
Replace hardcoded string
2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
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
Alberto Fernández Capel
553878064b
Resend email if the user has already been invited
2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
16cb5e0d35
Propagate the error further up the stack
...
Useful for error reporting and metrics.
2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
8a317b5bfe
Better wording
2018-06-06 15:36:53 +01:00
