Tim Alby
613c9193e3
implement multi emails logic
2018-06-05 16:42:12 +02:00
Jessica Lawshe
b63384cbf1
Merge pull request #537 from sharelatex/jel-pricing-plans
...
Plans and pricing variant
2018-06-05 09:30:43 -05:00
Nate Stemen
863128a030
only suggest one document environment in project
2018-06-05 10:08:27 -04:00
Paulo Jorge Reis
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
Paulo Reis
bfad95ae61
File restore button needs to be smaller to fit the new toolbar height.
2018-06-05 13:59:27 +01:00
Hayden Faulds
0bb37d4991
move tk call to before sandboxed module call
2018-06-05 13:42:26 +01:00
Paulo Jorge Reis
aeefd0752b
Merge pull request #612 from sharelatex/pr-v2-history-ui
...
V2 history point-in-time-view
2018-06-05 13:24:21 +01:00
Hayden Faulds
be0fd9a446
reduce container teardown timeout to 0
2018-06-05 11:30:48 +01:00
Paulo Reis
4088c164c9
Update translations; use underscores for keys.
2018-06-05 11:15:39 +01:00
Paulo Reis
8e5032fb34
Merge branch 'master' into pr-v2-history-ui
2018-06-05 10:55:42 +01:00
Paulo Reis
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
Paulo Reis
f858786f2d
Add i18n.
2018-06-05 10:14:16 +01:00
Jessica Lawshe
8b672dea0d
Add unit tests
2018-06-04 14:42:26 -05:00
Jessica Lawshe
b1c988e4c1
Add hover and scroll events
2018-06-04 14:42:26 -05:00
Jessica Lawshe
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
Jessica Lawshe
b4a989f0b7
Add contentful
2018-06-04 09:51:40 -05:00
Jessica Lawshe
64ead238e4
Add meta tags
2018-06-04 09:51:35 -05:00
hugh-obrien
54ce196500
test custom first and last name for exports
2018-06-04 13:16:21 +01:00
hugh-obrien
b02eea1e7e
update tests for exports name options
2018-06-04 13:16:21 +01:00
hugh-obrien
4c5f186ca2
take custom first and last names from export UI
2018-06-04 13:16:21 +01:00
Hugh O'Brien
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
Alasdair Smith
d83cb63c8d
Merge pull request #621 from sharelatex/as-fix-restore
...
Fix bug where deleted/archived projects couldn't be restored
2018-06-04 10:49:08 +01:00
Alasdair Smith
7898a1deca
Fix missed snake_case to camelCase, causing bug where projects couldn't be restored
2018-06-04 10:45:23 +01:00
Alberto Fernández Capel
58c4e72b2a
Update references to UserLocator
...
UserLocator was refactored in another branch: UserLocator -> UserGetter
2018-06-01 16:53:16 +01:00
Alberto Fernández Capel
25d7196570
Merge remote-tracking branch 'origin/master' into afc-email-tokens
2018-06-01 16:49:47 +01:00
Alberto Fernández Capel
b0b2546e43
Remove dead code
2018-06-01 16:45:36 +01:00
Alberto Fernández Capel
a73a869d03
I can haz some grammar
2018-06-01 16:17:11 +01:00
Alberto Fernández Capel
7fcdf68296
Remove dead code
2018-06-01 16:05:44 +01:00
Alberto Fernández Capel
3bd18715db
Add some tests
2018-06-01 15:37:09 +01:00
Alberto Fernández Capel
89735f4b8e
Keep method name for compatibility
2018-06-01 15:36:00 +01:00
James Allen
cfbb5c8f24
Remove some dead code
2018-06-01 14:55:07 +01:00
Hugh O'Brien
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
Alberto Fernández Capel
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
Alberto Fernández Capel
385fec1914
Clean up code that uses invited_emails
2018-06-01 11:23:25 +01:00
hugh-obrien
063187b5fc
add function to check for existance of folders
2018-05-31 17:03:41 +01:00
Alberto Fernández Capel
1c485c1884
Improve error handling
2018-05-31 16:42:09 +01:00
Alberto Fernández Capel
d262de14d6
Use team invites to join domain licensed teams
2018-05-31 16:15:47 +01:00
Brian Gough
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
Brian Gough
853d0ab108
Merge pull request #615 from sharelatex/bg-fix-locking-for-copy-project
...
add missing locking to copyFileFromExistingProject
2018-05-31 15:52:19 +01:00
Brian Gough
c4f3a12ce5
add missing locking to copyFileFromExistingProject
2018-05-31 14:51:32 +01:00
Alberto Fernández Capel
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
James Allen
f5367985c3
Don't allow read-only users to restore
2018-05-31 13:44:37 +01:00
hugh-obrien
d47e845367
add v1 template tests
2018-05-31 13:26:54 +01:00
Alberto Fernández Capel
11edfde153
Accept & revoke team invites
2018-05-31 11:54:50 +01:00
hugh-obrien
7f86ddc72c
extract v1 templates code to web
2018-05-31 11:12:31 +01:00
Shane Kilkelly
d3ae276091
Merge pull request #579 from sharelatex/sk-linked-files-from-project
...
Linked Files from Project
2018-05-31 11:08:08 +01:00
Alasdair Smith
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
Alasdair Smith
cc9d18d991
Merge pull request #600 from sharelatex/as-refactor-rt-load
...
Refactor loading rich text
2018-05-31 10:11:01 +01:00
Alasdair Smith
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
Alasdair Smith
5ec238cae8
Switch archive button with restore button for archived projects
2018-05-31 10:05:39 +01:00
