Artem Tarasov
|
a9a972dcaa
|
Web: Files: Thumbnails: fix after merge
|
2021-05-28 15:32:35 +03:00 |
|
Artem Tarasov
|
e7a7aed6ec
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/Files.jsx
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/store/index.js
|
2021-05-28 15:30:39 +03:00 |
|
Artem Tarasov
|
215c933d9e
|
Web: added new translation keys "ProviderNotConnected", "Mail" to "static/locale/de/Common.json"
|
2021-05-28 13:28:40 +03:00 |
|
|
|
12bcf816b5
|
Web: Client: added new translations keys
|
2021-05-28 12:09:10 +03:00 |
|
|
|
04fd99a01e
|
Web: Test: Added new NotTranslatedCommonKeysTest
|
2021-05-28 11:49:05 +03:00 |
|
|
|
953602b98b
|
Web: Test: Fix "Translations:" issues
|
2021-05-28 11:35:55 +03:00 |
|
|
|
d0bbcb8d5a
|
Files: moved from 08a01422
|
2021-05-28 11:22:35 +03:00 |
|
|
|
d0d6b4e3e2
|
Web: Test: Added new UselessModuleTranslationKeysTest
|
2021-05-28 10:58:27 +03:00 |
|
|
|
527a650601
|
WebStudio: resources
|
2021-05-27 21:30:15 +03:00 |
|
|
|
bda786f844
|
WebStudio: moved from 08a01422
|
2021-05-27 20:13:24 +03:00 |
|
Alexey Kostenko
|
7435ee0c7b
|
Web: Client: Fixed pages (infinite loading, when portal has no admins)
|
2021-05-27 19:12:50 +03:00 |
|
|
|
d07671c708
|
Web: Tests: Added more info on test NotTranslatedKeysTest() assertion
|
2021-05-27 16:37:38 +03:00 |
|
|
|
3252372a77
|
Web: Files: fixed rename folder action
|
2021-05-27 16:16:30 +03:00 |
|
|
|
e18f902c00
|
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
|
2021-05-27 15:51:51 +03:00 |
|
|
|
224cbc4b65
|
Web: Test: Added collection of ModuleFolders for future tests
|
2021-05-27 15:51:44 +03:00 |
|
Alexey Kostenko
|
b1cf90b591
|
Web: Client: Admins page - style fix (temporary solution for desktop)
|
2021-05-27 15:40:11 +03:00 |
|
Alexey Kostenko
|
4269bde116
|
Web: Client: Added rows loader to admins page, fixed when switching between admins - access-rights (Blank screen for a few seconds), small refactoring loader on access-rights page
|
2021-05-27 15:22:25 +03:00 |
|
|
|
792430a0c6
|
Web: Components: fixed combobox clickability
|
2021-05-27 14:50:23 +03:00 |
|
|
|
2cf57ece75
|
Web: Files: fixed files filter
|
2021-05-27 14:49:40 +03:00 |
|
|
|
3ad8b7e1dc
|
Web: Components: fixed row checkbox clickability
|
2021-05-27 13:27:08 +03:00 |
|
|
|
e4f5da1f32
|
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
|
2021-05-27 12:42:53 +03:00 |
|
|
|
f075863903
|
Web: Fixed FullDublicatesTest for "LblInviteAgain" translation key, key renamed for Article
|
2021-05-27 12:42:44 +03:00 |
|
|
|
90821d3fe1
|
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
|
2021-05-27 12:15:53 +03:00 |
|
|
|
a9ddfc0a4a
|
Web: Tests: Added more info on test NotAllLanguageTranslatedTest() assertion
|
2021-05-27 12:15:45 +03:00 |
|
|
|
f5909cc0e0
|
Web: Temporary removed minimal translations lng files
|
2021-05-27 12:14:36 +03:00 |
|
Artem Tarasov
|
102f26ed3c
|
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-05-27 11:58:53 +03:00 |
|
Artem Tarasov
|
46d80f7b34
|
Web: moved translation keys "ByFirstNameSorting", "ByLastNameSorting" to "static/locales/{lng}/Common.json"
|
2021-05-27 11:57:20 +03:00 |
|
|
|
3536be88c2
|
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
|
2021-05-27 11:51:39 +03:00 |
|
|
|
00957a65ad
|
Web: moved translation keys "LblSelect", "EditUserDialogTitle", "Version"
|
2021-05-27 11:51:32 +03:00 |
|
|
|
b57da432bf
|
Web: Fixed FullDublicatesTest for "CopyEmailAndPassword" translation key, key moved to Common.
|
2021-05-27 11:50:11 +03:00 |
|
Alexey Kostenko
|
bc5fd2aa9d
|
Web: Client: Added loader on access-rights page
|
2021-05-27 11:47:37 +03:00 |
|
|
|
7d1af40f6a
|
Web: Fix translation tests issues
|
2021-05-27 11:27:27 +03:00 |
|
|
|
30cf4f8cde
|
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
|
2021-05-27 11:14:31 +03:00 |
|
|
|
25ac98e272
|
Merge branch 'develop' into feature/translations
# Conflicts:
# products/ASC.Files/Client/public/locales/en/DeleteDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/ru/DeleteDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
|
2021-05-27 11:13:41 +03:00 |
|
|
|
4321873f00
|
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
|
2021-05-27 11:03:19 +03:00 |
|
|
|
178767a2b5
|
Web: Files: fixed translations
|
2021-05-27 11:03:12 +03:00 |
|
Artem Tarasov
|
95aa0153d6
|
Web: fixed ns
|
2021-05-27 11:00:13 +03:00 |
|
Alexey Kostenko
|
727804180b
|
Revert "Web: Common: Added InfiniteLoader"
This reverts commit 09ff37ac0f.
|
2021-05-27 10:38:06 +03:00 |
|
Artem Tarasov
|
a12ab6c970
|
Web: moved translationKeys "Error520Text", "ErrorInitWizardHeader" to "static/locales/{lng}/Common.json"
|
2021-05-26 18:30:57 +03:00 |
|
Artem Tarasov
|
6ec9db8870
|
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-05-26 18:02:11 +03:00 |
|
Artem Tarasov
|
8d9655fa0b
|
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-05-26 17:59:52 +03:00 |
|
Artem Tarasov
|
d5ddeb4c42
|
Web: moved translation keys "AboutCompanyVersion", "Version" to "static/locales/{lng}/Common.json"
|
2021-05-26 17:58:05 +03:00 |
|
|
|
fe18e7e55c
|
Web: moved translation key "LblSelect"
|
2021-05-26 17:53:36 +03:00 |
|
|
|
151ffc7b26
|
Web: moved translation key "Active"
|
2021-05-26 17:46:09 +03:00 |
|
|
|
e437c7a035
|
Web: moved translationKeys "Size", "View", "Review"
|
2021-05-26 17:37:03 +03:00 |
|
|
|
3cb0ff476c
|
Files: resources
|
2021-05-26 17:23:48 +03:00 |
|
|
|
70f7ad6a2c
|
Merge branch 'bugfix/fixed-styles' of github.com:ONLYOFFICE/AppServer into bugfix/fixed-styles
|
2021-05-26 17:16:39 +03:00 |
|
|
|
757e90ee7a
|
Web: Components: fixed help-button iconName path
|
2021-05-26 17:16:32 +03:00 |
|
|
|
d8adef733c
|
ASC.Files: moved from 08a01422
|
2021-05-26 16:54:46 +03:00 |
|
|
|
364fc6bbeb
|
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
|
2021-05-26 16:40:10 +03:00 |
|
