b1662e7ac6
Web: Init maintenance displaying
2021-06-22 13:41:11 +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
Artem Tarasov
f181a491fb
Merge branch 'develop' into bugfix/fixed-styles
2021-06-11 14:56:52 +03:00
bac090e180
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-11 13:11:08 +03:00
1d9e49b88f
Web: Client: Settings: Fixed translation keys
2021-06-10 11:31:47 +03:00
fbb480671b
Web: Client: fixed translates
2021-06-09 17:30:10 +03:00
ff5ea3019b
Web: Client: added select all
2021-06-09 16:42:43 +03:00
026ceec20c
Web: Client: fixed
2021-06-09 16:18:06 +03:00
82fddadd6d
Web: Client: fixed tooltip color
2021-06-09 04:03:18 +03:00
4fcd83ae6d
Web: Client: fixed translate
2021-06-09 03:31:52 +03:00
20a1869cfd
Web: Client: fixed label
2021-06-09 03:10:38 +03:00
bc46acebcc
Web: Client: bringing code to common style
2021-06-09 02:57:11 +03:00
167ca1fbb5
Web: Client: fixed loading
2021-06-09 00:39:08 +03:00
9019b36951
Web: Client: moved pages in sub-components
2021-06-09 00:33:04 +03:00
db21597f17
Web: Client: fixed access portal urls
2021-06-09 00:30:19 +03:00
3db9fde5aa
Web: Client: fixed title
2021-06-09 00:25:45 +03:00
b7ce4a35e7
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
...
# Conflicts:
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
2021-06-09 00:23:12 +03:00
Artem Tarasov
3db9b30e5e
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-08 17:58:29 +03:00
d881c48b4b
Web: Client: fixed translations
2021-06-08 15:20:03 +03:00
5f16720aba
Web: NavMenu: Was Done for tablet and mobile:
...
- hide module name
- added logo
- added short logo fro mobile
- changed width of logo
2021-06-08 13:40:59 +03:00
9c5a960d40
Web: Client: submit by numpad enter
2021-06-08 13:09:46 +03:00
655f250cdb
Web: Client: fixed accessPortal page
2021-06-08 12:08:25 +03:00
9d5e2ab828
Web: NavMenu: Fixed style for Headline component.
2021-06-08 10:34:27 +03:00
cc67c93479
Web: NavMenu: Hid turn on desktop.
2021-06-08 09:33:17 +03:00
Artem Tarasov
6d7361ecd0
Web: People: added HOC withLoader
2021-06-07 01:09:13 +03:00
Artem Tarasov
acd4a3893c
Web: added rule to webpack.config for woff, woff2
2021-06-06 23:39:52 +03:00
5754a9b753
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-06-04 14:43:10 +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
d465b105e7
Web: Client: NavMenu: Fixed opening "My" profile at new tab
2021-06-04 12:03:40 +03:00
a682cdd3f7
Web: Client: fixed settings tree
2021-06-03 20:25:54 +03:00
f21188b5cb
Web: Client: fixed wizard culture
2021-06-03 12:22:38 +03:00
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth
2021-06-02 23:57:00 +03:00
43ff5210bf
Web: Client: access portal page refactoring
2021-06-02 20:30:54 +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
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
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
77242ad326
Web: Client: fixed TimeZone translation
2021-06-02 11:58:41 +03:00
11640e211c
Web: Confirm : Added usage for translation key "ConfirmOwnerPortalSuccessMessage"
2021-06-02 11:33:26 +03:00
3f964a1649
Web: Fix not translated toast issue ("Successfully sent")
2021-06-02 11:12:47 +03:00
7ce24557e0
Web: Client: fixed toast translations
2021-06-02 10:58:11 +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
f30b84fddf
Web: Client: fixed group buttons menu
2021-05-31 13:57:19 +03:00
6b20b6ee4a
Web: Client: added AddAdmin button
2021-05-31 13:05:06 +03:00
8381b7da75
Merge branch 'feature/access-rights-admins' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
2021-05-31 12:57:43 +03:00
611a6a67b4
Web: Client: fixed
2021-05-31 12:53:48 +03:00
66f36bf0a6
Web: Client: added empty screen
2021-05-31 12:51:23 +03:00
Alexey Kostenko
df44f98e53
Web: Client: Fixed the number of administrators on access-rights page
2021-05-31 12:45:27 +03:00
7026b19db0
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-31 09:23:53 +03:00