1fc047d08e
Fix invitation resend
2018-06-06 17:11:25 +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
6fb6119ca8
Merge remote-tracking branch 'origin' into afc-email-tokens
2018-06-05 15:42:17 +01:00
b63384cbf1
Merge pull request #537 from sharelatex/jel-pricing-plans
...
Plans and pricing variant
2018-06-05 09:30:43 -05:00
1f19e0e7da
Merge pull request #627 from sharelatex/hof-fix-tk-in-tests
...
move tk call to before sandboxed module call
2018-06-05 14:15:34 +01:00
bfad95ae61
File restore button needs to be smaller to fit the new toolbar height.
2018-06-05 13:59:27 +01:00
0bb37d4991
move tk call to before sandboxed module call
2018-06-05 13:42:26 +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
8b672dea0d
Add unit tests
2018-06-04 14:42:26 -05:00
b1c988e4c1
Add hover and scroll events
2018-06-04 14:42:26 -05: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
63482e0ea0
Merge pull request #617 from sharelatex/hb-check-for-folders-clientside
...
Add function to check for existence of folders
2018-06-04 12:07:25 +01:00
7898a1deca
Fix missed snake_case to camelCase, causing bug where projects couldn't be restored
2018-06-04 10:45:23 +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
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
063187b5fc
add function to check for existance of folders
2018-05-31 17:03:41 +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
f5367985c3
Don't allow read-only users to restore
2018-05-31 13:44:37 +01:00
d47e845367
add v1 template tests
2018-05-31 13:26:54 +01:00
11edfde153
Accept & revoke team invites
2018-05-31 11:54:50 +01:00
7f86ddc72c
extract v1 templates code to web
2018-05-31 11:12:31 +01:00
d3ae276091
Merge pull request #579 from sharelatex/sk-linked-files-from-project
...
Linked Files from Project
2018-05-31 11:08:08 +01:00
57c56a0853
Merge pull request #565 from sharelatex/as-dash-action-btns
...
Add action buttons to v2 dash
2018-05-31 10:11:20 +01:00
cc9d18d991
Merge pull request #600 from sharelatex/as-refactor-rt-load
...
Refactor loading rich text
2018-05-31 10:11:01 +01:00
00808dfc9a
Merge pull request #599 from sharelatex/sk-less-border-radius-on-selects-v2
...
On v2, use smaller (default) border radius on select inputs
2018-05-31 10:10:49 +01:00
5ec238cae8
Switch archive button with restore button for archived projects
2018-05-31 10:05:39 +01:00
7dffc56804
Clone project action button
2018-05-31 10:05:04 +01:00
2354f4156b
Download project action button
2018-05-31 10:04:59 +01:00
ffc06f2a3b
Archive project action button
2018-05-31 10:04:50 +01:00
Alberto Fernández Capel