Commit Graph

235 Commits

Author SHA1 Message Date
Timofey
48daf70cd5 Web: add new icons for new search 2022-01-20 20:04:28 +08:00
bedfad1ec5 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
ab931e40ef edit bg, az 2021-12-23 11:23:25 +03:00
93cbab055c edit lo 2021-12-16 15:59:02 +03:00
30860f041a add new keys ro, lo, edit keys az 2021-12-15 13:56:30 +03:00
878df989d9 Web: Renamed folder zh_CN to zh-CN 2021-12-09 21:51:05 +03:00
8538b55dfc Web: Turned on all languages 2021-12-09 21:45:10 +03:00
20a17fca96 rename pt 2021-12-07 16:50:09 +03:00
f0e1ba5716 edit pl 2021-12-07 16:36:09 +03:00
25472623c5 edit ja Common 2021-12-07 11:48:32 +03:00
e6fe4cd1c0 edit az 2021-12-07 11:15:37 +03:00
4565d32979 add vi 2021-12-07 10:38:31 +03:00
58bdddd486 add pt_PT 2021-12-06 18:23:10 +03:00
8378850d92 add uk 2021-12-06 17:30:16 +03:00
1d659a6841 add az 2021-12-06 17:09:53 +03:00
4ac6064578 add 'Save as oform' 2021-12-06 11:03:52 +03:00
01b46993e3 Merge branch 'feature/translate-1.1.0' of github.com:ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-02 18:52:10 +03:00
857c8f91d3 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-02 18:51:52 +03:00
3f114a58d7 Web: Locales: Changed translation "Make form" to "Save as oform" 2021-12-02 18:51:04 +03:00
ed4aca1773 add pl 2021-12-02 15:56:04 +03:00
9ec247e59c update pt-BR 2021-12-01 18:18:05 +03:00
571400092c add el, bg 2021-12-01 17:41:40 +03:00
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
d31ea87211 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-11-21 13:57:55 +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
8cc08045b7 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
2021-11-01 13:54:40 +03:00
fe65632277 Web: Common: changed media-viewer icons, fixed media styles 2021-10-28 14:20:06 +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