Commit Graph

12432 Commits

Author SHA1 Message Date
Artem Tarasov
67feed3cf9 Web: People: fix crash Profile 2021-06-08 14:01:19 +03:00
Artem Tarasov
46a76abef3 Web: People: added withLoader to ProfileAction 2021-06-08 13:25:43 +03:00
Artem Tarasov
b32edbc3f5 Web: People: added wtihLoader to GroupAction header 2021-06-08 13:06:01 +03:00
Artem Tarasov
d0995aa9a9 Web: People: added withLoader to GroupAction 2021-06-08 13:01:16 +03:00
Artem Tarasov
5dc279b5a9 Web: People: added withLoader to Profile 2021-06-08 12:28:19 +03:00
Artem Tarasov
81b6ea3d02 Web: People: refactoring withLoader, applied for Home 2021-06-08 02:49:34 +03:00
Artem Tarasov
a317b02e2e Web: People: added and applied LoadingStore 2021-06-08 01:22:28 +03:00
Artem Tarasov
b3bccbb98d Web: People: added usage setFirsLoad 2021-06-07 01:15:07 +03:00
Artem Tarasov
6d7361ecd0 Web: People: added HOC withLoader 2021-06-07 01:09:13 +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
9a798506e0 Web: deleted unnecessary code 2021-06-06 23:43:20 +03:00
Artem Tarasov
acd4a3893c Web: added rule to webpack.config for woff, woff2 2021-06-06 23:39:52 +03:00
Artem Tarasov
7db667108b Web: added font-family Opne-Sans to /public, added import fonts to custom.scss 2021-06-06 23:35:56 +03:00
1cbe04f044
Merge pull request #270 from ONLYOFFICE/feature/remove-unused-dep
Feature/remove unused dep
2021-06-04 15:06:47 +03:00
Vladislav Makhov
da8503612e web: files: private room: fix upload dialog 2021-06-04 11:23:00 +03:00
Artem Tarasov
fd88de8064 Merge branch 'develop' into bugfix/fixed-styles 2021-06-04 10:35:37 +03:00
944966b67b WebSocker: repair service 2021-06-03 16:13:22 +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
bcc9e6c34b ResManager: additional feature 2021-06-03 12:48:25 +03:00
f21188b5cb Web: Client: fixed wizard culture 2021-06-03 12:22:38 +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
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
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
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
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