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 |
|
Alasdair Smith
|
7dffc56804
|
Clone project action button
|
2018-05-31 10:05:04 +01:00 |
|
Alasdair Smith
|
2354f4156b
|
Download project action button
|
2018-05-31 10:04:59 +01:00 |
|
Alasdair Smith
|
ffc06f2a3b
|
Archive project action button
|
2018-05-31 10:04:50 +01:00 |
|
Alasdair Smith
|
a2dff4bfbb
|
Right align actions header
|
2018-05-31 09:59:35 +01:00 |
|
Alasdair Smith
|
83c62c8ab1
|
Only show action buttons on v2
|
2018-05-31 09:58:39 +01:00 |
|
Alasdair Smith
|
2d1bcda9ff
|
Style action buttons, and hide on smaller screens
|
2018-05-31 09:58:39 +01:00 |
|
Alasdair Smith
|
20cca0fcd4
|
Add action buttons to project list
|
2018-05-31 09:58:18 +01:00 |
|
Jessica Lawshe
|
be35e37d29
|
Style for CMS pages
|
2018-05-30 15:54:10 -05:00 |
|
James Allen
|
4f5148e668
|
Wrap text like normal
|
2018-05-30 17:55:47 +01:00 |
|
Paulo Reis
|
6e7e76a3ce
|
Margin and padding adjustments.
|
2018-05-30 17:34:46 +01:00 |
|
Henry Oswald
|
a747480425
|
add references host into settings
|
2018-05-30 15:28:59 +01:00 |
|
Paulo Reis
|
7cb4280a4d
|
Remove commented-out code.
|
2018-05-30 15:18:15 +01:00 |
|
Paulo Reis
|
66d7bdb26b
|
Change buttons copy.
|
2018-05-30 15:03:22 +01:00 |
|
Paulo Reis
|
aec4ea79ad
|
Make history file tree more like the editor file tree in SL.
|
2018-05-30 15:00:20 +01:00 |
|
Paulo Reis
|
4c4a4f10c1
|
Rename history file tree and move it around.
|
2018-05-30 14:21:01 +01:00 |
|
Alberto Fernández Capel
|
9aa95cb0d5
|
Show team invites
|
2018-05-30 13:06:27 +01:00 |
|
James Allen
|
e0e88b25fe
|
Make agrument checking more robust
|
2018-05-30 12:48:08 +01:00 |
|
Alasdair Smith
|
d0b160d9a2
|
Rename flag for clarity
|
2018-05-30 11:55:09 +01:00 |
|
Alasdair Smith
|
c6d2b4f1e7
|
Use single rich text include instead of split toolbar & body includes
|
2018-05-30 11:44:27 +01:00 |
|
Alberto Fernández Capel
|
7e09c0e0b1
|
First stab at email token invites (WIP)
|
2018-05-30 11:29:21 +01:00 |
|
Paulo Reis
|
637c492e6e
|
Merge branch 'master' into pr-v2-history-ui
|
2018-05-30 11:24:33 +01:00 |
|