Commit Graph

566 Commits

Author SHA1 Message Date
abbeba5d32 Web: Files: removed unused translations 2023-10-19 14:29:24 +03:00
fc93d059b9 Web: Files: added new translations for the public-room 2023-10-18 14:49:15 +03:00
38b1bb5c06
Merge pull request #16 from ONLYOFFICE/feature/room-primary-link
Feature/room primary link
2023-10-17 18:45:29 +04:00
ed36ed779a Web: Files: added CopyPrimaryLink translation 2023-10-17 13:57:35 +03:00
b99c5591b1 Fix ru translation 2023-10-17 11:14:43 +04:00
6ac05b3a56 Web: Files: Fixed archive view 2023-10-16 15:51:56 +03:00
1f6e3aa3a3 Merge branch 'develop' into feature/room-primary-link
# Conflicts:
#	packages/client/src/components/QuickButtons.js
#	packages/client/src/components/panels/EditLinkPanel/index.js
2023-10-13 18:27:53 +03:00
Viktor Fomin
6cb3ef610d Client: delete useless 2023-10-06 15:03:29 +03:00
3cdbdd6521 Web: Files: added new translations 2023-10-05 15:41:50 +03:00
13d090c178 Web: Added ru translations + autofixes 2023-09-29 17:59:55 +04:00
3e204513a4 Web: added ru translation (FileManagement key) + autosorting 2023-09-28 12:44:30 +04:00
88b283a28a Web: Changed translations of NotFoundUsersDescription, SearchEmptyDescription keys 2023-09-26 12:21:40 +04: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
3c9dfca8c8 Web: Removed useless translations 2023-09-22 17:16:52 +04:00
a6d9ea95e9 Web: Removed useless key DNSSettingsTooltip 2023-09-22 17:13:57 +04:00
a4a89ed1c4 web: Fix DocumentServiceLocationHeaderInfo value + auto refactoing 2023-09-22 16:25:41 +04: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
Viktor Fomin
b3023358f2 Client: delete useless 2023-09-20 17:35:56 +03:00
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
Viktor Fomin
19e1b51887 Merge branch 'develop' into feature/split-invite 2023-09-19 14:04:18 +03:00
fb6d0b06a9 edited 'Move to Trash' description 2023-09-19 12:29:04 +03:00
Vlada Gazizova
3471bbf09f
Merge branch 'develop' into feature/reassign-data 2023-09-19 09:54:45 +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
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
Viktor Fomin
71e5179f64 Merge branch 'develop' into feature/split-invite 2023-09-15 18:12:30 +03:00
mushka-n
cf735a6fbe Merge branch 'develop' into feature/submit-to-form-gallery 2023-09-15 00:43:58 +03:00
Viktor Fomin
671ed5dadf Client: delete useless translations 2023-09-13 15:51:15 +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
Akmal Isomadinov
bbd40500c9 Merge branch 'develop' into feature/cron 2023-09-13 16:11:13 +05:00
b3470375cb Web: Fix translations to other languages 2023-09-12 17:57:27 +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
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
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
21fd5aa9d5 Merge branch 'develop' into feature/cron 2023-09-11 12:34:41 +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
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
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