|
|
00c3d8a367
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# public/locales/en/Common.json
|
2023-09-15 18:46:34 +03:00 |
|
Viktor Fomin
|
71e5179f64
|
Merge branch 'develop' into feature/split-invite
|
2023-09-15 18:12:30 +03:00 |
|
|
|
c32c2b61f7
|
Web: Files: fixed translations
|
2023-09-15 17:56:05 +03:00 |
|
|
|
4ad47b9797
|
Merge branch 'develop' into feature/cron
|
2023-09-15 18:15:37 +04:00 |
|
|
|
a5662b7cdd
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# packages/client/public/locales/en/Files.json
|
2023-09-15 16:54:26 +03:00 |
|
Viktor Fomin
|
6229112857
|
Client: add translate
|
2023-09-15 12:06:39 +03:00 |
|
mushka-n
|
cf735a6fbe
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-15 00:43:58 +03:00 |
|
|
|
e26bcc6ee2
|
Web:Client:Plugins: update list of plugins at portal settings, change settings plugin dialog
|
2023-09-14 18:27:37 +03:00 |
|
Viktor Fomin
|
d363808d00
|
Merge branch 'develop' into feature/split-invite
|
2023-09-14 12:24:28 +03:00 |
|
|
|
23202b8477
|
web: Files: fixed translation key
|
2023-09-14 12:04:19 +03:00 |
|
|
|
c84eb55ff1
|
Merge branch 'develop' into feature/add-new-link-dialog
|
2023-09-14 11:12:17 +03:00 |
|
Viktor Fomin
|
8cfa307c05
|
Client: add translations
|
2023-09-13 15:50:35 +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 |
|
|
|
7a075a1351
|
Web: Client: add successful copy toast
|
2023-09-13 14:43:48 +02:00 |
|
Akmal Isomadinov
|
bbd40500c9
|
Merge branch 'develop' into feature/cron
|
2023-09-13 16:11:13 +05:00 |
|
|
|
307d0eb4d1
|
Merge branch 'develop' into feature/mobile-sdk
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
|
2023-09-13 12:30:44 +02:00 |
|
|
|
d8fc4babc7
|
Web: Removed full duplicate
|
2023-09-12 19:41:40 +04:00 |
|
|
|
772b730eba
|
Merge branch 'develop' into feature/add-new-link-dialog
|
2023-09-12 17:01:30 +03:00 |
|
|
|
b3470375cb
|
Web: Fix translations to other languages
|
2023-09-12 17:57:27 +04:00 |
|
|
|
9c173f3d20
|
Web: Files: added new translations for delete dialog
|
2023-09-12 16:06:43 +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 |
|
|
|
8283538b52
|
Merge pull request #1578 from ONLYOFFICE/feature/new-files-dialog
feature/new-files-dialog
|
2023-09-12 14:09:20 +04:00 |
|
gazizova-vlada
|
d0ce4eb38e
|
Web:Client:Change MarkAsRead to Viewed.
|
2023-09-12 13:00:15 +03:00 |
|
|
|
be0d97dd17
|
Web: Files: Changed translations for add new link dialog
|
2023-09-12 11:56:39 +03:00 |
|
mushka-n
|
95e3bc8f36
|
merge develop + merge fix
|
2023-09-11 13:52:47 +03:00 |
|
mushka-n
|
d96911a37c
|
merge develop + merge fix
|
2023-09-11 13:26:58 +03:00 |
|
|
|
eb9e71d978
|
Merge branch 'develop' into feature/branding-mobile-layout
|
2023-09-11 14:21:53 +04:00 |
|
|
|
1f77cf82a2
|
Merge branch 'develop' into feature/leave-room
|
2023-09-11 13:28:56 +04:00 |
|
|
|
21fd5aa9d5
|
Merge branch 'develop' into feature/cron
|
2023-09-11 12:34:41 +04:00 |
|
|
|
0931a28a2f
|
Web: Client: add mobile version of sdk
|
2023-09-08 23:19:47 +02:00 |
|
Viktor Fomin
|
2ad811c363
|
Merge branch 'develop' into feature/branding-mobile-layout
|
2023-09-08 18:56:18 +03:00 |
|
|
|
60e7c125ad
|
Merge branch 'develop' into feature/copy-paste-hotkeys
|
2023-09-08 19:55:35 +04:00 |
|
Viktor Fomin
|
467b5e179d
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-09-08 18:17:52 +03:00 |
|
|
|
f484b2f21e
|
Merge branch 'develop' into feature/copy-paste-hotkeys
|
2023-09-08 19:14:47 +04:00 |
|
|
|
315dc26b6e
|
Fix EnDublicatesByContentTest issue (replaced key)
|
2023-09-08 19:00:12 +04:00 |
|
|
|
3ac5d9159a
|
Merge branch 'develop' into feature/new-for-client
|
2023-09-08 18:51:06 +04:00 |
|
|
|
1e615924ae
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-09-08 18:36:25 +04:00 |
|
|
|
f37b453eba
|
Merge branch 'develop' into bugfix/rtl-dates
|
2023-09-08 13:55:30 +04:00 |
|
|
|
1e21d8c719
|
Merge pull request #1717 from ONLYOFFICE/feature/new-translations
feature/new-translations
|
2023-09-08 13:54:27 +04:00 |
|
|
|
037318277c
|
Merge branch 'develop' into bugfix/rtl-dates
|
2023-09-08 11:23:54 +02:00 |
|
|
|
b22b216d95
|
Merge branch 'develop' into feature/copy-paste-hotkeys
|
2023-09-08 11:29:08 +03:00 |
|
|
|
718366d704
|
Web: Updated translations.
|
2023-09-08 09:20:17 +03:00 |
|
mushka-n
|
e1d989c6d2
|
merge develop + merge fix
|
2023-09-08 03:27:39 +03:00 |
|
|
|
db3f75c78b
|
added translations
|
2023-09-07 18:40:17 +03:00 |
|
|
|
d054750b70
|
Web: Files: removed useless "SettingPasswordStrengthMobileHelper" translation key
|
2023-09-07 16:20:30 +03:00 |
|
|
|
86c1a6df53
|
Merge branch 'develop' into feature/copy-paste-hotkeys
|
2023-09-07 16:09:29 +03:00 |
|
|
|
bf7e88da34
|
Merge branch 'develop' into feature/new-settings-description
|
2023-09-07 15:40:14 +03:00 |
|
Akmal Isomadinov
|
2ba6366f29
|
Merge branch 'develop' into feature/cron
|
2023-09-07 16:43:58 +05:00 |
|
Akmal Isomadinov
|
096e3dd687
|
Web:Cron Fixed translations
|
2023-09-07 16:40:45 +05:00 |
|
|
|
4db2e18bd8
|
Merge branch 'develop' into bugfix/rtl-dates
|
2023-09-07 12:56:43 +02:00 |
|
|
|
c383ddbb40
|
Web: Client: fix date format when rtl in webhook history table
|
2023-09-07 12:56:35 +02:00 |
|
|
|
7b2c454c82
|
Web: Client: EditLinkPanel: Removed shorten button
|
2023-09-07 13:35:28 +03:00 |
|
Viktor Fomin
|
0ee0973d56
|
Merge branch 'develop' into feature/branding-mobile-layout
|
2023-09-07 13:31:21 +03:00 |
|
Viktor Fomin
|
528b009896
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-09-07 13:30:59 +03:00 |
|
|
|
8e3ba9757a
|
Web: Files: Hotkeys: fixed operations toast, added new hotkeys description
|
2023-09-07 10:57:32 +03:00 |
|
gazizova-vlada
|
b224b1bb8f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-06 13:00:15 +03:00 |
|
|
|
c1bf6bf308
|
added new texts ru
|
2023-09-04 12:57:19 +03:00 |
|
|
|
e9fcf067ee
|
Merge branch 'develop' into feature/new-settings-description
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js
# packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
|
2023-09-04 12:16:13 +03:00 |
|
Viktor Fomin
|
3f63a0b27c
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-09-02 01:07:54 +03:00 |
|
Viktor Fomin
|
2558a4234b
|
Merge branch 'develop' into feature/branding-mobile-layout
|
2023-09-02 01:04:53 +03:00 |
|
|
|
d77e8a1771
|
Merge branch 'develop' into feature/rtl-interface-client
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
# packages/common/store/SettingsStore.js
|
2023-09-01 16:42:08 +02:00 |
|
|
|
a952793dcb
|
Merge branch 'develop' into feature/new-settings-description
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/security/StyledSecurity.js
# packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
# packages/common/store/SettingsStore.js
|
2023-09-01 17:03:04 +03:00 |
|
gazizova-vlada
|
6de452efac
|
Merge branch 'develop' into feature/login-settings
|
2023-09-01 16:56:55 +03:00 |
|
|
|
b0cbe39aa6
|
Merge branch 'develop' into feature/new-settings-description
|
2023-09-01 16:47:52 +03:00 |
|
|
|
efdd42f8f6
|
Merge branch 'develop' into feature/rtl-interface-client
|
2023-09-01 15:30:48 +02: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 |
|
|
|
24278a2d6b
|
Web: Client: Setting: added new description of settings, fixed styles
|
2023-08-31 12:37:29 +03:00 |
|
gazizova-vlada
|
629b42161c
|
Merge branch 'develop' into feature/login-settings
|
2023-08-31 09:57:26 +03:00 |
|
gazizova-vlada
|
4b6c84ce94
|
Web:Client:Add EnterTime.
|
2023-08-30 19:05:54 +03:00 |
|
gazizova-vlada
|
07dabcbe54
|
Web:Client:Add translation.
|
2023-08-30 18:23:51 +03:00 |
|
|
|
7f05c219a9
|
added ar
|
2023-08-30 18:20:54 +03:00 |
|
|
|
bd448acdc3
|
Web: Fix EmptyFolderDescriptionUser key translation
|
2023-08-30 19:06:20 +04:00 |
|
gazizova-vlada
|
f90bb6cb44
|
Web:Client:Add translation BruteForceProtection.
|
2023-08-30 15:46:13 +03:00 |
|
|
|
b5fbebea6f
|
Web: Changed translation for deactivated portal.
|
2023-08-29 17:42:28 +03:00 |
|
Viktor Fomin
|
dec3a79423
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-08-29 06:31:34 +03:00 |
|
Viktor Fomin
|
8e17bcc659
|
Merge branch 'develop' into feature/branding-mobile-layout
|
2023-08-29 06:27:32 +03:00 |
|
|
|
bc6b0d9e0d
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/Billing/ITariffService.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Notify/EmailSenderSink.cs
# common/ASC.Core.Common/Notify/JabberSenderSink.cs
# common/ASC.Core.Common/Notify/PushSenderSink.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj
# migrations/mysql/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
# migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
# migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
# migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
# migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
# migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
# migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
# migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
# migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
# migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
# packages/client/src/helpers/constants.js
# packages/client/src/pages/Files.jsx
# packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/backup-list/index.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/categories/security/index.js
# packages/client/src/pages/Profile/Section/Header/index.js
# packages/common/store/SettingsStore.js
# packages/components/drop-down/index.js
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Server/Api/FoldersController.cs
# products/ASC.Files/Server/Api/SecurityController.cs
# products/ASC.Files/Server/Api/SettingsController.cs
# products/ASC.Files/Server/Api/TagsController.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/FeedController.cs
# web/ASC.Web.Api/Api/PaymentsController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/SecurityController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/Core/DnsSettings.cs
# web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
# web/ASC.Web.Api/GlobalUsings.cs
# web/ASC.Web.Core/CookiesManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
# yarn.lock
|
2023-08-28 18:53:10 +03:00 |
|
|
|
712db4d4ee
|
edited Api -> API
|
2023-08-25 12:57:31 +03:00 |
|
|
|
4b4b4f747f
|
added translations
|
2023-08-25 11:52:45 +03:00 |
|
Mushka Nikita
|
fe88c657de
|
merge develop + merge bugfix
|
2023-08-22 03:25:02 +03:00 |
|
Viktor Fomin
|
1d2479aec8
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-08-21 22:08:23 +03:00 |
|
|
|
f4c9338c07
|
Fix bug 63646 - Added a message when reaching the limit of paid users by invitation link.
|
2023-08-21 13:30:49 +03:00 |
|
Viktor Fomin
|
162d829aea
|
Client: add translations
|
2023-08-21 11:57:34 +03:00 |
|
|
|
c178c2d680
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# packages/client/public/locales/en/Files.json
|
2023-08-18 14:35:38 +03:00 |
|
Akmal Isomadinov
|
69bccbabe4
|
Web: Fixed translation
|
2023-08-17 14:56:02 +05:00 |
|
Akmal Isomadinov
|
9065500cfc
|
Web:Component:Cron Added translation
|
2023-08-16 18:11:13 +05:00 |
|
Viktor Fomin
|
77ef522ba9
|
Client: add translations
|
2023-08-16 14:41:52 +03:00 |
|
|
|
76c8fe6d52
|
Web: Files: Public-room: added tooltips to action buttons
|
2023-08-15 14:46:12 +03:00 |
|
|
|
9491ccd8b9
|
Web: Files: added new translations
|
2023-08-15 14:03:04 +03:00 |
|
|
|
6d1932b6d1
|
Web: Files: Public-room: added new translation
|
2023-08-14 10:26:02 +03:00 |
|
|
|
493c16f5af
|
Merge branch 'develop' into feature/leave-room
|
2023-08-11 15:21:18 +03:00 |
|
|
|
e531654c54
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# build/build.backend.docker.ps1
# build/build.backend.docker.sh
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs
# common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj
# common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs
# config/nginx/onlyoffice.conf
# packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
# packages/client/src/pages/AccountsHome/Section/Filter/index.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/common/api/files/index.js
# packages/components/.storybook/preview.js
# packages/components/package.json
# packages/editor/src/server/lib/helpers/index.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Server/Api/OperationController.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-08-11 12:47:44 +03:00 |
|
|
|
e65cf29ec3
|
Web: Client: PortalSettings: Added Beta badge
|
2023-08-09 11:37:45 +03:00 |
|
gazizova-vlada
|
c4608a010d
|
Web:Client:Add translation, fix fromUserIds to fromUserId.
|
2023-08-08 14:52:53 +03:00 |
|
|
|
bddbcd02c4
|
Merge branch 'hotfix/v1.1.2' into feature/csp
# Conflicts:
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/SecurityController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2023-08-08 14:13:52 +03:00 |
|
|
|
969026eb00
|
Web: Fix MoveToPublicRoom key
|
2023-08-08 15:11:49 +04:00 |
|
gazizova-vlada
|
9d4db20180
|
Merge branch 'develop' into feature/reassign-data
|
2023-08-08 11:39:24 +03:00 |
|
gazizova-vlada
|
34553e8c7d
|
Web:Client:Add translation.
|
2023-08-08 11:20:24 +03:00 |
|
|
|
1c5088c6eb
|
Merge branch 'develop' into feature/leave-room
|
2023-08-07 18:02:49 +04:00 |
|
gazizova-vlada
|
c3b28ab524
|
Web:Client:Delete translations for users.
|
2023-08-07 15:07:10 +03:00 |
|
