|
|
aa26f284fa
|
Merge branch 'feature/web-plugins' of github.com:ONLYOFFICE/DocSpace into feature/web-plugins
|
2023-09-29 10:36:31 +03:00 |
|
|
|
f778106bc4
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 10:36:07 +03:00 |
|
|
|
006c552ae6
|
Merge remote-tracking branch 'remotes/origin/feature/web-plugins' into feature/system-web-plugins
|
2023-09-26 14:40:33 +03:00 |
|
|
|
6af5cf8295
|
ASC.Web.Core: WebPluginManager: read system plugins from storage
|
2023-09-26 14:37:57 +03:00 |
|
|
|
fc8897a79b
|
Merge branch 'develop' into feature/room-share-optimization
|
2023-09-26 11:47:56 +04:00 |
|
|
|
b999ecb5dd
|
fixed warnings
|
2023-09-25 19:05:00 +03:00 |
|
|
|
2f08aae86a
|
Notify: fix footer
|
2023-09-25 17:11:13 +03: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 |
|
|
|
fd383577a0
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-25 08:53:04 +03:00 |
|
|
|
b670c532cc
|
MessageService: refactoring
|
2023-09-22 18:41:57 +03:00 |
|
|
|
c3c683f7a8
|
Geo: fix
|
2023-09-22 18:40:11 +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 |
|
|
|
70b5c6e111
|
MErge branch 'develop' into feature/web-plugins
|
2023-09-21 14:30:04 +03:00 |
|
|
|
4d1ead697e
|
removed nextPage parameter
|
2023-09-21 13:44:23 +03:00 |
|
|
|
5d6c1f051f
|
fix Bug 64204 - Settings: Backup.
|
2023-09-21 13:13:33 +03:00 |
|
|
|
44dbeb48cd
|
Merge branch 'develop' into feature/document-service-location
|
2023-09-21 13:38:25 +04: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 |
|
|
|
b25b39da14
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-20 14:55:39 +03:00 |
|
|
|
91e359f834
|
Merge pull request #1743 from ONLYOFFICE/feature/urlShortener
update urlShortener
|
2023-09-20 02:39:22 -07: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 |
|
|
|
878bf35ce7
|
execute delete in SaveAsync
|
2023-09-19 17:00:54 +03:00 |
|
|
|
166b5ddeee
|
ASC.Web.Core: WebPluginManager: small fixes
|
2023-09-19 15:44:01 +03:00 |
|
Viktor Fomin
|
19e1b51887
|
Merge branch 'develop' into feature/split-invite
|
2023-09-19 14:04:18 +03:00 |
|
|
|
e5456ba9c6
|
Execute delete in RemoveUserAsync and RemoveUserGroupRefAsync
|
2023-09-19 12:23:42 +03:00 |
|
|
|
f39bcab58f
|
executedelete in RemoveGroupAsync
|
2023-09-19 11:36:31 +03:00 |
|
Vlada Gazizova
|
3471bbf09f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-19 09:54:45 +03:00 |
|
|
|
d364748d84
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 09:23:13 +03:00 |
|
|
|
c56264e54e
|
Merge branch 'develop' into feature/optimization-ef
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2023-09-18 21:41:09 +03:00 |
|
|
|
47bfa5c50c
|
ASC.Notify.Textile: ar-SA direction rtl
|
2023-09-18 17:06:13 +03:00 |
|
|
|
377be3c570
|
ASC.Notify.Textile: csproj fixed
|
2023-09-18 17:00:39 +03:00 |
|
|
|
18c0916338
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/rtl-direction-fix
|
2023-09-18 16:48:11 +03:00 |
|
|
|
c1ee4f0d36
|
ASC.Notify.Textile: revert rtl changes
|
2023-09-18 16:47:25 +03:00 |
|
|
|
2331eee1ed
|
revert 9ab54eba47
|
2023-09-18 16:37:40 +03:00 |
|
|
|
c3276c3146
|
Merge remote-tracking branch 'remotes/origin/feature/web-plugins' into feature/system-web-plugins
|
2023-09-18 14:00:54 +03:00 |
|
|
|
2783548a5f
|
ASC.Web.Core: WebPluginManager: trying to read system plugins by url
|
2023-09-15 19:20:45 +03: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 |
|
Viktor Fomin
|
4d2f9327ab
|
Merge branch 'develop' into feature/split-invite
|
2023-09-15 12:07:24 +03:00 |
|
|
|
80fb581d73
|
ASC.Data.Reassigns: ReassignProgressItem: throwing OperationCanceledException to OnCompleted
|
2023-09-15 12:02:53 +03:00 |
|
|
|
68f58e04fa
|
Merge pull request #1732 from ONLYOFFICE/feature/rtl-direction
feature/rtl-direction
|
2023-09-15 02:00:49 -07:00 |
|
|
|
06078ffd2d
|
Oauth: Twitter
|
2023-09-15 00:01:08 +03:00 |
|
|
|
b57574fe40
|
added oauth quota for startup tariff
|
2023-09-14 18:33:57 +03:00 |
|
