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 |
|
|
d0a347ef28
|
People: auth. fixed order
|
2023-09-14 18:17:57 +03:00 |
|
|
12f4e8d180
|
fix
|
2023-09-14 17:38:24 +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 |
|
|
68a88058cb
|
added room id
|
2023-09-14 17:35:54 +03:00 |
|
|
e419d5dbff
|
Notify: added NotifySchedulerService, NotifySenderService
|
2023-09-14 16:48:09 +03:00 |
|
|
6624a46d46
|
ASC.Data.Reassigns: ReassignProgressItem: tracking CancellationToken status
|
2023-09-14 14:32:57 +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 |
|
|
57fc34a966
|
ASC.Notify.Textile: TextileStyler: newlines fixed
|
2023-09-13 16:11: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 |
|
|
bd1e54a1af
|
disable punctuation tests
|
2023-09-13 14:21:13 +03:00 |
|
diana-vahomskaya
|
9ab54eba47
|
fix resources in another languages
|
2023-09-13 13:49:32 +03:00 |
|
|
ea2bd6a12d
|
Merge branch 'develop' into feature/optimization-ef
|
2023-09-13 12:28:33 +03:00 |
|
|
65a43a86dd
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-13 10:14:35 +03:00 |
|
|
a9e93ef2f9
|
fixed merge conflicts
|
2023-09-13 09:28:08 +03:00 |
|
|
9ca2280e83
|
fixed merge conflicts
|
2023-09-13 09:22:59 +03:00 |
|
|
0f9458dbf4
|
Notify: fix GetSubscriptionMethodsAsync
|
2023-09-13 00:11:04 +03:00 |
|
|
2226265c48
|
Notify: ICacheNotify to IEventBus
|
2023-09-13 00:10:33 +03:00 |
|
|
eee5f2d443
|
ef fix: update and traking
|
2023-09-12 18:23:45 +03:00 |
|
diana-vahomskaya
|
458ca824be
|
fix
|
2023-09-12 17:07:01 +03:00 |
|
|
5be921b540
|
Merge branch 'develop' into feature/back-ar
|
2023-09-12 18:01:15 +04:00 |
|
|
a471496cf7
|
fix cleaner
|
2023-09-12 15:37:20 +03: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 |
|
|
99b089fe64
|
ef default: as no traking
|
2023-09-12 14:47:43 +03:00 |
|
|
84067d4dd0
|
ASC.Data.Reassigns: fixed data reassignment without profile deletion
|
2023-09-12 01:39:51 +03:00 |
|
|
166208565f
|
Merge pull request #1724 from ONLYOFFICE/feature/remove-ser-attr
removed Serializable attribute
|
2023-09-11 07:33:57 -07:00 |
|
|
5977a9f986
|
Merge pull request #1719 from ONLYOFFICE/feature/json-7
Feature/json 7
|
2023-09-11 07:33:28 -07:00 |
|
diana-vahomskaya
|
af8bd48f3a
|
fix
|
2023-09-11 15:55:50 +03:00 |
|
diana-vahomskaya
|
4ecd7877b8
|
fix culture.Name == "ar-SA" to culture.TextInfo.IsRightToLeft
|
2023-09-11 15:23:29 +03:00 |
|
|
00a9b332df
|
Merge pull request #1727 from ONLYOFFICE/feature/accounts-optimization
Feature/accounts optimization
|
2023-09-11 04:36:07 -07:00 |
|
diana-vahomskaya
|
243bc79eca
|
added direction rtl or ltr for letters depending on culture, added text-align Left or Right depending on culture in TextileStyler.cs
|
2023-09-11 14:01:43 +03:00 |
|
mushka-n
|
95e3bc8f36
|
merge develop + merge fix
|
2023-09-11 13:52:47 +03:00 |
|
|
dec1a0d2e5
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2023-09-10 18:11:26 +03:00 |
|
|
3ac5d9159a
|
Merge branch 'develop' into feature/new-for-client
|
2023-09-08 18:51:06 +04:00 |
|
|
7bd76d4782
|
added ar
|
2023-09-08 17:12:01 +03:00 |
|
|
2283184a61
|
removed Serializable attribute
|
2023-09-08 16:24:24 +03:00 |
|
|
739356d13f
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2023-09-08 15:12:10 +03:00 |
|
|
52adcbc30f
|
fix build
|
2023-09-08 11:47:40 +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 |
|
mushka-n
|
e1d989c6d2
|
merge develop + merge fix
|
2023-09-08 03:27:39 +03:00 |
|
Viktor Fomin
|
d782f080f2
|
Merge branch 'develop' into feature/tg-reports
|
2023-09-07 20:58:04 +03:00 |
|
|
db3f75c78b
|
added translations
|
2023-09-07 18:40:17 +03:00 |
|
|
778a49ac8a
|
Merge branch 'develop' into feature/json-7
|
2023-09-07 17:55:51 +03:00 |
|
|
2c53224c3f
|
Merge branch 'develop' into feature/backup-s3-tar
# Conflicts:
# common/ASC.Data.Storage/S3/S3Storage.cs
|
2023-09-07 17:10:28 +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 |
|
|
28adddac03
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2023-09-07 10:24:17 +03:00 |
|
|
3f43b0b9c2
|
Merge pull request #1703 from ONLYOFFICE/feature/tag-new-optimization
feature/tag new optimization
|
2023-09-07 10:23:57 +03:00 |
|
|
6b35398c14
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2023-09-07 09:01:49 +03:00 |
|
|
c73e4f7a1d
|
rate limiter: max 10000 requests per user
|
2023-09-07 09:01:43 +03:00 |
|
gazizova-vlada
|
b224b1bb8f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-06 13:00:15 +03:00 |
|
|
569330129b
|
move api redirect uri from login provider
|
2023-09-06 10:13:46 +03:00 |
|
|
9a3884bd8a
|
ASC.Core.Common: DbWebPluginService: display web plugins for default tenant
|
2023-09-05 18:41:55 +03:00 |
|
|
2792df1a84
|
added pt-PT
|
2023-09-05 17:23:59 +03:00 |
|
|
98583fcbd1
|
added sk, ko
|
2023-09-05 15:36:38 +03:00 |
|
Viktor Fomin
|
b11b6da457
|
Common: ASC.TelegramReports: add README
|
2023-09-05 14:45:12 +03:00 |
|
Viktor Fomin
|
b67ca1b701
|
Common: init ASC.TelegramReports
|
2023-09-05 14:08:55 +03:00 |
|
|
0369705ae3
|
Merge branch 'develop' into feature/accounts-optimization
# Conflicts:
# products/ASC.People/Server/Api/UserController.cs
|
2023-09-05 11:22:06 +03:00 |
|
|
96b916d81e
|
Merge branch 'hotfix/v1.1.3' into develop
|
2023-09-05 09:45:42 +04:00 |
|
|
2b86dd25df
|
Merge branch 'develop' into feature/change-chunk-size-s3-copy-and-backup
# Conflicts:
# config/backup.json
|
2023-09-04 23:11:47 +03:00 |
|
|
2fd15b4108
|
Merge pull request #1699 from ONLYOFFICE/refacroting/csp-to-core
common: move cspsettings from web.api to core.common project
|
2023-09-04 10:44:38 -07:00 |
|
|
715c21f090
|
added ko, sk
|
2023-09-04 18:21:40 +03:00 |
|
|
d3198671ba
|
Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into feature/zoom-login
# Conflicts:
# packages/common/constants/index.js
|
2023-09-04 16:38:06 +03:00 |
|
|
ba2233ca7a
|
common: move cspsettings from web.api to core.common project
|
2023-09-04 15:13:18 +03:00 |
|
|
f6ca59874d
|
zoom: add keys and add in AuthProviders
|
2023-09-04 14:46:48 +03:00 |
|
|
63e0f44964
|
Merge branch 'develop' into feature/tag-new-optimization
|
2023-09-04 14:32:04 +03:00 |
|
|
1f3d63be3d
|
optimized socket notification on tag changes
|
2023-09-04 13:20:32 +03:00 |
|
|
87059123ca
|
backup fix
|
2023-09-02 01:02:08 +03:00 |
|
gazizova-vlada
|
6de452efac
|
Merge branch 'develop' into feature/login-settings
|
2023-09-01 16:56:55 +03:00 |
|
|
3e6a417d19
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
# migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
# packages/client/src/components/panels/SelectFileDialog/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js
# packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
# packages/client/src/store/ProfileActionsStore.js
# packages/common/api/files/index.js
# packages/common/store/AuthStore.js
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# yarn.lock
|
2023-09-01 15:33:39 +03:00 |
|
|
8229b56342
|
change chunk size
|
2023-09-01 15:02:36 +03:00 |
|
|
33bd497712
|
fix
|
2023-09-01 14:43:27 +03:00 |
|
|
4969b04fab
|
Merge branch 'develop' into feature/json-7
|
2023-08-31 18:24:12 +03:00 |
|
|
1e0944b796
|
SSO: Changed authUrl
|
2023-08-31 14:32:47 +04:00 |
|
gazizova-vlada
|
629b42161c
|
Merge branch 'develop' into feature/login-settings
|
2023-08-31 09:57:26 +03:00 |
|
|
d39cb60c38
|
backend: added index (by creation_date column) to table notify_queue
|
2023-08-30 12:50:55 +03:00 |
|
|
86e635cd51
|
Merge branch 'develop' into feature/backup-s3-tar
# Conflicts:
# common/ASC.Data.Storage/S3/S3Storage.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2023-08-29 14:31:16 +03:00 |
|
Eloncase
|
65fa314059
|
apisystem: zoom: handle store link
# Conflicts:
# common/services/ASC.ApiSystem/Controllers/ZoomController.cs
|
2023-08-29 14:04:40 +03:00 |
|
Eloncase
|
771b07b81b
|
ApiSystem: redirect if user and portal exists
# Conflicts:
# common/services/ASC.ApiSystem/Controllers/ZoomController.cs
|
2023-08-29 14:00:42 +03:00 |
|