Commit Graph

204 Commits

Author SHA1 Message Date
db20e966e2 update translations 2021-11-30 11:58:46 +03:00
b2c123d6f4 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-11-30 11:46:22 +03:00
850eb13b0d Merge branch 'release/v1.1.0' into feature/make-form 2021-11-29 14:20:02 +03:00
4dac8e9ce6 Web: Components: changed expander-down.react.svg, fixed styles 2021-11-29 13:11:01 +03:00
50f985a374 update translations 2021-11-29 12:12:38 +03:00
aed178f0b1 Web: updated icons 2021-11-29 11:58:27 +03:00
22efc180de Web: Added translation for make form action 2021-11-26 17:36:55 +03:00
45c5562262 Web: Added make form icon 2021-11-26 17:36:22 +03:00
3bee202d41 Web: Files: Replaced translation on common. 2021-11-22 14:23:45 +03:00
f675415228 Merge branch 'master' into release/v1.1.0
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/public/locales/en/SelectFile.json
#	products/ASC.Files/Client/public/locales/en/SelectFolder.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/public/locales/en/Translations.json
#	products/ASC.People/Client/public/locales/ru/Translations.json
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
2021-11-21 14:26:20 +03:00
180ca914ad Web: Files: HOC: Fixed form icon inside context menu 2021-11-19 18:08:11 +03:00
839d81f356 Web: Files: Added "Fill in the form" context menu action from ".ofrom" files 2021-11-19 13:25:09 +03:00
8a0b29c12b Web: Files: Added '.oform' files edit icon + update access.edit.react.svg 2021-11-19 12:57:56 +03:00
adbb316dd2 Web: moved "Owner" translation to Common 2021-11-15 18:33:32 +03:00
d6836cc3d3
Merge pull request #457 from ONLYOFFICE/feature/translate-1.0.1
Feature/translate 1.0.1
2021-11-13 20:04:11 +03:00
c7c7267a9a Test: Added new WrongTranslationVariablesTest and fix it's issues 2021-11-13 19:03:10 +03:00
1c8f091dce Web: Fix DublicatesByContentTest translation issues 2021-11-12 20:12:33 +03:00
1b6c02352b Web: Fixed icons for docxf and oform file formats 2021-11-12 19:20:14 +03:00
1e1df5b5c9 Web: Fixed icons for docxf and oform file formats 2021-11-12 17:17:28 +03:00
eb1db9eea6 Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-02 18:15:53 +03:00
20e59a7cbe Web: Common: changed media-viewer icons, fixed media styles 2021-11-02 17:51:44 +03:00
aa79ef2c9d Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-02 14:03:26 +03:00
93ab1e46ce Web: Fixed docxf icon container width 2021-10-26 19:54:19 +03:00
743325984b Web: Fixed docxf icon container width 2021-10-26 19:48:41 +03:00
f5d31dcff2 Web: Files: Fixed icons blur, added new icons 2021-10-26 16:55:52 +03:00
9128a3d0ff Web: Files: Added docxf and oform format icons 2021-10-26 16:55:09 +03:00
26183d14bf Web: add new pencil icon 2021-10-20 00:41:05 +03:00
4bd4954ad4 Merge branch 'release/1.0.0' into feature/desktop-login 2021-10-19 13:10:47 +03:00
9dd28a144d Web: Fixed callback pages, added login callback for desktop client 2021-10-19 10:31:34 +03:00
fb7922f579 Thirdparty: login. Desktop 2021-10-15 11:34:34 +03:00
678fa4c119 Web: Added desktop parameter from url for oAuth login 2021-10-14 15:24:13 +03:00
5005e0a6c0 Web: Icons: Fixed old checkbox icons, change header plus icon 2021-10-14 13:09:54 +03:00
af31f2fb9b Client: thirdparty. Fixed getObjectByLocation 2021-10-13 10:29:07 +03:00
bb2cac21d7 Fix bug 51706: missing icons 2021-10-12 15:38:05 +03:00
ebcb6c93ea Web: Client: Files: Added kDrive, WebDav and Yandex clouds icons for tree menu 2021-09-30 12:13:52 +03:00
4531d38e6f Web: Removed duplicates 2021-09-24 21:18:50 +03:00
551c623541 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
# Conflicts:
#	packages/asc-web-components/campaigns-banner/index.js
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2021-09-08 14:36:10 +03:00
350f24cf56 Web: Client: Common: Fixed PasswordLimitLength translation key for SK locale 2021-09-08 11:12:22 +03:00
a10ad2939a Fix bug 52276: fuzzy icons 2021-09-08 10:43:57 +03:00
24e13fb79d Web: deleted campaigns locales 2021-09-07 12:47:53 +03:00
bd0388ea62 Web: fixed icons size 2021-08-31 19:31:59 +03:00
4c8449b48e Web: Files: fixed folders icons 2021-08-28 16:07:36 +03:00
2e46034ab0 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-27 20:45:31 +03:00
28393c90f6 Web: moved file icons 2021-08-27 20:44:50 +03:00
ccd7532161 Merge branch 'develop' into release/1.0.0
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
2021-08-27 17:45:52 +03:00
4f30eb9a2a Web: removed duplicate translations from Common.json 2021-08-27 11:09:19 +03:00
ff7f3926ce Merge branch 'develop' into feature/table-view
# Conflicts:
#	packages/asc-web-common/components/PageLayout/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	public/locales/de/Common.json
#	public/locales/it/Common.json
#	public/locales/lo/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/ro/Common.json
2021-08-26 16:05:15 +03:00
c66268a9c2 Merge branch 'develop' into release/1.0.0
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/helpers/utils.js
2021-08-26 13:49:25 +03:00
38983cf306 Web: added tiff script 2021-08-19 13:27:44 +03:00
8e0320460c Web: Fixed after merge. 2021-08-19 10:40:40 +03:00