|
|
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 |
|
|
|
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 |
|
|
|
f750a58988
|
Files: enabled auto cleaning trash by default
|
2023-02-08 15:01:05 +03:00 |
|
|
|
6d363d4abd
|
Webhooks: settings
|
2023-02-08 14:46:33 +03:00 |
|
|
|
e58175f69e
|
WebHooks: added resources, new methods and settings for disable webhook
|
2023-02-08 14:17:06 +03:00 |
|
|
|
e48298195d
|
Files: added auto deletion time
|
2023-02-08 14:03:19 +03:00 |
|
|
|
5a71927498
|
Files: refactor
|
2023-02-08 14:02:47 +03:00 |
|
|
|
91d1b4e422
|
Files: added sorting by origin room
|
2023-02-08 13:19:16 +03:00 |
|
|
|
b63bfc4de5
|
Files: added filter by origin room
|
2023-02-07 19:18:32 +03:00 |
|
|
|
084a2aeef1
|
Files: refactor
|
2023-02-07 16:50:21 +03:00 |
|
|
|
83c638b98a
|
Files: added origin for folders
|
2023-02-07 16:21:31 +03:00 |
|
|
|
fd228caf8a
|
Files: refactor
|
2023-02-07 16:12:46 +03:00 |
|
|
|
c89b8ca427
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs
# common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
|
2023-02-07 14:31:22 +03:00 |
|
|
|
c3111eb8ae
|
Files: fixed query
|
2023-02-07 13:51:18 +03:00 |
|
|
|
604bc27e88
|
files: added logs
|
2023-02-07 00:35:13 +03:00 |
|
|
|
1d6192d067
|
Files: added origin in trash for files
|
2023-02-06 18:35:07 +03:00 |
|
|
|
dbb81e3752
|
Files: added base mapping action
|
2023-02-06 18:24:50 +03:00 |
|
|
|
e7f7c81784
|
Files: added Origin tag
|
2023-02-06 18:18:49 +03:00 |
|
