|
|
e5393096a7
|
Merge pull request #972 from ONLYOFFICE/bugfix/rooms
Bugfix/rooms
|
2022-11-02 19:05:17 +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 |
|
|
|
cec0473d1b
|
Merge branch 'develop' into feature/letters
# Conflicts:
# web/ASC.Web.Core/Notify/Actions.cs
# web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
|
2022-11-02 13:25:49 +03:00 |
|
|
|
d6656b0aa9
|
Merge pull request #968 from ONLYOFFICE/feature/delete-cultureMiddleware-from-api-system
Feature/delete culture middleware from api system
|
2022-11-02 11:55:17 +03:00 |
|
|
|
097ce33ea6
|
ASC.Socket.IO: added yarn.lock
|
2022-11-02 11:14:01 +03:00 |
|
|
|
434a34c021
|
Merge branch 'develop' into bugfix/rooms
|
2022-11-02 10:48:26 +03:00 |
|
|
|
ac46060c96
|
Merge branch 'develop' into feature/delete-cultureMiddleware-from-api-system
|
2022-11-01 15:17:21 +03:00 |
|
|
|
d450457703
|
removed unnecessary call when inviting a user that reduces performance
|
2022-11-01 14:06:31 +03:00 |
|
|
|
46fa46b9e3
|
ASC.Socket.IO: support CloudWatch transport for winston logger
|
2022-11-01 12:54:14 +03:00 |
|
|
|
793daf52d3
|
delete cultureMiddleware from api system
|
2022-10-31 17:26:07 +03:00 |
|
|
|
52b23cbf8b
|
healthcheck: added to ApiSystem/ClearEvents services. refactoring
|
2022-10-31 16:13:45 +03:00 |
|
|
|
7a01578f0c
|
Merge pull request #939 from ONLYOFFICE/feature/remove-new-TenantQuotaController
remove "new TenantQuotaController"
|
2022-10-31 13:03:28 +03:00 |
|
|
|
81b298cf72
|
fix
|
2022-10-31 13:03:02 +03:00 |
|
|
|
556c0b8041
|
People: renamed IsDocSpaceAdmin to IsAdmin
|
2022-10-28 16:23:41 +03:00 |
|
|
|
0baa36c1c0
|
GetDataStore tenant string to int
|
2022-10-28 15:23:51 +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 |
|
|
|
eb485d035a
|
Api.Core: added employee type
|
2022-10-26 17:38:47 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
35592fd306
|
Quota: fix
|
2022-10-19 19:27:04 +03:00 |
|
|
|
ea86b81c7e
|
Quota: fix
|
2022-10-19 18:04:31 +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 |
|
|
|
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 |
|
