|
|
6a660938de
|
fix Bug 60605
|
2023-04-20 17:05:21 +03:00 |
|
|
|
990128748b
|
DI: fix startup
|
2023-04-12 14:07:37 +03:00 |
|
|
|
0abe404476
|
invitation link: added tariff/quota/permissions check, refactoring
|
2023-03-23 16:22:01 +03:00 |
|
Vashchuk Nikita
|
2d92da7c0c
|
Merge branch 'release/v1.0.0' into feature/notifications
# Conflicts:
# web/ASC.Web.Api/GlobalUsings.cs
|
2023-03-10 17:39:47 +05:00 |
|
|
|
96d9dc9058
|
downgrade AspNetCore.HealthChecks.Elasticsearch
|
2023-03-07 15:30:08 +03:00 |
|
|
|
29abce027d
|
Merge branch 'develop' into feature/notifications
# Conflicts:
# packages/client/src/pages/Accounts.jsx
# packages/client/src/store/FilesActionsStore.js
# packages/common/constants/index.js
# products/ASC.People/Server/Api/UserController.cs
|
2023-03-06 15:37:45 +03:00 |
|
Vashchuk Nikita
|
c92be742cb
|
Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser
|
2023-03-03 20:02:48 +05:00 |
|
|
|
c932d935fa
|
Merge branch 'develop' into feature/colloborator
|
2023-02-28 13:48:08 +04:00 |
|
|
|
78a2e20edb
|
refactoring
|
2023-02-27 18:38:01 +03:00 |
|
Timofey Boyko
|
8e59451b4a
|
Merge branch 'develop' into feature/colloborator
|
2023-02-27 15:22:21 +03:00 |
|
|
|
aa7cf93a74
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2023-02-27 13:29:36 +03:00 |
|
|
|
03a4dc89dc
|
Settings: refactoring
|
2023-02-24 17:19:10 +03:00 |
|
|
|
f66dfbc0a8
|
kafka: setup config
|
2023-02-22 21:07:29 +03:00 |
|
|
|
3401abb21a
|
Merge branch 'develop' into feature/colloborator
|
2023-02-21 17:11:39 +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 |
|
|
|
0a5d19a8f4
|
nlog: refactoring. added tenant info when httpcontext exist
|
2023-02-20 23:13:18 +03:00 |
|
|
|
5e9f12a797
|
backend: refactoring
|
2023-02-20 23:10:49 +03:00 |
|
|
|
6fb4f73110
|
Api.Core: added IsCollaborator in user dto
|
2023-02-20 11:51:21 +03:00 |
|
|
|
b88203df33
|
Api.Core: refactor
|
2023-02-20 11:15:41 +03:00 |
|
|
|
25859e5d4e
|
refactoring
|
2023-02-17 15:56:40 +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 |
|
|
|
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 |
|
|
|
d38efe9474
|
Merge branch 'develop' into feature/asc.apicache
# Conflicts:
# common/services/ASC.ApiSystem/Program.cs
|
2023-02-07 19:23:54 +03:00 |
|
|
|
0f35b8ab45
|
redis: support User property from config
|
2023-02-07 17:53:34 +03:00 |
|
|
|
f52f32a6af
|
Merge branch 'develop' into feature/asc.apicache
# Conflicts:
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.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/Tools/ASC.Migration.Creator/Program.cs
# common/Tools/ASC.Migration.Runner/Program.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
|
2023-02-07 17:07:20 +03:00 |
|
|
|
8f922bd8cf
|
Api: added links field for success response
|
2023-01-30 16:57:29 +03:00 |
|
|
|
1639173950
|
Bug 60878
|
2023-01-27 15:44:17 +03:00 |
|
|
|
667b10e874
|
Merge pull request #1149 from ONLYOFFICE/feature/dotnet7
Feature/dotnet7
|
2023-01-19 22:00:57 +03:00 |
|
|
|
4ddf7d521c
|
update external dependency
|
2023-01-19 19:05:07 +03:00 |
|
|
|
8ad635ba25
|
merge from release/rc-v1.2.0. fixed problem and update dll
|
2023-01-19 15:47:09 +03:00 |
|
|
|
cd367502fb
|
Bug 60660
|
2023-01-19 12:15:14 +03:00 |
|
|
|
0090561fb6
|
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
|
2023-01-10 14:47:27 +03:00 |
|
|
|
44804e34db
|
fixed cache room logo/user photo
|
2022-12-29 11:31:22 +03:00 |
|
|
|
9f198ef31d
|
fixed user avatar/room logo cache
|
2022-12-27 18:20:05 +03:00 |
|
|
|
b25dbdf123
|
improved user/room logo images load
|
2022-12-23 17:08:06 +03:00 |
|
|
|
62cec7b7c5
|
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
|
2022-12-22 14:17:24 +03:00 |
|
|
|
6496ff3576
|
Log: disable cloudwatch logging when awsAccessKeyId not specified
|
2022-12-21 21:22:04 +03:00 |
|
|
|
995d78ecd6
|
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
|
2022-12-21 12:39:28 +03:00 |
|
|
|
d4aaa4afaf
|
fix Bug 60194 - Settings: Restore. When trying to restore the docspace portal crashes with multiple errors in the console
|
2022-12-21 12:19:47 +03:00 |
|
|
|
40ea7aefeb
|
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
|
2022-12-20 12:47:44 +03:00 |
|
|
|
56c9ffcd21
|
Api.Core: added option for default logo
|
2022-12-19 11:54:32 +03:00 |
|
|
|
db951d00e6
|
asc.apicache
|
2022-12-16 15:41:09 +03:00 |
|
|
|
5e630feb68
|
Merge branch 'develop' into fix/tests
|
2022-12-08 19:46:44 +03:00 |
|
|
|
0e6d5405d2
|
fix web.api tests
|
2022-12-07 13:38:35 +03:00 |
|
|
|
61f7765a4f
|
Merge branch 'develop' into feature/api-origin
|
2022-12-06 21:47:56 +03:00 |
|
|
|
b693486b46
|
merge from develop
|
2022-12-01 14:52:46 +03:00 |
|
|
|
18b89b1517
|
nlog: fixed
|
2022-11-24 19:18:27 +03:00 |
|
|
|
1a3b5d9a2f
|
fix cookie name
|
2022-11-18 18:40:56 +03:00 |
|
