|
|
0baa36c1c0
|
GetDataStore tenant string to int
|
2022-10-28 15:23:51 +03:00 |
|
|
|
fa24e98df6
|
fix IpSecurityFilter
|
2022-10-28 10:58:13 +03:00 |
|
|
|
e72349ae16
|
restore files
|
2022-10-28 10:48:46 +03:00 |
|
|
|
86daa32280
|
People: fix
|
2022-10-28 10:34:03 +03:00 |
|
|
|
78bd9f0e13
|
Merge branch 'develop' into feature/invite-accounts
|
2022-10-27 19:18:07 +03:00 |
|
|
|
342343a1e1
|
Merge pull request #925 from ONLYOFFICE/feature/rights-rework
Feature/rights rework
|
2022-10-27 19:59:03 +04:00 |
|
|
|
35daece00c
|
fix asc.data.storage.encryption
|
2022-10-27 15:54:52 +03:00 |
|
|
|
fa9dd5bd94
|
rename singnalR to socket
|
2022-10-27 15:37:26 +03:00 |
|
|
|
d54a2fc79e
|
rename file
|
2022-10-27 15:33:06 +03:00 |
|
|
|
ee3714795e
|
fix
|
2022-10-27 14:18:39 +03:00 |
|
|
|
0f3490b977
|
DoJob return task
|
2022-10-27 14:14:41 +03:00 |
|
|
|
ef7215fbe3
|
fix
|
2022-10-27 14:06:37 +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 |
|
|
|
37e52ea733
|
Core.Common: fix for invated users
|
2022-10-25 23:16:54 +03:00 |
|
|
|
22d800afcd
|
Core.Common: added new type
|
2022-10-25 23:15:57 +03:00 |
|
|
|
972d66e4ea
|
Core.Common: fix invalidate cache
|
2022-10-25 23:15:35 +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 |
|
|
|
ce77e31bb4
|
rabbitmq: fixed consumer recieved messages
|
2022-10-25 17:28:41 +03:00 |
|
|
|
277ca1c2cb
|
fixed field number generator
|
2022-10-25 16:08:23 +03:00 |
|
|
|
42b4787899
|
refactoring saveUserInfo
|
2022-10-24 18:30:17 +03:00 |
|
|
|
bc12140f9e
|
Skip pt-BR from DublicatesFilesByMD5HashTest
|
2022-10-24 11:01:11 +03:00 |
|
|
|
d316a68b51
|
Fix _md5ExcludesPath
|
2022-10-21 19:23:58 +03:00 |
|
|
|
34490919b1
|
Added Utils.ConvertPathToOS method
|
2022-10-21 19:07:07 +03:00 |
|
|
|
31c90ae95a
|
Added more logs
|
2022-10-21 18:31:31 +03:00 |
|
|
|
3ae92932a2
|
Removed invalid chars
|
2022-10-21 17:30:07 +03:00 |
|
|
|
8d0d536bf6
|
Fix path issues
|
2022-10-21 17:21:12 +03:00 |
|
|
|
00d5c50c5e
|
remove "new TenantQuotaController"
|
2022-10-21 16:40:20 +03:00 |
|
|
|
ac05302b21
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-21 13:14:00 +03:00 |
|
|
|
60f2393940
|
Quota: fix
|
2022-10-20 14:53:38 +03:00 |
|
|
|
d2bc57cbb1
|
Quota: fixed deleting quota
|
2022-10-20 14:47:45 +03:00 |
|
|
|
ea47a3c31e
|
Quota: fixed adding quota
|
2022-10-20 14:38:38 +03:00 |
|
|
|
ba01d9dacd
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/letters
# Conflicts:
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
|
2022-10-20 13:56:13 +03:00 |
|
|
|
f01376cc56
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-20 11:24:20 +03:00 |
|
|
|
35592fd306
|
Quota: fix
|
2022-10-19 19:27:04 +03:00 |
|
|
|
ea86b81c7e
|
Quota: fix
|
2022-10-19 18:04:31 +03:00 |
|
|
|
0a955950e6
|
fix
|
2022-10-19 17:11:52 +03:00 |
|
|
|
2b95553037
|
another fix quota
|
2022-10-19 16:22:13 +03:00 |
|
|
|
22a24de659
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-19 15:31:14 +03:00 |
|
|
|
0ad23f779c
|
fix quota
|
2022-10-19 14:53:56 +03:00 |
|
|
|
a1ff4230a7
|
fix merge
|
2022-10-19 14:30:14 +03:00 |
|
|
|
afc9d1ce17
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-19 14:18:52 +03:00 |
|
|
|
16bb42d0af
|
fix ASC.Data.Storage.Encryption
|
2022-10-19 13:12:33 +03:00 |
|
|
|
4e0d77a239
|
fix wizard
|
2022-10-19 12:48:23 +03:00 |
|
|
|
9df8c0d69f
|
Quota: fix
|
2022-10-18 21:37:16 +03:00 |
|
|
|
a2afba0a28
|
Quota: fix
|
2022-10-18 18:13:35 +03:00 |
|
|
|
be8b455718
|
Files: UsersInRoom feature
|
2022-10-18 17:12:35 +03:00 |
|
|
|
1a5c273825
|
refactor
|
2022-10-18 14:43:31 +03:00 |
|
|
|
7af080486c
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-18 14:32:17 +03:00 |
|
|
|
a2d144514d
|
refactor
|
2022-10-18 14:22:02 +03:00 |
|
|
|
502aac91b1
|
ApiSystem: log, service
|
2022-10-17 18:24:50 +03:00 |
|
|
|
c938a98d00
|
fix ValidateDomain
|
2022-10-17 17:48:41 +03:00 |
|
|
|
65a066b61e
|
fix merge
|
2022-10-17 16:21:09 +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 |
|
|
|
b81d6e44b3
|
Merge branch 'feature/apisystem' of github.com:ONLYOFFICE/DocSpace into feature/apisystem
|
2022-10-17 13:05:22 +03:00 |
|
|
|
5cbae9e177
|
Merge branch 'develop' into feature/apisystem
|
2022-10-17 13:04:49 +03:00 |
|
|
|
19ad5b0ef2
|
fix api system
|
2022-10-17 12:15:44 +03:00 |
|
|
|
a77b213f75
|
fix jwt
|
2022-10-17 11:39:59 +03:00 |
|
|
|
e2ccab3c97
|
ApiSystem: fix
|
2022-10-14 17:52:00 +03:00 |
|
|
|
b70b89d939
|
fix headers
|
2022-10-14 12:26:02 +03:00 |
|
|
|
7e17ec27e7
|
fix
|
2022-10-14 11:56:01 +03:00 |
|
|
|
cd25dcc8b3
|
Merge branch 'develop' into feature/apisystem
|
2022-10-14 11:27:19 +03:00 |
|
|
|
d6441948f3
|
Quota: fix
|
2022-10-13 18:12:04 +03:00 |
|
|
|
21075fd4c3
|
Quota: fix
|
2022-10-13 17:45:09 +03:00 |
|
|
|
d5d78e7550
|
Merge pull request #892 from ONLYOFFICE/feature/local-restore
fix local restore
|
2022-10-13 16:22:59 +03:00 |
|
|
|
c7fbe5d87c
|
Billing: fix cache
|
2022-10-13 12:30:24 +03:00 |
|
diana-vahomskaya
|
a2f120e86a
|
fixed letters for DocSpace, added new text for footer: TextForFooterUnsubsribeDocSpace
|
2022-10-13 11:53:18 +03:00 |
|
|
|
1c5bea4fcc
|
fix cache
|
2022-10-12 17:02:07 +03:00 |
|
|
|
c1208e931a
|
added support ActiveMQ EventBus
|
2022-10-12 14:43:00 +03:00 |
|
|
|
42c12ca706
|
Added AllowSuspendedFilter
|
2022-10-12 12:29:08 +03:00 |
|
|
|
0a1ab5c77d
|
ApiSystem: fix
|
2022-10-11 15:52:45 +03:00 |
|
|
|
ded6b08e0e
|
fix GetTmpFilePath
|
2022-10-11 15:29:23 +03:00 |
|
|
|
dc2cfbc614
|
Merge branch 'develop' into feature/apisystem
# Conflicts:
# web/ASC.Web.Core/PublicResources/Resource.resx
|
2022-10-11 13:53:31 +03:00 |
|
|
|
9d050b0c6a
|
fix
|
2022-10-11 13:14:50 +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
|
415c620574
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-10 17:27:16 +03:00 |
|
|
|
a563bbe3cf
|
Merge branch 'develop' into feature/two-factor-authentication
# Conflicts:
# web/ASC.Web.Api/Api/AuthenticationController.cs
|
2022-10-09 21:32:14 +03:00 |
|
mushka
|
aecc841e55
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-07 17:15:15 +03:00 |
|
|
|
302b9c57ff
|
fix
|
2022-10-07 17:08:38 +03:00 |
|
|
|
e3bcada474
|
fix
|
2022-10-07 16:49:03 +03:00 |
|
|
|
c8e6578c11
|
fix
|
2022-10-07 16:48:06 +03:00 |
|
|
|
5b96dbdb55
|
removed DbUsersQuotaRow
|
2022-10-07 16:37:57 +03:00 |
|
|
|
090259d313
|
Merge branch 'feature/user-quota' of https://github.com/ONLYOFFICE/DocSpace into feature/user-quota
|
2022-10-06 15:56:37 +03:00 |
|
|
|
4ebd5323c0
|
Quota: fix
|
2022-10-06 15:55:47 +03:00 |
|
|
|
62c6f366df
|
fix local restore
|
2022-10-06 15:51:15 +03:00 |
|
|
|
f655620485
|
Quota: fix
|
2022-10-06 15:17:07 +03:00 |
|
|
|
143cc76066
|
fix
|
2022-10-06 12:01:43 +03:00 |
|
|
|
89390657cf
|
fix
|
2022-10-06 11:43:16 +03:00 |
|
|
|
11ffccf983
|
fix
|
2022-10-06 11:22:10 +03:00 |
|
|
|
cfbbf351db
|
fix
|
2022-10-05 15:25:08 +03:00 |
|
|
|
400fc49bb6
|
api system
-fix api system
-TenantName from resources
|
2022-10-05 14:23:53 +03:00 |
|
|
|
803f342d2d
|
Payments: fix delay
|
2022-10-05 13:38:35 +03:00 |
|
|
|
731c32795f
|
Payments: fix cache
|
2022-10-05 12:12:16 +03:00 |
|
|
|
9f9a4c3815
|
Payments: id from billing
|
2022-10-04 15:58:59 +03:00 |
|
