Commit Graph

1242 Commits

Author SHA1 Message Date
gazizova-vlada
69961e6900 Merge branch 'develop' into feature/reassign-data 2023-09-20 17:19:12 +03:00
f1da568484 Merge branch 'develop' into feature/split-invite 2023-09-20 18:16:31 +04:00
gazizova-vlada
183b32c2aa Merge branch 'develop' into feature/reassign-data 2023-09-20 16:27:26 +03:00
3d20697ac0 Web: Translation: Fix UTC key duplication + sorting 2023-09-20 15:36:34 +04:00
3a1bf92291 Merge branch 'develop' into feature/leave-room 2023-09-20 13:20:56 +04:00
Viktor Fomin
915eef9d91 Client: add translate 2023-09-20 11:30:28 +03:00
mushka-n
693a1bf02b merge with develop (and submit-to-form-gallery) 2023-09-19 16:42:56 +03:00
Viktor Fomin
19e1b51887 Merge branch 'develop' into feature/split-invite 2023-09-19 14:04:18 +03:00
bf48ce5393 Merge branch 'develop' into feature/web-plugins 2023-09-19 14:02:42 +03:00
fb6d0b06a9 edited 'Move to Trash' description 2023-09-19 12:29:04 +03:00
mushka-n
2b58726b86 Merge branch 'develop' into feature/new-form-gallery 2023-09-19 12:02:57 +03:00
ca76336fc3 Merge branch 'develop' into feature/leave-room 2023-09-19 10:44:07 +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
gazizova-vlada
c34f60577d Web:Client:Add translation. 2023-09-19 09:08:14 +03:00
91ae0883e9 Web:Client:Plugins: fix plugin dialog 2023-09-19 08:58:48 +03:00
gazizova-vlada
4d1fc192d0 Web:Client:Change translation Account list to List accounts. 2023-09-18 18:43:18 +03:00
mushka-n
d98680b350 moved translations and updated selector 2023-09-18 17:10:16 +03:00
74f9ea784b Merge branch 'develop' into feature/submit-to-form-gallery 2023-09-18 16:31:27 +04:00
2f1f2ef4fa Web: Client: fix long text in theme edit button 2023-09-18 13:28:32 +02:00
e0b4b232df Web: Files: Leave-room: fixed translations 2023-09-18 13:50:33 +03:00
95424d49f9 Web: Added ru translations + autofixes 2023-09-18 14:17:00 +04:00
mushka-n
da7aec7445 Merge branch 'develop' into feature/submit-to-form-gallery 2023-09-18 13:06:39 +03:00
0deac4bf00 Merge branch 'develop' into feature/mobile-sdk 2023-09-18 13:45:20 +04:00
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
a81c62a099 Merge branch 'develop' into feature/new-form-gallery 2023-09-15 00:45:03 +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
671ed5dadf Client: delete useless translations 2023-09-13 15:51:15 +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
b657d3731b merge develop + merge fix 2023-09-12 02:13:05 +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
33bda424b3 added translations 2023-09-08 13:17:13 +03: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
e3f129ea64 Web: Deleted old translations. 2023-09-08 11:34:35 +03:00
8764179bdb Web: Removed old translations. 2023-09-08 11:29:20 +03: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
gazizova-vlada
e92dc1fe0e Web:Client:Delete irrelevant translations. 2023-09-07 16:47:34 +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
6a253d4799 Web: Client: Locales: Removed unused "Shorten" key 2023-09-07 13:38:41 +03: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
500807c510 added ar 2023-08-31 15:24:21 +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
139d8fc65a Merge branch 'hotfix/v1.1.2' into feature/adding_translations 2023-08-30 19:08:33 +04: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
c9f22f83b6 added new translations 2023-08-30 15:23:58 +03:00
c18dfe8434 added new translations 2023-08-29 21:05:00 +03:00
1ab29e511b Web: Added translation. 2023-08-29 17:50:44 +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
c6c74e5948 edited API library 2023-08-25 17:25:26 +03:00
4f456c7717 edited zh Settings.json 2023-08-25 15:49:11 +03:00
205cbda30d edited BETA zh 2023-08-25 14:33:45 +03:00
245325c563 added translations hy, ro 2023-08-25 13:40:27 +03:00
712db4d4ee edited Api -> API 2023-08-25 12:57:31 +03:00
e24755cbf4 added translations 2023-08-25 12:44:50 +03:00
4b4b4f747f added translations 2023-08-25 11:52:45 +03:00
Mushka Nikita
dee06aa519 Merge branch 'develop' into feature/new-form-gallery 2023-08-23 00:57:25 +03:00
Mushka Nikita
fe88c657de merge develop + merge bugfix 2023-08-22 03:25:02 +03:00
Mushka Nikita
c148a8f55a finised client-side, provided functionality for sort, locale and category filters. ip for category and search filters 2023-08-22 00:30:34 +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
f8c74d12bd added translations 2023-08-03 18:27:59 +03:00
Mushka Nikita
30066705c5 Merge branch 'develop' into feature/document-service-location 2023-07-27 15:36:17 +03:00
a46a82180c Web: Renamed translation 2023-07-26 18:56:07 +04:00
a67f301608 Web: Files: fixed translations 2023-07-25 19:04:28 +03:00
7d727e0842 Merge branch 'develop' into feature/public-room
# Conflicts:
#	packages/client/src/components/dialogs/index.js
#	packages/client/src/components/panels/UploadPanel/index.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/client/src/store/FilesStore.js
2023-07-25 13:01:21 +03:00
b90bfda75c Merge branch 'develop' into feature/leave-room
# Conflicts:
#	packages/client/src/store/FilesStore.js
2023-07-25 12:37:24 +03:00
Mushka Nikita
a7dab5df0b Merge branch 'develop' into feature/document-service-location 2023-07-25 12:11:39 +03:00
a2ddfb54f1 Web: Files: added LINKS_LIMIT_COUNT, fixed bugs 2023-07-19 16:43:21 +03:00
17be338ccf Web: Files: fixed empty links context-menu 2023-07-19 15:24:05 +03:00
e15b111e36 Web: Files: fixed LinkDeletedSuccessfully translation 2023-07-19 13:11:07 +03:00
ab472b0148 Merge branch 'master' into develop
# Conflicts:
#	.gitignore
#	build/install/docker/Dockerfile.dev
#	build/install/docker/build.dev.yml
#	build/install/docker/docspace.dev.yml
#	build/install/win/DocSpace.aip
#	common/ASC.ActiveDirectory/Base/DbHelper.cs
#	common/ASC.Api.Core/Model/EmployeeDto.cs
#	common/ASC.Core.Common/Billing/ITariffService.cs
#	common/ASC.Core.Common/Billing/License/LicenseReader.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Core.Common/Messaging/MessagesContext.cs
#	common/ASC.Core.Common/Tenants/TenantCookieSettings.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/IQuotaController.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj
#	common/Tools/ASC.Migration.Runner/ASC.Migration.Runner.csproj
#	common/Tools/ASC.Migration.Runner/GlobalUsings.cs
#	common/Tools/ASC.Migration.Runner/MigrationRunner.cs
#	common/Tools/ASC.Migration.Runner/Program.cs
#	common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
#	common/Tools/ASC.Migrations.Core/Models/ConfigurationInfo.cs
#	common/Tools/ASC.Migrations.Core/Utils/DbContextActivator.cs
#	common/services/ASC.ClearEvents/Services/ClearEventsService.cs
#	common/services/ASC.ElasticSearch/Core/SearchSettings.cs
#	common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
#	config/nginx/onlyoffice.conf
#	migrations/mysql/ASC.Migrations.MySql.csproj
#	migrations/mysql/SaaS/AccountLinkContext/20221019144349_AccountLinkContextMigrate.Designer.cs
#	migrations/mysql/SaaS/AccountLinkContext/20221019144349_AccountLinkContextMigrate.cs
#	migrations/mysql/SaaS/AccountLinkContext/AccountLinkContextModelSnapshot.cs
#	migrations/mysql/SaaS/BackupsContext/20230130103901_BackupsContextMigrate.Designer.cs
#	migrations/mysql/SaaS/BackupsContext/20230130103901_BackupsContextMigrate.cs
#	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/CustomDbContext/20221019144350_CustomDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/CustomDbContext/20221019144350_CustomDbContextMigrate.cs
#	migrations/mysql/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/FeedDbContext/20221019144344_FeedDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/FeedDbContext/20221019144344_FeedDbContextMigrate.cs
#	migrations/mysql/SaaS/FeedDbContext/FeedDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.cs
#	migrations/mysql/SaaS/FilesDbContext/20230515174318_FilesDbContext_Upgrade1.Designer.cs
#	migrations/mysql/SaaS/FilesDbContext/20230515174318_FilesDbContext_Upgrade1.cs
#	migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/FirebaseDbContext/20221019144351_FirebaseDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/FirebaseDbContext/20221019144351_FirebaseDbContextMigrate.cs
#	migrations/mysql/SaaS/FirebaseDbContext/FirebaseDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/InstanceRegistrationContext/20221019144346_InstanceRegistrationContextMigrate.Designer.cs
#	migrations/mysql/SaaS/InstanceRegistrationContext/20221019144346_InstanceRegistrationContextMigrate.cs
#	migrations/mysql/SaaS/InstanceRegistrationContext/InstanceRegistrationContextModelSnapshot.cs
#	migrations/mysql/SaaS/IntegrationEventLogContext/20221019144342_IntegrationEventLogContextMigrate.Designer.cs
#	migrations/mysql/SaaS/IntegrationEventLogContext/20221019144342_IntegrationEventLogContextMigrate.cs
#	migrations/mysql/SaaS/IntegrationEventLogContext/IntegrationEventLogContextModelSnapshot.cs
#	migrations/mysql/SaaS/MessagesContext/20221019144345_MessagesContextMigrate.Designer.cs
#	migrations/mysql/SaaS/MessagesContext/20221019144345_MessagesContextMigrate.cs
#	migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
#	migrations/mysql/SaaS/NotifyDbContext/20221019144352_NotifyDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/NotifyDbContext/20221019144352_NotifyDbContextMigrate.cs
#	migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.Designer.cs
#	migrations/mysql/SaaS/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.cs
#	migrations/mysql/SaaS/TeamlabSiteContext/20230621121634_TeamlabSiteContextMigrate.Designer.cs
#	migrations/mysql/SaaS/TeamlabSiteContext/20230621121634_TeamlabSiteContextMigrate.cs
#	migrations/mysql/SaaS/TelegramDbContext/20221019144353_TelegramDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/TelegramDbContext/20221019144353_TelegramDbContextMigrate.cs
#	migrations/mysql/SaaS/TelegramDbContext/TelegramDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/TenantDbContext/20221019144354_TenantDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/TenantDbContext/20221019144354_TenantDbContextMigrate.cs
#	migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/UrlShortenerFakeDbContext/20221019144355_UrlShortenerFakeDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/UrlShortenerFakeDbContext/20221019144355_UrlShortenerFakeDbContextMigrate.cs
#	migrations/mysql/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.cs
#	migrations/mysql/SaaS/UserDbContext/UserDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/WebhooksDbContext/20221019144343_WebhooksDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/WebhooksDbContext/20221019144343_WebhooksDbContextMigrate.cs
#	migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/WebstudioDbContext/20221019144356_WebstudioDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/WebstudioDbContext/20221019144356_WebstudioDbContextMigrate.cs
#	migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
#	migrations/mysql/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.Designer.cs
#	migrations/mysql/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.cs
#	migrations/postgre/ASC.Migrations.PostgreSql.csproj
#	migrations/postgre/SaaS/AccountLinkContext/20221019144350_AccountLinkContextMigrate.Designer.cs
#	migrations/postgre/SaaS/AccountLinkContext/20221019144350_AccountLinkContextMigrate.cs
#	migrations/postgre/SaaS/AccountLinkContext/AccountLinkContextModelSnapshot.cs
#	migrations/postgre/SaaS/BackupsContext/20230130103902_BackupsContextMigrate.Designer.cs
#	migrations/postgre/SaaS/BackupsContext/20230130103902_BackupsContextMigrate.cs
#	migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
#	migrations/postgre/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
#	migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/CustomDbContext/20221019144351_CustomDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/CustomDbContext/20221019144351_CustomDbContextMigrate.cs
#	migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/FeedDbContext/20221019144345_FeedDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/FeedDbContext/20221019144345_FeedDbContextMigrate.cs
#	migrations/postgre/SaaS/FeedDbContext/FeedDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.cs
#	migrations/postgre/SaaS/FilesDbContext/20230515174319_FilesDbContext_Upgrade1.Designer.cs
#	migrations/postgre/SaaS/FilesDbContext/20230515174319_FilesDbContext_Upgrade1.cs
#	migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/FirebaseDbContext/20221019144352_FirebaseDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/FirebaseDbContext/20221019144352_FirebaseDbContextMigrate.cs
#	migrations/postgre/SaaS/FirebaseDbContext/FirebaseDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/InstanceRegistrationContext/20221019144347_InstanceRegistrationContextMigrate.Designer.cs
#	migrations/postgre/SaaS/InstanceRegistrationContext/20221019144347_InstanceRegistrationContextMigrate.cs
#	migrations/postgre/SaaS/InstanceRegistrationContext/InstanceRegistrationContextModelSnapshot.cs
#	migrations/postgre/SaaS/IntegrationEventLogContext/20221019144343_IntegrationEventLogContextMigrate.Designer.cs
#	migrations/postgre/SaaS/IntegrationEventLogContext/20221019144343_IntegrationEventLogContextMigrate.cs
#	migrations/postgre/SaaS/IntegrationEventLogContext/IntegrationEventLogContextModelSnapshot.cs
#	migrations/postgre/SaaS/MessagesContext/20221019144346_MessagesContextMigrate.Designer.cs
#	migrations/postgre/SaaS/MessagesContext/20221019144346_MessagesContextMigrate.cs
#	migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
#	migrations/postgre/SaaS/NotifyDbContext/20221019144353_NotifyDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/NotifyDbContext/20221019144353_NotifyDbContextMigrate.cs
#	migrations/postgre/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/TelegramDbContext/20221019144354_TelegramDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/TelegramDbContext/20221019144354_TelegramDbContextMigrate.cs
#	migrations/postgre/SaaS/TelegramDbContext/TelegramDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/TenantDbContext/20221019144355_TenantDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/TenantDbContext/20221019144355_TenantDbContextMigrate.cs
#	migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.cs
#	migrations/postgre/SaaS/UserDbContext/UserDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/WebhooksDbContext/20221019144344_WebhooksDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/WebhooksDbContext/20221019144344_WebhooksDbContextMigrate.cs
#	migrations/postgre/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/WebstudioDbContext/20221019144357_WebstudioDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/WebstudioDbContext/20221019144357_WebstudioDbContextMigrate.cs
#	migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
#	packages/client/src/Shell.jsx
#	packages/client/src/components/Article/Body/Items.js
#	packages/client/src/components/Article/Body/index.js
#	packages/client/src/components/EmptyContainer/RoomNoAccessContainer.js
#	packages/client/src/components/EmptyContainer/RootFolderContainer.js
#	packages/client/src/components/panels/InvitePanel/index.js
#	packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
#	packages/client/src/components/panels/InvitePanel/sub-components/Item.js
#	packages/client/src/components/panels/InvitePanel/sub-components/ItemsList.js
#	packages/client/src/components/panels/SelectFileDialog/AsideView.js
#	packages/client/src/components/panels/SelectFileDialog/index.js
#	packages/client/src/components/panels/SelectFolderDialog/index.js
#	packages/client/src/components/panels/SelectionPanel/ExceptionFoldersConstants.js
#	packages/client/src/components/panels/SelectionPanel/SelectionPanelBody.js
#	packages/client/src/components/panels/SelectionPanel/StyledSelectionPanel.js
#	packages/client/src/pages/Accounts.jsx
#	packages/client/src/pages/AccountsHome/index.js
#	packages/client/src/pages/Confirm/index.js
#	packages/client/src/pages/Confirm/sub-components/removePortal.js
#	packages/client/src/pages/Errors/520/index.js
#	packages/client/src/pages/Files.jsx
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableContainer.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Filter/index.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/pages/Home/Section/SettingsBody/index.js
#	packages/client/src/pages/Home/index.js
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
#	packages/client/src/pages/PortalSettings/categories/common/sub-components/common-tooltips.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/index.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/FieldMapping.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/IdpSettings.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/ProviderMetadata.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/MetadataUrlField.js
#	packages/client/src/pages/PortalSettings/categories/payments/index.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/mobileView.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/sessionLifetime.js
#	packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
#	packages/client/src/pages/PortalSettings/index.js
#	packages/client/src/pages/PortalSettings/utils/settingsTree.js
#	packages/client/src/pages/Profile/Section/Body/sub-components/interface-theme/index.js
#	packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
#	packages/client/src/pages/VersionHistory/Section/Body/StyledVersionHistory.js
#	packages/client/src/pages/VersionHistory/Section/Body/VersionRow.js
#	packages/client/src/pages/Wizard/index.js
#	packages/client/src/store/AccountsContextOptionsStore.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/client/src/store/FilesStore.js
#	packages/common/components/Article/index.js
#	packages/common/components/Article/sub-components/article-alerts.js
#	packages/common/components/Article/sub-components/article-header.js
#	packages/common/components/FilterInput/sub-components/FilterBlock.js
#	packages/common/components/Loaders/index.js
#	packages/common/components/MediaViewer/sub-components/ImageViewer/ImageViewer.props.ts
#	packages/common/components/MediaViewer/sub-components/ImageViewer/index.tsx
#	packages/common/components/PrivateRoute/index.js
#	packages/common/store/SettingsStore.js
#	packages/common/store/UserStore.js
#	packages/common/utils/index.ts
#	packages/components/file-input/index.js
#	packages/components/selector/StyledSelector.js
#	packages/components/selector/index.tsx
#	packages/components/selector/sub-components/Body/index.tsx
#	packages/components/slider/styled-slider.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs
#	products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Service/Cleanup/Worker.cs
#	products/ASC.People/Server/Api/UserController.cs
#	public/scripts/api.js
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/PaymentsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/LicenseController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Api/Settings/TfaappController.cs
#	web/ASC.Web.Api/Api/SmtpSettingsController.cs
#	web/ASC.Web.Api/Core/SmtpOperation.cs
#	web/ASC.Web.Core/CookiesManager.cs
#	yarn.lock
2023-07-18 19:26:32 +03:00
76a9126d4e Web: Files: Public-room: added "Limit by time period" block 2023-07-18 15:21:19 +03:00
9c7a3157c3 Web: Files: Leave-room: fixed translations, fixed bugs 2023-07-18 12:53:03 +03:00
gazizova-vlada
898b98e0fc Web:Client:Add translations. 2023-07-17 21:18:42 +03:00
96b249eef4 Web: Files: added leave-room api 2023-07-17 18:17:05 +03:00
b4ef0eecb8 added translations 2023-07-14 16:52:19 +03:00
9b32618dd2 added translations 2023-07-14 16:01:54 +03:00
057bccb801 added translations 2023-07-13 18:20:52 +03:00
46390d1e30 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-07-13 13:46:08 +03:00
835d0e8da0 added translations 2023-07-13 13:45:17 +03:00
bcaa84d175 Web: Files: added restore public-room translation 2023-07-13 13:09:11 +03:00
dc59259fd0 Revert "added translations"
This reverts commit 47314b61c5, reversing
changes made to e22a56e032.

# Conflicts:
#	build/install/OneClickInstall/install-Docker.sh
#	build/install/win/DocSpace.aip
#	packages/client/public/locales/bg/Settings.json
#	packages/client/public/locales/cs/Settings.json
#	packages/client/public/locales/ja-JP/Settings.json
#	packages/client/public/locales/lv/Settings.json
#	packages/client/public/locales/uk-UA/Settings.json
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/MetadataUrlField.js
2023-07-13 13:02:08 +03:00
1bccd63c81 Web: Client: PortalSettings: Added base CSP UI and api actions 2023-07-13 11:11:05 +03:00
gazizova-vlada
7609ae4258 Web:Client:Delete DeleteUsersDialog translates, delete "DeleteUserMessage". 2023-07-12 21:39:03 +03:00
694bae6d1b added translations 2023-07-12 18:20:42 +03:00
gazizova-vlada
ba8aa844b1 Web:Client:Merged the delete dialog for one user and multiple users into one dialog. 2023-07-12 18:15:31 +03:00
d2fc13109c Merge branch 'develop' into feature/leave-room
# Conflicts:
#	packages/client/src/components/FilesPanels/index.js
2023-07-12 13:18:38 +03:00
gazizova-vlada
6e9e3e07f8 Web:Changed content, translations. 2023-07-11 23:05:25 +03:00
9eab04b96a added translations 2023-07-11 19:14:08 +03:00
gazizova-vlada
514f188fe9 Web:Client:Change translate for ChangeUserStatusDialog. 2023-07-11 18:32:48 +03:00
47314b61c5 added translations 2023-07-11 18:32:19 +03:00
812010a8af added translations 2023-07-11 18:22:23 +03:00
9973f89e8b Web: Client: PortalSettings: Added "Api information" page 2023-07-11 14:53:52 +03:00
10ddb99d11 Web: Client: PortalSettings: Added "Integration request" block 2023-07-10 23:58:58 +03:00
4f161741c4
Merge pull request #1513 from ONLYOFFICE/feature/tooltip-descriptions
feature/tooltip-descriptions
2023-07-10 21:14:11 +04:00
29dfa9b79f Update Settings.json 2023-07-10 21:07:37 +04:00
075235c4f5 Update Settings.json 2023-07-10 21:03:46 +04:00
f0d1521817 Web: Fix translations 2023-07-10 21:02:45 +04:00
75b88d4ecc Update Settings.json 2023-07-10 20:53:17 +04:00
3e18110da9 added translations 2023-07-10 18:16:31 +03:00
Elyor Djalilov
35f778e103 Web: Client: PortalSettings: removed incorrect translates 2023-07-10 19:22:21 +05:00
Elyor Djalilov
51c3eb4ce3 Web: Client: PortalSettings: replaced tag strong to index in locales 2023-07-10 18:06:11 +05:00
Elyor Djalilov
a206e52d12 Web: Client: PortalSettings: fix different formatting 2023-07-10 14:54:54 +05:00
5fb08b11e8 Web: Files: Public-room: added expiration date 2023-07-10 10:48:17 +03:00
fe2978d87e Merge branch 'release/v1.1.0' into feature/tooltip-descriptions 2023-07-07 18:44:36 +04:00
57a9eee283 added translations 2023-07-07 16:36:50 +03:00
gazizova-vlada
b144bf3554 Web:Add DataReassignmentDialog in locales. 2023-07-07 15:05:28 +03:00
bf718fc5d7 Web: Client: Locales: Added new keys for JavascriptSdk 2023-07-07 12:37:02 +03:00
6961d14394 Web: Files: Public-room: added archive view 2023-07-07 12:29:14 +03:00
2e14572fc0 Merge branch 'develop' into feature/public-room
# Conflicts:
#	packages/client/src/components/panels/OperationsPanel/index.js
#	packages/client/src/components/panels/SelectFolderDialog/index.js
#	packages/client/src/components/panels/SelectionPanel/FilesListWrapper.js
#	public/images/clock.react.svg
2023-07-07 10:35:33 +03:00
Mushka Nikita
1ef7981216 added translations to document service location page 2023-07-06 16:31:25 +03:00
Elyor Djalilov
fb3ad7eabe Web: Client: PortalSettings: fix tfa tooltip description 2023-07-05 22:52:43 +05:00
31cd81ff7b Merge branch 'release/v1.1.0' into feature/tooltip-descriptions 2023-07-05 19:12:36 +04:00
Elyor Djalilov
452fb75686 Web: Client: PortalSettings: changed tooltip descriptions 2023-07-05 14:55:17 +05:00
c078d756ce Web: Client: Locales: Added new keys for JavascriptSdk 2023-07-04 18:05:20 +03:00
2f79b3baae added translations 2023-06-30 13:40:20 +03:00