Commit Graph

215 Commits

Author SHA1 Message Date
cb8d225707 Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
#	products/ASC.Files/Client/src/store/index.js
2021-07-12 13:08:40 +03:00
9906380a96 Web: Files: Return folder icon to the files module. 2021-07-08 16:22:32 +03:00
57bba777dc Web: Files: Removed icons (32, 64, 96 sizes) to the root folder. 2021-07-08 14:08:44 +03:00
7f42b5bdfd Web: Files: Fixed translations, added common translation. 2021-07-07 17:56:10 +03:00
b1029b7e9e Web: Files: Fixed icon path, deleted icon from files module. 2021-07-07 17:33:12 +03:00
4829db5490 Web: Files: Return translations. 2021-07-07 17:05:00 +03:00
c5b409a571 Merge branch 'develop' into feature/file-folder-selectors 2021-07-07 11:41:45 +03:00
577a720691 WEb:Files: Removed translations for empty header container from files to root. 2021-07-02 20:52:48 +03:00
a31dc583c1 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/pages/Settings/index.js
2021-07-02 16:26:45 +03:00
87c556ec85 Web: Files: Deleted icons 24px size. 2021-07-02 16:16:52 +03:00
0d4159a907 Web: Files: Removed icon to common folder. 2021-07-01 19:18:24 +03:00
cfe2ad8a14 Web: Files: Added translations. 2021-07-01 15:58:04 +03:00
15a268f83b Web: Settings: Removed icons to common folder. 2021-07-01 13:38:24 +03:00
2771ff504d Web: Files: Added SelectFolderDialog and FolderTreeBody, and translations for them. 2021-07-01 12:50:28 +03:00
7b3f411605 Web: Files: fixed scroll 2021-07-01 12:50:01 +03:00
1b685a7b5e Web: Files: fixed PrivacyDescriptionConnect translations 2021-06-28 13:37:38 +03:00
bf67b5c296 Web: Files: added PrivateRoomsPage 2021-06-24 16:23:14 +03:00
ce15c26c50 Web: Files: added display of privacy room files 2021-06-23 17:02:06 +03:00
65378cc089 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.CRM/Client/public/index.html
#	products/ASC.Calendar/Client/public/index.html
#	products/ASC.Files/Client/public/index.html
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Mail/Client/public/index.html
#	products/ASC.People/Client/public/index.html
#	products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.Projects/Client/public/index.html
2021-06-15 11:49:39 +03:00
4a154db396 Web: removed useless translations 2021-06-11 18:07:51 +03:00
5db2e8a868 Merge branch 'develop' into feature/restore-files-convertation 2021-06-11 17:50:28 +03:00
Artem Tarasov
acd4a3893c Web: added rule to webpack.config for woff, woff2 2021-06-06 23:39:52 +03:00
d01ef10cc5 Web: NavMenu/PageLayout: Was done:
- fixed loaders: two rectangle loader combined into one
- fixed loaders at index.html: two rectangle loader combined into one
- hide NavItem component
- hide click on Headline component
- fixed article padding style for desktop
- added new logo.
2021-06-04 14:42:21 +03:00
531233a9a8 Web: Files: added new translations, fixed conversion 2021-06-03 15:56:14 +03:00
23e1083be7 Web: Removed empty translations keys 2021-06-01 13:49:37 +03:00
de98856728 Web: Tests: Added new 'sk' translations; 2021-06-01 11:21:39 +03:00
8e532bc8b9 Web: Tests: Added new 'ro' translations; 2021-06-01 11:20:14 +03:00
3d62da4422 Web: Tests: Added new 'pt-BR' translations; 2021-06-01 11:19:13 +03:00
c5a5072aa7 Web: Tests: Added new 'lo' translations; 2021-06-01 11:17:19 +03:00
8eb62d8079 Web: Tests: Added new 'it' translations; 2021-06-01 11:15:24 +03:00
a0fc465678 Web: Tests: Added new 'fr' translations; 2021-06-01 11:13:50 +03:00
e3b5ac774a Web: Tests: Added new 'de' translations; 2021-06-01 10:56:47 +03:00
7beccd192b Web: Added not found keys in 'de' language translation files (fix NotTranslatedKeysTest issue) 2021-05-31 20:33:12 +03:00
061b4e46e7 Web: Added not found 'de' language translation files (fix NotAllLanguageTranslatedTest issue) 2021-05-31 19:11:58 +03:00
e2b9561d7b Web: Rewritten all json translation files with sorting of properties alphabetically 2021-05-31 18:34:15 +03:00
f78742ac39 Web: Fix UselessModuleTranslationKeysTest issues 2021-05-31 17:35:25 +03:00
6b56b539c5 Web: Update EN language 2021-05-31 17:10:34 +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
00957a65ad Web: moved translation keys "LblSelect", "EditUserDialogTitle", "Version" 2021-05-27 11:51:32 +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
178767a2b5 Web: Files: fixed translations 2021-05-27 11:03:12 +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
364fc6bbeb Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations 2021-05-26 16:40:10 +03:00
541b14c8fe Web: moved translationKeys "DisableUserButton", "NotFoundLanguage" 2021-05-26 16:40:02 +03:00
Artem Tarasov
be2825c3cc Web: fixed syntax in OperationsPanel.json 2021-05-26 16:34:49 +03:00
Artem Tarasov
55bbd5d28d Web: moved translation key "Restore" 2021-05-26 16:32:33 +03:00