|
|
7d9d8fcba3
|
Files: tag dao. Async
|
2022-11-15 19:10:39 +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 |
|
|
|
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 |
|
|
|
128527a809
|
Merge branch 'develop' into feature/recalculate-user-quota
|
2022-10-25 17:33:56 +03:00 |
|
|
|
ac05302b21
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-21 13:14:00 +03:00 |
|
|
|
a0975f1d98
|
Files: added archive folder display for free users
|
2022-10-21 12:55:54 +03:00 |
|
|
|
9c99f3a53f
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-19 19:41:39 +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 |
|
|
|
be8b455718
|
Files: UsersInRoom feature
|
2022-10-18 17:12:35 +03:00 |
|
|
|
a2d144514d
|
refactor
|
2022-10-18 14:22:02 +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 |
|
|
|
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 |
|
|
|
b1bd5a100f
|
Quota: recalculate user quota
|
2022-10-12 14:23:57 +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 |
|
|
|
20e37c254d
|
Files: added parameter for filtering by provider
|
2022-10-03 17:56:54 +03:00 |
|
|
|
8f7216d506
|
Files: added room filtering by provider type
|
2022-10-03 11:45:02 +03:00 |
|
|
|
7f1d946269
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
# packages/client/src/pages/PortalSettings/index.js
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
|
2022-09-23 16:11:23 +03:00 |
|
|
|
6448b63318
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/constants/index.js
# web/ASC.Web.Api/Program.cs
|
2022-09-19 18:16:34 +03:00 |
|
|
|
2f64a1531f
|
Files: fix
|
2022-09-19 11:55:03 +03:00 |
|
|
|
d05071110d
|
Merge branch 'develop' into feature/room-security
|
2022-09-19 11:54:55 +03:00 |
|
|
|
9faa6a947a
|
Files: refactor
|
2022-09-19 11:50:31 +03:00 |
|
|
|
f5bdc75bc1
|
Merge pull request #826 from ONLYOFFICE/feature/nlog-refactoring
Feature/nlog refactoring
|
2022-09-16 17:43:41 +04:00 |
|
|
|
6f1243b382
|
Files: changed filter logic, refactor
|
2022-09-16 15:30:43 +03:00 |
|
|
|
abe0f8563f
|
Files: refactor
|
2022-09-16 14:01:50 +03:00 |
|
|
|
22d5c0c427
|
Files: refactor
|
2022-09-16 13:52:54 +03:00 |
|
|
|
5296bb8394
|
Merge branch 'develop' into feature/files-filter
|
2022-09-16 13:34:49 +03:00 |
|
|
|
d91848cfff
|
Files: added withoutMe for files filter
|
2022-09-16 13:32:00 +03:00 |
|
|
|
7f7d7e5200
|
merge from develop
|
2022-09-16 00:03:52 +03:00 |
|
|
|
ab5de603c1
|
nlog: fixed config
|
2022-09-15 18:17:23 +03:00 |
|
|
|
53e0146a26
|
Quota: countroom
|
2022-09-15 17:44:48 +03:00 |
|
|
|
ee27ad4437
|
nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property
|
2022-09-15 17:44:04 +03:00 |
|
|
|
ccdce719bc
|
Files: refactor, updated api doc
|
2022-09-14 15:33:02 +03:00 |
|
|
|
40702707bd
|
refactoring
|
2022-09-14 14:21:25 +03:00 |
|
|
|
923a45ed8c
|
Files: refactor
|
2022-09-14 13:00:08 +03:00 |
|
|
|
b04f50fc72
|
Files: added invintation by link
|
2022-09-14 12:59:02 +03:00 |
|
|
|
8834b2bdff
|
Files: deleted unnecessary
|
2022-09-14 12:53:20 +03:00 |
|
|
|
2f0c494cda
|
Files: added multiplie invintation link
|
2022-09-09 18:07:04 +03:00 |
|
|
|
25ae19d601
|
Merge branch 'develop' into feature/remove-waste
|
2022-09-09 11:52:13 +03:00 |
|
|
|
f3a05087fa
|
fix
|
2022-09-08 18:39:53 +03:00 |
|
|
|
47600daa03
|
Files: added api for resend room invintation
|
2022-09-08 13:11:14 +03:00 |
|
|
|
ff7eeb0940
|
remove waste in asc.files
|
2022-09-08 10:57:49 +03:00 |
|
|
|
07d909358a
|
Files: removed unnecessary
|
2022-09-07 18:24:27 +03:00 |
|
|
|
fb4e996196
|
Merge branch 'develop' into feature/room-security
|
2022-09-06 13:36:03 +03:00 |
|
|
|
31297798aa
|
refactor
|
2022-09-06 13:32:37 +03:00 |
|
