Commit Graph

838 Commits

Author SHA1 Message Date
fdcac6f4da Merge branch 'develop' into feature/trash-filter-by-room 2023-05-30 11:56:18 +04:00
19e8b2210a Merge branch 'master' into develop
# Conflicts:
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
#	packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/pages/Home/index.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/components/Article/sub-components/article-payment-alert.js
#	packages/common/components/Section/index.js
#	packages/components/floating-button/styled-floating-button.js
#	packages/login/src/client/App.tsx
#	packages/login/src/client/components/Invalid/index.tsx
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	yarn.lock
2023-05-29 14:36:12 +03:00
e08f381074 Merge branch 'develop' into feature/trash-filter-by-room 2023-05-25 15:29:21 +04:00
Mushka Nikita
191de3e991 added filter by room to trash 2023-05-22 12:27:09 +03:00
8f1e35b818 added translations 2023-05-19 17:23:00 +03:00
b1d48db4a5 Web:Add locales DescriptionOfTheEveryoneRole, DescriptionOfTheRoleQueue. 2023-05-17 16:47:13 +03:00
0b4439d1cf Web:Add example avatar. 2023-05-17 12:09:49 +03:00
8700a64afc Web:Add everyone role button image. 2023-05-15 22:20:11 +03:00
85205659ec Fix UselessModuleTranslationKeysTest issue (key: Copy) 2023-05-15 16:34:09 +04:00
3d40fdd1e5 Fix UselessModuleTranslationKeysTest issue (key: Rename) 2023-05-15 16:22:34 +04:00
7638c25dc0 Fix UselessModuleTranslationKeysTest issue (key: MoveTo) 2023-05-15 16:16:15 +04:00
db1bcf5fc3 Fix UselessModuleTranslationKeysTest issue (key: Authorization) 2023-05-15 15:35:09 +04:00
3e5b90dcc1 added lo 2023-05-15 11:54:51 +03:00
9a3503b3ef Web:Add AddRoleButton image. 2023-05-15 10:43:07 +03:00
dbe48a260d added translations 2023-05-12 18:18:10 +03:00
7e560e8826 Web: Deleted unused translation. 2023-05-12 09:22:23 +03:00
e96252937d Web: Payment alert description changed. 2023-05-11 18:30:39 +03:00
4817ccbfb3 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-10 18:43:17 +03:00
a0293fee03 added translations 2023-05-10 18:42:42 +03:00
Viktor Fomin
248743f614 Web: add translates 2023-05-10 17:39:23 +03:00
7bed1e829c edited Chinese 2023-05-02 15:14:05 +03:00
25fed493da Merge branch 'develop' into feature/action-buttons-hints 2023-04-28 17:10:46 +04:00
9de8d7eb9c edited translation cs 2023-04-27 17:44:46 +03:00
NikitaVashchuk
9712466c98 png images for notifications 2023-04-22 16:21:35 +05:00
1d15a0345f added translations 2023-04-20 18:21:37 +03:00
bccb3c86e3 Web: Files: added titles to info-panel icon, table-settings icon 2023-04-20 15:35:56 +03:00
97cd9824e1 Add translations (vi) 2023-04-19 16:32:38 +03:00
Viktor Fomin
d1956bc0ef Fix Bug 62136: applied social buttons disabled style 2023-04-18 21:07:31 +03:00
854881e27c added translations 2023-04-17 12:14:14 +03:00
fe21ae5277 added translations 2023-04-14 19:15:52 +03:00
a16c6b2d66 added translations 2023-04-14 16:20:48 +03:00
fb72d3b3b5 Translations: Moved duplicate key to common 2023-04-13 17:54:29 +04:00
eafd0f0c0e Translations: Moved duplicate key to common (EnDublicatesByContentTest issue) 2023-04-13 17:42:08 +04:00
203bca8f29 added translations 2023-04-13 15:33:09 +03:00
7c5bd626e1 edited variables 2023-04-13 12:59:39 +03:00
b0c3bc0802 added translations 2023-04-12 17:44:51 +03:00
76d26b632c added translations 2023-04-12 14:20:40 +03:00
0a818c73ff added translations 2023-04-11 19:06:43 +03:00
d0a4bff865 added translations 2023-04-11 17:12:13 +03:00
debf275864 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-10 15:35:23 +03:00
ee49a99dde Update translations: bg, el, lo, pt 2023-04-10 15:35:14 +03:00
fb5ca13e7c Fix WrongTranslationVariablesTest issue 2023-04-10 15:08:17 +04:00
f864c4b558 Add translations 2023-04-07 18:28:10 +03:00
d0a100c767 added translations 2023-04-07 12:01:35 +03:00
800e665f22 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-06 18:57:37 +04:00
91489a069c Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-06 17:48:26 +03:00
dcca9fda56 Add translations 2023-04-06 17:48:09 +03:00
37202673ad Web: Added new translation key "Support" 2023-04-06 18:42:12 +04:00
38028ca481 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-06 16:16:33 +03:00
b584fb1872 added translations 2023-04-06 16:16:13 +03:00