Commit Graph

20575 Commits

Author SHA1 Message Date
982c3d9488 Fix Bug 57220: Something went wrong when navigate in Trash 2022-05-18 22:40:15 +03:00
128021653d Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	products/ASC.Files/Client/public/locales/bg/ConnectDialog.json
#	products/ASC.Files/Client/public/locales/ro/Article.json
#	products/ASC.Files/Client/public/locales/ro/FormGallery.json
#	products/ASC.Files/Client/public/locales/ro/Home.json
#	products/ASC.Files/Client/public/locales/ro/InfoPanel.json
#	products/ASC.Files/Client/public/locales/ro/SelectFolder.json
#	products/ASC.Files/Client/public/locales/ro/Settings.json
#	products/ASC.Files/Client/public/locales/ro/Translations.json
2022-05-18 20:18:32 +03:00
b2f6ce39f7 Update translations (common, files) 2022-05-18 19:54:25 +03:00
a8b5aad30d edit fr 2022-05-18 19:20:19 +03:00
1639a82f2c edit en 2022-05-18 19:18:30 +03:00
Timofey Boyko
830491e7ca Merge branch 'release/v1.2' into feature/update-translation-tests 2022-05-18 19:17:12 +03:00
74c9b75b0c Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-18 19:12:07 +03:00
41ab332458 update translations 2022-05-18 19:11:50 +03:00
ae795f8b95 Merge branch 'feature/multiply-thumb' of github.com:ONLYOFFICE/AppServer into feature/multiply-thumb 2022-05-18 19:10:56 +03:00
8e913c8348 Files: thumbnails extensions moved to configuration 2022-05-18 19:10:42 +03:00
018e1504b7 Merge branch 'release/v1.2' into feature/multiply-thumb 2022-05-18 18:38:18 +03:00
321085c205
Merge pull request #669 from ONLYOFFICE/feature/change-size-table-view
Feature/Change table resize with info panel
2022-05-18 18:33:31 +03:00
a9511d7a54
Merge pull request #670 from ONLYOFFICE/feature/upload-history
Web: Files: added history of uploads
2022-05-18 18:32:54 +03:00
9fb495817d update translations 2022-05-18 18:25:31 +03:00
Timofey Boyko
6dd814bd12 Web: fix translation tests crash 2022-05-18 17:57:09 +03:00
e8752ce4b6 Merge branch 'release/v1.2' into feature/upload-history 2022-05-18 17:36:36 +03:00
874374d6ad update translations (People) 2022-05-18 17:35:19 +03:00
b5d153b152 update az 2022-05-18 17:34:27 +03:00
c5fb8d0d6f Files: thumbs. default size 2022-05-18 17:31:33 +03:00
a809c083a3 update translations (Client) 2022-05-18 17:26:33 +03:00
abc8839d03 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-18 17:24:20 +03:00
e7bdbb01c3 update az (client) 2022-05-18 17:24:00 +03:00
9886081a2e Thumbnailы: added sizes config 2022-05-18 17:23:17 +03:00
f672ee8597
Merge pull request #642 from ONLYOFFICE/feature/info-panel-redesign
InfoPanel redesign
2022-05-18 17:20:17 +03:00
fd47a15a31 Merge branch 'release/v1.2' into feature/info-panel-redesign 2022-05-18 17:07:35 +03:00
Timofey Boyko
d5794df3b9 Web:Components:TableContainer: remove '!important' for color style of table header cell 2022-05-18 16:59:16 +03:00
Timofey Boyko
d6fdc066ae Web: update e2e.test:translation script, now create translation models before start translation tests 2022-05-18 16:58:33 +03:00
Timofey Boyko
a7c08fa80a Web:People: start cloneModelScreenshot helper after creating model translation screenshots for en culture 2022-05-18 16:27:17 +03:00
Timofey Boyko
3ebc2db9dc Web:People:Tests: add cloneModelScreenshot helper 2022-05-18 16:21:03 +03:00
Timofey Boyko
a8dab95ada Web:People:Tests: update translation tests and delete useless code 2022-05-18 16:20:39 +03:00
Timofey Boyko
2d892cf6c7 Web:People:Tests: change screenshotOutput and baseFolder for translation tests 2022-05-18 16:16:14 +03:00
Timofey Boyko
44cf38ba7f Web:People:Tests: remove translation models from git 2022-05-18 16:14:41 +03:00
Timofey Boyko
295ad63ebf Web:Files: start cloneModelScreenshot helper after creating model translation screenshots for en culture 2022-05-18 16:08:17 +03:00
Timofey Boyko
eaee2d2375 Web:Files:Tests: update pathToModels for cloneModelScreenshot helper 2022-05-18 16:07:11 +03:00
b37c345985 update translations (login) 2022-05-18 15:59:18 +03:00
bc1a71198a Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-18 15:51:06 +03:00
a2897c5cec update Login 2022-05-18 15:50:39 +03:00
Timofey Boyko
13a96c920f Web:Files:Tests: add cloneModelScreenshot helper 2022-05-18 15:31:30 +03:00
Timofey Boyko
c2d9b8d893 Web:Files:Tests: update translation tests and delete useless code 2022-05-18 15:29:19 +03:00
Timofey Boyko
86697f3665 Web:Files:Tests: change screenshotOutput and baseFolder for translation tests 2022-05-18 15:26:37 +03:00
Timofey Boyko
20f97759a8 Web:Files:Tests: remove translation model from git 2022-05-18 15:25:26 +03:00
Timofey Boyko
618ead2c4e Web:Files:Tests: add new folder mock for mockData function 2022-05-18 15:17:49 +03:00
b643699e72 Web: Files: added history of uploads 2022-05-18 15:09:25 +03:00
2381522e5e Web: Common: FloatingButton: fixed onProgressClear 2022-05-18 14:15:54 +03:00
0fb61a7889 Edit translations - fi, sl 2022-05-18 13:18:19 +03:00
5f4d8b3b4c Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-18 12:58:24 +03:00
9180fbe42e update ko 2022-05-18 12:58:02 +03:00
mushka
ca1d34c07a Removed a modified file from pull request 2022-05-18 12:44:34 +03:00
790d0f5c5e Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-18 11:56:49 +03:00
7c94361016 Added projects for BabelEdit for translations of clients 2022-05-18 11:56:41 +03:00