Commit Graph

208 Commits

Author SHA1 Message Date
85dae6bf4c Fix warning of import TrashIcon (File not found) 2022-11-08 14:14:33 +03:00
Viktor Fomin
494247fa02 Web: update big logo 2022-10-24 15:22:59 +05:00
Viktor Fomin
cefcd10ddc Web: add new bg patterns 2022-10-17 20:53:15 +05:00
a47ce3d8c0 Merge branch 'develop' into feature/invite-panel 2022-10-11 11:58:25 +03:00
d37a6068fc Merge branch 'develop' into feature/invite-panel 2022-10-05 15:04:24 +03:00
mushka
1b2dae0890 Merge branch 'develop' into feature/doc-space-info-panel 2022-10-02 03:45:40 +03:00
0c8703a58c Web: Common: added show/hide article button 2022-09-26 11:22:46 +03:00
mushka
af16f21d4a Merge branch 'develop' into feature/doc-space-info-panel 2022-09-26 11:00:34 +03:00
64fd6d387e Merge branch 'develop' into feature/invite-panel 2022-09-21 13:13:08 +03:00
f49d98d21d Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
#	packages/client/src/Shell.jsx
2022-09-20 14:27:39 +03:00
mushka
c835f2960c Merge branch 'develop' into feature/doc-space-info-panel 2022-09-20 14:21:44 +03:00
TimofeyBoyko
f1a8310ac3 Web: move svg from toast to public path 2022-09-20 12:56:14 +03:00
TimofeyBoyko
18ff4122a9 Web: delete alert.react.svg icon 2022-09-20 12:46:24 +03:00
TimofeyBoyko
a65517a9de Web: add new alert icon 2022-09-19 17:09:06 +03:00
mushka
20f2fde176 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-08 15:28:38 +03:00
2abf7ef5d9 Merge branch 'develop' into feature/invite-panel 2022-09-07 17:38:06 +03:00
b1305ce7bc Web: add icon 2022-09-06 21:19:13 +03:00
5e6ad92dc2 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-06 13:31:32 +03:00
7ec5bb131b Web: Renamed flags 2022-09-06 11:19:38 +03:00
mushka
84a47113b0 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-05 13:44:33 +03:00
2d1a14bcff Web: add icons 2022-09-04 17:52:35 +03:00
2297a35fac Merge branch 'develop' into feature/invite-panel 2022-09-01 11:17:54 +03:00
c50b1e5c66 Web: add icon 2022-08-31 23:22:32 +03:00
TimofeyBoyko
8bda52c489 Merge branch 'develop' into feature/accounts-list 2022-08-31 11:38:34 +03:00
66412730de Merge branch 'develop' into feature/invite-panel 2022-08-31 09:03:17 +03:00
mushka
a1db010869 Merge branch 'develop' into feature/doc-space-info-panel 2022-08-30 14:06:55 +03:00
d0da69a74b
Merge branch 'develop' into feature/settings-menu 2022-08-30 12:11:59 +03:00
38b217d65e Web: Client: InvitePanel: Added user search, added email validation, added editing for manual added items, fixed invite panel state 2022-08-30 08:55:19 +03:00
TimofeyBoyko
18466251e8 Web: add img for change owner option 2022-08-29 12:24:18 +03:00
17e2d0f063 Web:Client: Added new icons for settings menu sections. 2022-08-26 16:39:24 +03:00
TimofeyBoyko
18cad0911c Merge branch 'develop' into feature/accounts-list 2022-08-26 06:56:29 +03:00
mushka
50eb4cf072 Merge branch 'develop' into feature/doc-space-info-panel 2022-08-25 21:38:52 +03:00
4ff9b9c74f Web:Added a menu category picture with a notification on the tablet. 2022-08-24 17:32:08 +03:00
152efe40b9 Web:Added a picture of the main button on mobile for previewю 2022-08-24 17:31:25 +03:00
719c213041 Web:Added a triangle for the main button. 2022-08-23 13:41:34 +03:00
TimofeyBoyko
124a955ef2 Web:Client:Accounts: add info-panel for user 2022-08-22 10:05:44 +03:00
36c30428fc Merge branch 'develop' into feature/settings-common 2022-08-19 15:05:33 +03:00
TimofeyBoyko
74c2180584 Web:Client:Accounts: update empty screen 2022-08-15 18:07:50 +03:00
TimofeyBoyko
13c36ac4f3 Web:Client:MainButton: add invite actions to main button for accounts page 2022-08-15 15:56:52 +03:00
b82a4206e0 Merge branch 'develop' into feature/settings-common 2022-08-12 18:04:11 +03:00
2aed8eb3a0 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign
# Conflicts:
#	packages/asc-web-components/index.js
#	packages/client/src/DocspaceLogo/index.js
#	packages/client/src/pages/Confirm/ConfirmWrapper.js
#	packages/components/form-wrapper/index.js
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header-unauth.js
#	web/ASC.Web.Client/src/components/pages/Confirm/index.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/StyledConfirm.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaActivation.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaAuth.js
#	web/ASC.Web.Login/src/Login.jsx
#	web/ASC.Web.Login/src/StyledLogin.js
2022-08-10 16:16:43 +03:00
8c234ee0aa SSO: fix forbidden image 2022-08-05 18:04:30 +03:00
mushka
5cd4263b38 Merge branch 'develop' into feature/doc-space-info-panel 2022-08-04 15:21:06 +03:00
721e442374 Web:Studio:Add BreakpointWarning component. 2022-07-26 18:08:00 +03:00
8e888b5191 Web: add background pattern image 2022-07-25 18:07:04 +03:00
44c65ee52c Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	public/locales/az/Common.json
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/el/Common.json
#	public/locales/en/Common.json
#	public/locales/es/Common.json
#	public/locales/fi/Common.json
#	public/locales/fr/Common.json
#	public/locales/it/Common.json
#	public/locales/ja/Common.json
#	public/locales/ko/Common.json
#	public/locales/lo/Common.json
#	public/locales/lv/Common.json
#	public/locales/nl/Common.json
#	public/locales/pl/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/pt/Common.json
#	public/locales/ro/Common.json
#	public/locales/ru/Common.json
#	public/locales/sk/Common.json
#	public/locales/sl/Common.json
#	public/locales/tr/Common.json
#	public/locales/uk/Common.json
#	public/locales/vi/Common.json
#	public/locales/zh-CN/Common.json
#	web/ASC.Web.Client/src/store/index.js
2022-07-22 19:04:35 +03:00
0275052613 Web: change icon 2022-07-22 18:12:58 +03:00
aa6b674721 Web: change icon 2022-07-22 13:42:49 +03:00
12e7d4edbf Merge branch 'develop' into feature/settings-common 2022-07-22 13:22:59 +03:00
5e9a76a0fa Web: add logo 2022-07-21 17:08:41 +03:00