|
|
56e0760f96
|
Files: fix CORS
|
2022-11-21 11:07:17 +03:00 |
|
|
|
9a03f19b62
|
add semaphore
|
2022-11-19 05:40:13 +03:00 |
|
|
|
e940da5480
|
fix fileOperation
|
2022-11-19 05:40:00 +03:00 |
|
|
|
35e22fe8c8
|
Merge branch 'develop' into feature/fix-whitelable
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
# web/ASC.Web.Core/LogoUploader.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-11-18 16:48:19 +03:00 |
|
|
|
d509f1e31b
|
fix FileMoveCopyOperation
|
2022-11-16 14:36:30 +03:00 |
|
|
|
ca5e0e4d1e
|
fix
|
2022-11-16 11:18:24 +03:00 |
|
|
|
7d9d8fcba3
|
Files: tag dao. Async
|
2022-11-15 19:10:39 +03:00 |
|
|
|
e5863dddcc
|
fix
|
2022-11-15 17:07:51 +03:00 |
|
|
|
e17ef78c00
|
fix
|
2022-11-15 14:22:53 +03:00 |
|
|
|
b379931d1f
|
fix whitelabel
|
2022-11-15 14:11:44 +03:00 |
|
|
|
00bc874422
|
Files: Socket. remove tags
|
2022-11-14 20:21:49 +03:00 |
|
|
|
4432bf7d22
|
Socket: async, refactoring
Files: markasnew
|
2022-11-13 20:33:19 +03:00 |
|
|
|
a3832db2f6
|
Files: added filtering by member for administrator
|
2022-11-10 15:15:50 +03:00 |
|
|
|
d733880485
|
dark whitelabel
|
2022-11-09 16:30:56 +03:00 |
|
|
|
789ab8f956
|
Merge branch 'develop' into feature/refactoring-saveUserInfo
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Core/FilesModule.cs
# products/ASC.Files/Service/Core/FoldersModule.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
|
2022-11-09 12:57:16 +03:00 |
|
|
|
a9fc7a14ed
|
Removed old code
|
2022-11-08 13:57:51 +03:00 |
|
|
|
2ae75ec762
|
fix ide001
|
2022-11-07 12:49:29 +03:00 |
|
|
|
ca85ef1d49
|
fix usings
|
2022-11-07 12:34:50 +03:00 |
|
|
|
14a64f4ad0
|
Merge branch 'develop' into feature/remove-waste
# Conflicts:
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Program.cs
# common/services/ASC.ApiSystem/Startup.cs
# products/ASC.CRM/Server/Classes/Global.cs
# products/ASC.Files/Server/ProductEntryPoint.cs
# web/ASC.Web.Core/QuotaSync.cs
|
2022-11-07 11:25:54 +03:00 |
|
|
|
6d61e2013e
|
Files: fix rooms constraints
|
2022-11-03 16:07:41 +03:00 |
|
|
|
e5393096a7
|
Merge pull request #972 from ONLYOFFICE/bugfix/rooms
Bugfix/rooms
|
2022-11-02 19:05:17 +03:00 |
|
|
|
07937d9beb
|
fix
|
2022-11-02 14:07:27 +03:00 |
|
|
|
7d1717ac3e
|
fix
|
2022-11-02 14:06:05 +03:00 |
|
|
|
34bda20eb0
|
Merge branch 'develop' into feature/recalculate-user-quota
# Conflicts:
# products/ASC.People/Server/Api/UserController.cs
|
2022-11-02 13:40:53 +03:00 |
|
|
|
141bed97b4
|
Merge branch 'develop' into feature/refactoring-saveUserInfo
|
2022-11-02 11:16:29 +03:00 |
|
|
|
434a34c021
|
Merge branch 'develop' into bugfix/rooms
|
2022-11-02 10:48:26 +03:00 |
|
|
|
606e851a34
|
FileOperation inherited DistributedTaskProgress
|
2022-11-01 18:44:05 +03:00 |
|
|
|
052249b4ef
|
Files: fixed when room access was 0
|
2022-10-31 13:13:35 +03:00 |
|
|
|
7a01578f0c
|
Merge pull request #939 from ONLYOFFICE/feature/remove-new-TenantQuotaController
remove "new TenantQuotaController"
|
2022-10-31 13:03:28 +03:00 |
|
|
|
0f72136ff0
|
Merge branch 'develop' into bugfix/rooms
|
2022-10-31 11:34:50 +03:00 |
|
|
|
e197a7b506
|
Quota: fix
|
2022-10-28 17:35:22 +03:00 |
|
|
|
ef10f570f5
|
Files: fixed incorrect setting user type
|
2022-10-28 16:24:58 +03:00 |
|
|
|
7978fcbdfd
|
Files: added correct parent folder id for thirdparty room
|
2022-10-28 15:44:23 +03:00 |
|
|
|
8835bc9bac
|
Files: added correct path for thirdparty rooms
|
2022-10-28 15:43:17 +03:00 |
|
|
|
0baa36c1c0
|
GetDataStore tenant string to int
|
2022-10-28 15:23:51 +03:00 |
|
|
|
78bd9f0e13
|
Merge branch 'develop' into feature/invite-accounts
|
2022-10-27 19:18:07 +03:00 |
|
|
|
aac059274e
|
Quota: fix
|
2022-10-27 17:44:20 +03:00 |
|
|
|
dbaf6bb264
|
remove unused resources
|
2022-10-27 16:15:08 +03:00 |
|
|
|
95a1743258
|
Revert "remove unused resources"
This reverts commit 2d99753676.
|
2022-10-27 16:01:32 +03:00 |
|
|
|
fa9dd5bd94
|
rename singnalR to socket
|
2022-10-27 15:37:26 +03:00 |
|
|
|
deb0c5beb7
|
remove .wait and .result
|
2022-10-27 13:49:42 +03:00 |
|
|
|
eb485d035a
|
Api.Core: added employee type
|
2022-10-26 17:38:47 +03:00 |
|
|
|
fe5385053c
|
rebbitmq: split default queue on separate queue
|
2022-10-26 17:21:37 +03:00 |
|
|
|
92ef73eb86
|
async UpdateUserInfo and SaveUserInfo
|
2022-10-25 18:27:56 +03:00 |
|
|
|
128527a809
|
Merge branch 'develop' into feature/recalculate-user-quota
|
2022-10-25 17:33:56 +03:00 |
|
|
|
4ad83e7258
|
Quota: quota recalculation check function
|
2022-10-25 17:31:25 +03:00 |
|
|
|
aa29906ab8
|
Files: fix
|
2022-10-25 16:37:52 +03:00 |
|
|
|
b33d55cfe7
|
Quota: fix
|
2022-10-24 17:26:29 +03:00 |
|
|
|
6fb1cc2115
|
Files: fix uploading files and folders to virtual rooms root
|
2022-10-24 14:41:54 +03:00 |
|
|
|
ac05302b21
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-21 13:14:00 +03:00 |
|
|
|
e3a093935d
|
Files: archived rooms are readonly
|
2022-10-21 12:57:32 +03:00 |
|
|
|
a0975f1d98
|
Files: added archive folder display for free users
|
2022-10-21 12:55:54 +03:00 |
|
|
|
6785bfb512
|
Files: check quota while unarchive room
|
2022-10-20 19:18:54 +03:00 |
|
|
|
60f2393940
|
Quota: fix
|
2022-10-20 14:53:38 +03:00 |
|
|
|
1f5605eb84
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-20 14:24:12 +03:00 |
|
|
|
2352ab01b6
|
Files: fix deleting folders from trash
|
2022-10-20 12:35:46 +03:00 |
|
|
|
9c99f3a53f
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-19 19:41:39 +03:00 |
|
|
|
2d99753676
|
remove unused resources
|
2022-10-19 18:39:42 +03:00 |
|
|
|
ea86b81c7e
|
Quota: fix
|
2022-10-19 18:04:31 +03:00 |
|
|
|
22a24de659
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-19 15:31:14 +03:00 |
|
|
|
afc9d1ce17
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-19 14:18:52 +03:00 |
|
|
|
9df8c0d69f
|
Quota: fix
|
2022-10-18 21:37:16 +03:00 |
|
|
|
be8b455718
|
Files: UsersInRoom feature
|
2022-10-18 17:12:35 +03:00 |
|
|
|
a2d144514d
|
refactor
|
2022-10-18 14:22:02 +03:00 |
|
|
|
6c476010fd
|
Files: fix file lock
|
2022-10-17 18:30:51 +03:00 |
|
|
|
a1ee600ae6
|
Files: fix security
|
2022-10-17 18:21:40 +03:00 |
|
|
|
ed22136269
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-17 14:31:57 +03:00 |
|
|
|
7280d2d52b
|
Merge branch 'develop' into feature/recalculate-user-quota
|
2022-10-17 14:20:31 +03:00 |
|
|
|
9ed0b00594
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-17 12:58:06 +03:00 |
|
|
|
a9a02cb0d5
|
Files: changed sharing rules
|
2022-10-17 12:56:51 +03:00 |
|
|
|
ddcb1f4789
|
Files: removed archiving for room admin
|
2022-10-17 12:56:26 +03:00 |
|
|
|
a77b213f75
|
fix jwt
|
2022-10-17 11:39:59 +03:00 |
|
|
|
669a5116d5
|
Merge pull request #876 from ONLYOFFICE/feature/rooms-counter-new
Feature/rooms counter new
|
2022-10-14 19:23:38 +04:00 |
|
|
|
21075fd4c3
|
Quota: fix
|
2022-10-13 17:45:09 +03:00 |
|
|
|
5a7d46a6fd
|
Files: hid trash for user
|
2022-10-13 15:34:35 +03:00 |
|
|
|
8baaa2b83e
|
Files: fix for visiotor
|
2022-10-13 15:26:12 +03:00 |
|
|
|
efde1f00a9
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-13 13:37:05 +03:00 |
|
|
|
44149d47b7
|
Users: trash, favorites, recent folders
|
2022-10-12 18:53:48 +03:00 |
|
|
|
e3e6062e23
|
Files: fix creating tags for room administrators
|
2022-10-12 18:08:27 +03:00 |
|
|
|
39d101c95d
|
Files: fix unarchiving room for room administrator
|
2022-10-12 18:08:06 +03:00 |
|
|
|
f23b5efb52
|
Files: fix
|
2022-10-12 17:05:12 +03:00 |
|
|
|
b1bd5a100f
|
Quota: recalculate user quota
|
2022-10-12 14:23:57 +03:00 |
|
|
|
b8486d22de
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-12 14:03:36 +03:00 |
|
|
|
61a977b972
|
Files: hide archive for visitors
|
2022-10-11 17:59:40 +03:00 |
|
|
|
6d78f37729
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-11 16:05:49 +03:00 |
|
|
|
fcabf8b73c
|
fix
|
2022-10-11 11:13:22 +03:00 |
|
|
|
b160c16fc2
|
creating rooms and users feature available only for paid portals
|
2022-10-11 11:02:43 +03:00 |
|
|
|
cf2547e030
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/common/constants/index.js
|
2022-10-11 10:20:42 +03:00 |
|
|
|
4dbf1e70b7
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.ActiveDirectory/GlobalUsings.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
|
2022-10-10 19:16:03 +03:00 |
|
mushka
|
8e2335416a
|
removed unused file
|
2022-10-07 18:55:26 +03:00 |
|
mushka
|
aecc841e55
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-07 17:15:15 +03:00 |
|
|
|
5b96dbdb55
|
removed DbUsersQuotaRow
|
2022-10-07 16:37:57 +03:00 |
|
|
|
cc0f93603f
|
Files: fix room admin rights
|
2022-10-06 16:10:30 +03:00 |
|
|
|
bfdfd371cf
|
fix
|
2022-10-06 14:57:50 +03:00 |
|
|
|
8f3cfca11f
|
Files: updated permissions for room administrators
|
2022-10-05 15:32:22 +03:00 |
|
|
|
20e37c254d
|
Files: added parameter for filtering by provider
|
2022-10-03 17:56:54 +03:00 |
|
|
|
627e6b75fc
|
Files: fix
|
2022-10-03 12:15:20 +03:00 |
|
|
|
8f7216d506
|
Files: added room filtering by provider type
|
2022-10-03 11:45:02 +03:00 |
|
|
|
1618d0cd39
|
Files: fix
|
2022-10-03 10:09:46 +03:00 |
|
|
|
e2fc3476b2
|
Files: fix favorites
|
2022-09-30 14:21:43 +03:00 |
|
