Commit Graph

10839 Commits

Author SHA1 Message Date
887926f852 fixed ChunkedUploader with external uploader url 2023-02-28 22:32:56 +03:00
18274f9a99
Merge pull request #1244 from ONLYOFFICE/feature/colloborator
Feature/colloborator
2023-02-28 17:27:05 +04:00
27900054a0
Merge pull request #1242 from ONLYOFFICE/feature/ef-batch
EF: batch operations
2023-02-28 15:48:05 +03:00
c932d935fa Merge branch 'develop' into feature/colloborator 2023-02-28 13:48:08 +04:00
d6962eb442 Files: fixed room invitation 2023-02-28 11:02:16 +03:00
78a2e20edb refactoring 2023-02-27 18:38:01 +03:00
beb1834a0a EF: batch operations 2023-02-27 16:39:52 +03:00
Timofey Boyko
8e59451b4a Merge branch 'develop' into feature/colloborator 2023-02-27 15:22:21 +03:00
03a4dc89dc Settings: refactoring 2023-02-24 17:19:10 +03:00
c8150ac4b0 People: fixed user type filter 2023-02-22 12:54:43 +03:00
a8a67d3180 fix build 2023-02-22 12:22:40 +03:00
38c28bce91 Merge branch 'develop' into bugfix/60994 2023-02-22 11:50:39 +03:00
ca2c9e8b57 Files: refactor 2023-02-21 19:39:00 +03:00
f1d98ce6fd Files: fixed invitation in room 2023-02-21 19:38:47 +03:00
abbd2b837e File: fixed user in room count 2023-02-21 19:38:26 +03:00
3401abb21a Merge branch 'develop' into feature/colloborator 2023-02-21 17:11:39 +03:00
071456c9f3 Files: refactor, fixed for docspace admin 2023-02-21 17:09:28 +03:00
be2bd8d1ac Files: fixed rights for docspace admin 2023-02-21 17:08:26 +03:00
ca5d711c36 People: refactor 2023-02-21 16:53:48 +03:00
6d3cda4b7f Files: refactor 2023-02-21 16:53:35 +03:00
fafc8b567d Files: added collaborator role 2023-02-21 16:34:06 +03:00
306f08b123 Files: added collaborator role, added rights rules, refactor 2023-02-21 16:33:41 +03:00
24178d9a13 Files: changed error message 2023-02-21 16:23:50 +03:00
007733dfeb Files: removed unnecessary 2023-02-21 16:23:28 +03:00
cb398c0a51 Files: changed error message 2023-02-21 16:20:44 +03:00
1c3d3bf132 Merge branch 'develop' into feature/fix-webhooks-second
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
2023-02-21 14:33:26 +03:00
3269d48e15 added new table 2023-02-21 14:22:34 +03:00
5e9f12a797 backend: refactoring 2023-02-20 23:10:49 +03:00
bcc0866830 Files: ban on creating rooms fro collaborator 2023-02-20 12:12:29 +03:00
6f34d873ee People: refactor 2023-02-20 11:16:44 +03:00
c32ab68e63 Files: refactor 2023-02-20 11:16:37 +03:00
047df24bf4 fix Bug 60994 2023-02-20 09:47:40 +03:00
2be40a9c50 People: refactor 2023-02-17 17:53:30 +03:00
07dc7dab20 People: refactor, added collaborator 2023-02-17 17:40:25 +03:00
25859e5d4e refactoring 2023-02-17 15:56:40 +03:00
10c637e822 Root folders renamed 2023-02-16 19:36:47 +03:00
f738a8b830 Merge branch 'develop' into feature/entries-trash-origin 2023-02-15 17:29:23 +03:00
2a12f4ca0a Files: added 30 days gap 2023-02-15 13:27:01 +03:00
8767b227e4 Files: fixed crash, refactor 2023-02-15 13:11:11 +03:00
b50cb78bf6 fix Bug 61155 2023-02-14 15:08:31 +03:00
66806facb4 thumbnails: added cache key to url. added crop image after resize. replace _ => hash key 2023-02-14 10:57:21 +03:00
9992f3ca5e files.service: thumbnail refactoring 2023-02-10 17:13:01 +03:00
0476363100 Merge branch 'develop' into feature/entries-trash-origin 2023-02-10 12:45:26 +03:00
8504155fe2 Files: optimization 2023-02-10 11:44:35 +03:00
a86d256ef1 Files: added precompiled query 2023-02-10 11:40:31 +03:00
9d79ba87d2 Files: fix 2023-02-10 11:38:07 +03:00
aefe06b98c Files: changed origin getting logic, removed unnecessary 2023-02-09 19:11:36 +03:00
40a25e7cc2 Files: fixed performance drop 2023-02-09 19:06:58 +03:00
e5e3925b00 Files: removed unnecessary 2023-02-09 19:05:57 +03:00
01125f54a8 Merge branch 'master' into feature/entries-trash-origin 2023-02-08 15:27:14 +03:00