|
|
fc8897a79b
|
Merge branch 'develop' into feature/room-share-optimization
|
2023-09-26 11:47:56 +04:00 |
|
|
|
aa8d1cba60
|
Merge branch 'develop' into feature/notify-ref
|
2023-09-25 16:38:32 +03:00 |
|
|
|
796cbf3265
|
Merge branch 'develop' into feature/room-share-optimization
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2023-09-25 15:58:53 +03:00 |
|
|
|
8385954e0f
|
Merge pull request #1766 from ONLYOFFICE/feature/message-ref
MessageService: refactoring
|
2023-09-25 04:38:03 -07:00 |
|
|
|
b14d6c8ef0
|
Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
# config/appsettings.json
# config/nlog.config
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
# packages/client/src/pages/Confirm/sub-components/createUser.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/common/components/MoreLoginModal/index.tsx
# packages/login/src/client/components/sub-components/LoginForm.tsx
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Core/CspSettingsHelper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-09-25 10:53:06 +03:00 |
|
|
|
b670c532cc
|
MessageService: refactoring
|
2023-09-22 18:41:57 +03:00 |
|
|
|
fbf333a22d
|
Merge branch 'develop' into feature/room-share-optimization
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.People/Server/GlobalUsings.cs
|
2023-09-22 14:48:59 +03:00 |
|
|
|
9cf550e1f0
|
Notify: fix culture
|
2023-09-21 14:38:55 +03:00 |
|
|
|
9c9f33cf12
|
Merge pull request #1746 from ONLYOFFICE/feature/split-invite
Feature/split invite
|
2023-09-20 19:46:48 +04:00 |
|
|
|
42d30840ec
|
Api: CspStartupTask. Reset csp settings on webApi restart
|
2023-09-20 18:42:24 +03:00 |
|
Viktor Fomin
|
33a7bce641
|
Merge branch 'develop' into feature/split-invite
|
2023-09-20 16:50:26 +03:00 |
|
gazizova-vlada
|
183b32c2aa
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 16:27:26 +03:00 |
|
|
|
17fbf76e92
|
fix urlShortener
|
2023-09-20 11:35:35 +03:00 |
|
Viktor Fomin
|
73118da8f2
|
Merge branch 'develop' into feature/split-invite
|
2023-09-20 10:52:17 +03:00 |
|
|
|
94bf145445
|
Merge branch 'develop' into feature/urlShortener
|
2023-09-19 19:45:18 +03:00 |
|
|
|
f6c1406cea
|
fix urlShortener
|
2023-09-19 19:42:01 +03:00 |
|
|
|
c20e935cec
|
Api: FormGalleryDto. Mapping
|
2023-09-19 16:38:44 +03:00 |
|
|
|
34b91b1aba
|
Csp: fix
|
2023-09-19 14:12:17 +03:00 |
|
Viktor Fomin
|
19e1b51887
|
Merge branch 'develop' into feature/split-invite
|
2023-09-19 14:04:18 +03:00 |
|
|
|
f15953bbe4
|
Revert "oform" config + added "upload" section
|
2023-09-19 13:43:26 +04:00 |
|
|
|
4b368870ab
|
Added new FormGallery config (+ extended API settings)
|
2023-09-19 13:11:34 +04:00 |
|
|
|
2b8821bcff
|
Merge branch 'develop' into feature/room-share-optimization
# Conflicts:
# products/ASC.Files/Core/ApiModels/RequestDto/UserInvitationRequestDto.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Server/Api/VirtualRoomsController.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
|
2023-09-15 16:45:49 +03:00 |
|
|
|
c221dd6a63
|
Merge pull request #1747 from ONLYOFFICE/bugfix/bug-64157
fix Bug 64157
|
2023-09-15 15:49:20 +03:00 |
|
|
|
291ae6da13
|
Csp: oform
|
2023-09-15 11:25:11 +03:00 |
|
|
|
ed8c4707a3
|
Merge branch 'feature/split-invite' of github.com:ONLYOFFICE/DocSpace into feature/split-invite
|
2023-09-14 17:38:05 +03:00 |
|
|
|
9bc66531ed
|
added room name and id to validation response
|
2023-09-14 17:37:52 +03:00 |
|
|
|
e419d5dbff
|
Notify: added NotifySchedulerService, NotifySenderService
|
2023-09-14 16:48:09 +03:00 |
|
|
|
9287468461
|
Bug 63993 - get history files
|
2023-09-14 15:37:08 +03:00 |
|
|
|
96df6c663f
|
fix Bug 64157
|
2023-09-14 13:07:19 +03:00 |
|
|
|
7aff59b652
|
update urlShortener
|
2023-09-13 16:49:29 +03:00 |
|
|
|
ad93ede662
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data
# Conflicts:
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
|
2023-09-13 15:44:16 +03:00 |
|
|
|
463c2d81a2
|
Api: sso. hideAuthPage
|
2023-09-13 12:21:09 +03:00 |
|
|
|
c3495ce668
|
Merge pull request #1737 from ONLYOFFICE/feature/short-links
Feature/short links
|
2023-09-13 09:21:59 +03:00 |
|
|
|
2226265c48
|
Notify: ICacheNotify to IEventBus
|
2023-09-13 00:10:33 +03:00 |
|
|
|
7c4ff40181
|
Notify: removed unused methods
|
2023-09-12 18:10:11 +03:00 |
|
|
|
5be921b540
|
Merge branch 'develop' into feature/back-ar
|
2023-09-12 18:01:15 +04:00 |
|
|
|
675590854c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data
# Conflicts:
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
# products/ASC.People/Server/Api/UserController.cs
|
2023-09-12 15:18:27 +03:00 |
|
|
|
e419f8ab40
|
added default link shortening
|
2023-09-12 14:54:59 +03:00 |
|
|
|
6cf75e74f8
|
Api: sso. HideAuthPage for anonymous
|
2023-09-11 17:55:57 +03:00 |
|
|
|
166208565f
|
Merge pull request #1724 from ONLYOFFICE/feature/remove-ser-attr
removed Serializable attribute
|
2023-09-11 07:33:57 -07:00 |
|
|
|
c5ba70846c
|
added ar
|
2023-09-11 16:10:48 +03:00 |
|
|
|
c226be46ff
|
Csp: domains from config
|
2023-09-11 15:00:04 +03:00 |
|
|
|
7bd76d4782
|
added ar
|
2023-09-08 17:12:01 +03:00 |
|
|
|
2283184a61
|
removed Serializable attribute
|
2023-09-08 16:24:24 +03:00 |
|
|
|
07aa2dda5a
|
Merge branch 'develop' into feature/accounts-optimization
|
2023-09-08 10:47:32 +03:00 |
|
|
|
675755aedd
|
Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into develop
|
2023-09-08 09:46:59 +03:00 |
|
|
|
b5c2572dbc
|
Merge pull request #1712 from ONLYOFFICE/feature/adding_translations-back
Feature/adding translations back
|
2023-09-07 03:24:27 -07:00 |
|
|
|
1b42dc1449
|
added translations
|
2023-09-07 12:15:31 +03:00 |
|
|
|
a3ab99638c
|
added pt-PT
|
2023-09-07 09:49:49 +03:00 |
|
|
|
cc10a5c221
|
added pt-PT
|
2023-09-06 17:28:27 +03:00 |
|
