Commit Graph

3123 Commits

Author SHA1 Message Date
d07273cee8 Web: Files: fixed display of tree menu, added new api for tree menu 2021-06-15 14:15:48 +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
68f880254e Web: Files: added dialog for converting to context actions 2021-06-11 17:20:38 +03:00
e074c0cf93 Web: Files: changed color of conversion 2021-06-11 16:56:43 +03:00
ef59a2ac47 Web: Files: added hideConfirmConvert setting 2021-06-11 15:49:32 +03:00
e0d076a7bc Merge branch 'develop' into feature/restore-files-convertation 2021-06-11 15:17:35 +03:00
Artem Tarasov
f181a491fb Merge branch 'develop' into bugfix/fixed-styles 2021-06-11 14:56:52 +03:00
6b1656ff10 Files: settings 2021-06-11 14:33:07 +03:00
61e957d00a Files: added /subfolders request 2021-06-11 14:24:01 +03:00
64b6c973b1 Web: Files: fixed conversion 2021-06-10 20:18:30 +03:00
9bb8e9bd1d Web: Files: fixed getConversationPercent 2021-06-10 17:33:50 +03:00
ed161258c3 Files: fix convert 2021-06-10 15:54:05 +03:00
a47b94bd7f Web: Files: removed useless uploadStatus, fixed upload bugs 2021-06-09 17:52:28 +03:00
fdc71ec359 Merge branch 'feature/restore-files-convertation' of github.com:ONLYOFFICE/AppServer into feature/restore-files-convertation 2021-06-09 15:02:44 +03:00
29733f0ace Wen: Files: fixed upload panel style 2021-06-09 15:02:24 +03:00
59bab6a085 Web: Files: fixed conversion progress 2021-06-09 13:28:22 +03:00
d5989124f3 Web: Files: fixed conversion progress 2021-06-08 19:09:00 +03:00
Artem Tarasov
c25fa589a9 Web: People: deleted fonts with ext .woff, added hash to font name 2021-06-08 15:26:56 +03:00
83d4bfd7a3 Web: Files: added conversion for uploaded files 2021-06-08 14:24:47 +03:00
31423ddbc6 Web: Files: fixed upload panel visibility 2021-06-07 18:05:02 +03:00
4d9c26545e Web: Files: added conversion progress 2021-06-07 16:20:18 +03:00
2d56421dd2 Web: Files: fixed mobx warnings 2021-06-07 13:52:01 +03:00
9a6f281a50 Web: Files: fixed conversion of files, added conversion loaders 2021-06-07 12:44:59 +03:00
Artem Tarasov
9f21862f51 Merge branch 'develop' into bugfix/fixed-styles 2021-06-07 00:24:19 +03:00
Artem Tarasov
fac8dafe1e Web: Files: fixed width of unselected node in settings tree 2021-06-07 00:21:40 +03:00
Artem Tarasov
acd4a3893c Web: added rule to webpack.config for woff, woff2 2021-06-06 23:39:52 +03:00
Vladislav Makhov
da8503612e web: files: private room: fix upload dialog 2021-06-04 11:23:00 +03:00
209f3b174c Web: Files: added tReady to ConvertDialog 2021-06-03 17:29:06 +03:00
531233a9a8 Web: Files: added new translations, fixed conversion 2021-06-03 15:56:14 +03:00
62b57fa313 Web: Files: refactoring UploadDataStore 2021-06-03 14:23:25 +03:00
43de25b62a Merge branch 'develop' into feature/remove-unused-dep
# Conflicts:
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
2021-06-03 12:52:21 +03:00
a7edb118ac Web: Files: added conversion for upload action 2021-06-03 12:50:01 +03:00
581df1cdcf Web: Files: added update after converting the file 2021-06-02 18:41:15 +03:00
ce77c270de Web: Files: added conversion progress for file 2021-06-02 16:56:27 +03:00
5e8751d9f1 Web: Files: added convert file icon, refactoring convert dialog 2021-06-02 16:03:46 +03:00
Artem Tarasov
d960ae6220 Merge branch 'develop' into bugfix/fixed-styles
# Conflicts:
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2021-06-02 15:09:03 +03:00
4d44ccad12 Merge branch 'develop' into feature/restore-files-convertation
# Conflicts:
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-06-02 14:28:42 +03:00
62ac315c8d Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring 2021-06-02 13:55:11 +03:00
929adc773a Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-06-02 10:59:15 +03:00
908310041f Web: Added new translation for toasts ("EncryptingFile", "EncryptionKeysReload", "EncryptionFilePreparing") 2021-06-02 10:59:07 +03:00
ad12ac19c3 Web: Files: removed useless toast translations 2021-06-02 10:46:17 +03:00
Artem Tarasov
a38195d506 Merge branch 'develop' into bugfix/fixed-styles
# Conflicts:
#	products/ASC.CRM/Client/src/custom.scss
#	products/ASC.Calendar/Client/src/custom.scss
#	products/ASC.Files/Server/DocStore
#	products/ASC.Mail/Client/src/custom.scss
#	products/ASC.People/Client/src/custom.scss
#	products/ASC.Projects/Client/src/custom.scss
#	web/ASC.Web.Client/src/custom.scss
#	web/ASC.Web.Login/src/custom.scss
2021-06-02 10:23:08 +03:00
95dbfb8c5c Merge branch 'develop' into feature/translations 2021-06-01 20:02:48 +03:00
23e1083be7 Web: Removed empty translations keys 2021-06-01 13:49:37 +03:00
76d8ebb459 Tests moved to separate projects.
Removed unused dependepcies
2021-06-01 12:21:51 +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