a31dc583c1
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Settings/index.js
2021-07-02 16:26:45 +03:00
658b7052c3
Web: Client: About: Removed useless component
2021-07-02 15:42:04 +03:00
c940aae128
Web: refactoring translation loaders
2021-07-02 12:25:36 +03:00
513ec04e33
Merge branch 'develop' into feature/translations-loaders
...
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/Home/Section/Header/index.js
2021-07-01 16:47:34 +03:00
c5da5a1950
Web: Client: added tReady for confirm pages
2021-06-30 18:24:29 +03:00
99f9d27fd0
Web: Files: added checkProtocol helper, fixed toast
2021-06-27 09:31:07 +03:00
bf67b5c296
Web: Files: added PrivateRoomsPage
2021-06-24 16:23:14 +03:00
282738cb13
Merge branch 'develop' into feature/personal
2021-06-22 18:44:12 +03:00
b1662e7ac6
Web: Init maintenance displaying
2021-06-22 13:41:11 +03:00
741de9f2f7
Web: Files: added react-selecto library
2021-06-17 14:36:45 +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
a3c5eea477
Web: Client: deleted unused translations key
2021-06-09 17:16:37 +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
5ea562e996
Web: Client: fixed translations
2021-06-09 02:43:07 +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
783bedffbb
Web: Client: deleted unused image
2021-06-08 16:06:07 +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
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
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
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
ce35405190
Web: Client: deleted duplicate key
2021-06-03 20:25:35 +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
