Commit Graph

12405 Commits

Author SHA1 Message Date
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
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
209f3b174c Web: Files: added tReady to ConvertDialog 2021-06-03 17:29:06 +03:00
ba41a5aecb Merge branch 'develop' into feature/restore-files-convertation 2021-06-03 15:59:24 +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
a7edb118ac Web: Files: added conversion for upload action 2021-06-03 12:50:01 +03:00
bcc9e6c34b ResManager: additional feature 2021-06-03 12:48:25 +03:00
ceb19659f3
Merge pull request #264 from ONLYOFFICE/feature/thirdparty_for_two_frameworks
Feature/thirdparty for two frameworks
2021-06-03 12:19:27 +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
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
cf3e315e92
Merge pull request #269 from ONLYOFFICE/feature/translations
Feature/translations
2021-06-02 14:24:10 +03:00
0aa6a71ea8 Merge branch 'develop' into feature/translations 2021-06-02 14:05:43 +03:00
bd299a718b Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-06-02 13:55:19 +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
f9e53d038f Web: People: fixed onDeletePersonalDataClick 2021-06-02 13:46:25 +03:00
Artem Tarasov
418f7161c5 Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations 2021-06-02 12:22:57 +03:00
Artem Tarasov
2d8b044458 Web: fixed usage translation key "Settings" in NavMenu 2021-06-02 12:22:38 +03:00
d187b2767a Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations 2021-06-02 12:04:36 +03:00
60a7e84f60 Web: ProfileAction : Added locale usage for DateInput 2021-06-02 12:04:26 +03:00
77242ad326 Web: Client: fixed TimeZone translation 2021-06-02 11:58:41 +03:00
33ccfa550b Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
#	products/ASC.People/Client/public/locales/en/Translations.json
#	products/ASC.People/Client/public/locales/ru/Translations.json
2021-06-02 11:53:29 +03:00
c4a89a9e50 Web: People: fixed translation of "Birthdate", duplicated translation of "Birthdate" moved to a common file 2021-06-02 11:49:35 +03:00
Artem Tarasov
5df2788783 Web: added new translation key "SuccessDeletePersonalData" for "delete-personal-data" in context options 2021-06-02 11:36:23 +03:00
11640e211c Web: Confirm : Added usage for translation key "ConfirmOwnerPortalSuccessMessage" 2021-06-02 11:33:26 +03:00
e9c5ca41ae fix 2021-06-02 11:26:58 +03:00
Artem Tarasov
cc338e62d0 Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations 2021-06-02 11:23:47 +03:00
Artem Tarasov
883130c002 Web: added new translation key "ChangePhoneInstructionSent" for ChangePhoneDialog 2021-06-02 11:23:02 +03:00
3f964a1649 Web: Fix not translated toast issue ("Successfully sent") 2021-06-02 11:12:47 +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
7ce24557e0 Web: Client: fixed toast translations 2021-06-02 10:58:11 +03:00
ad12ac19c3 Web: Files: removed useless toast translations 2021-06-02 10:46:17 +03:00
d3e30eeb6c Config: Setup cultures 2021-06-01 20:11:01 +03:00
95dbfb8c5c Merge branch 'develop' into feature/translations 2021-06-01 20:02:48 +03:00
72f27e9b55 Web: Tests: Added new NotTranslatedToastsTest() 2021-06-01 20:00:36 +03:00
46c198f89d Web: Added new 'ru' translations; 2021-06-01 19:04:45 +03:00
SuhorukovAnton
7fd550dfe8 Merge branch 'develop' into feature/thirdparty_for_two_frameworks 2021-06-01 17:49:10 +03:00
3ca36c9dd2 Web: Tests: Added new Common translations; 2021-06-01 17:00:55 +03:00
23e1083be7 Web: Removed empty translations keys 2021-06-01 13:49:37 +03:00