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
679d91c4d2
Update default plans view conditional
...
Fixes a flash of unwanted content on Firefox
2018-06-05 12:58:18 -05: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
64ead238e4
Add meta tags
2018-06-04 09:51:35 -05:00
54ce196500
test custom first and last name for exports
2018-06-04 13:16:21 +01:00
4c5f186ca2
take custom first and last names from export UI
2018-06-04 13:16:21 +01:00
58c4e72b2a
Update references to UserLocator
...
UserLocator was refactored in another branch: UserLocator -> UserGetter
2018-06-01 16:53:16 +01:00
25d7196570
Merge remote-tracking branch 'origin/master' into afc-email-tokens
2018-06-01 16:49:47 +01:00
b0b2546e43
Remove dead code
2018-06-01 16:45:36 +01:00
a73a869d03
I can haz some grammar
2018-06-01 16:17:11 +01:00
7fcdf68296
Remove dead code
2018-06-01 16:05:44 +01:00
3bd18715db
Add some tests
2018-06-01 15:37:09 +01:00
89735f4b8e
Keep method name for compatibility
2018-06-01 15:36:00 +01:00
cfbb5c8f24
Remove some dead code
2018-06-01 14:55:07 +01:00
a79c9b94a8
Merge pull request #613 from sharelatex/hb-extract-v1-templates-to-web
...
Extract v1 templates code to web
2018-06-01 11:29:36 +01:00
9b18e58b68
Choose a better method name
...
This method is now only notifying users about a potential domain
licence
2018-06-01 11:28:06 +01:00
385fec1914
Clean up code that uses invited_emails
2018-06-01 11:23:25 +01:00
1c485c1884
Improve error handling
2018-05-31 16:42:09 +01:00
d262de14d6
Use team invites to join domain licensed teams
2018-05-31 16:15:47 +01:00
fef667a738
Merge pull request #614 from sharelatex/ja-restrict-restore
...
Don't allow read-only users to restore
2018-05-31 15:52:40 +01:00
c4f3a12ce5
add missing locking to copyFileFromExistingProject
2018-05-31 14:51:32 +01:00
39c8595c27
Split SubscriptionGroupInvites and rename to DomainSubscriptionJoin
...
To not cause confusion with team invites.
They are not really an invite because they are user initiated, but
more of a user choosing to join a team.
2018-05-31 14:25:47 +01:00
Timothée Alby