|
71b69c3560
|
Web: Client: fixed after merge
|
2021-04-28 11:42:12 +03:00 |
|
|
0128b01518
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
# Conflicts:
# products/ASC.People/Client/public/locales/en/Profile.json
# products/ASC.People/Client/public/locales/ru/Profile.json
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# web/ASC.Web.Client/public/locales/en/Confirm.json
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Confirm.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
|
2021-04-26 15:57:19 +03:00 |
|
|
c47f896f75
|
Client: added translations
|
2021-04-24 10:42:49 +03:00 |
|
TatianaLopaeva
|
0f3eb1350b
|
Merge branch 'develop' into feature/team-template
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
|
2021-04-20 12:05:19 +03:00 |
|
Alexey Kostenko
|
d7930f9a8b
|
Web: Client: Redesign access rights page
|
2021-04-16 12:19:19 +03:00 |
|
TatianaLopaeva
|
e738cab4a2
|
Web: Added Error message & Added loader.
|
2021-04-15 19:51:59 +03:00 |
|
Viktor Fomin
|
f76ebe4095
|
Web: Client: added access portal page
|
2021-04-14 13:01:56 +03:00 |
|
TatianaLopaeva
|
73d113e26f
|
Wen: Settings: Added translation.
|
2021-04-13 14:28:36 +03:00 |
|
TatianaLopaeva
|
3b94348cf5
|
Web: Settings: Fixed translation.
|
2021-04-12 15:59:20 +03:00 |
|
TatianaLopaeva
|
8c7ec5d0d0
|
Web: Settings: Added team template to the settings tree.
|
2021-04-12 14:34:08 +03:00 |
|
TatianaLopaeva
|
91bd2c8c74
|
Web: Settings: Added team-template page.
|
2021-04-12 12:56:08 +03:00 |
|
|
85a500eac6
|
Web: Client: Simplified translation
|
2021-02-19 20:26:41 +03:00 |
|