|
|
0cd4cb49ed
|
Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/themes/dark.js
# public/locales/de/Common.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Login/src/Login.jsx
|
2022-03-16 11:03:07 +03:00 |
|
|
|
d2855e47a4
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-03-15 19:17:44 +03:00 |
|
|
|
a54dabde3d
|
Merge branch 'feature/login-redesign' of https://github.com/ONLYOFFICE/AppServer into feature/login-redesign
|
2022-03-15 19:00:16 +03:00 |
|
|
|
e8a403717b
|
Web: Components: Jest: Added vscode-jest-tests config
|
2022-03-15 19:00:09 +03:00 |
|
|
|
a493a8e70a
|
Web: Components: Utils: Fix parseAddress (issue: 'te"st@test.com')
|
2022-03-15 18:59:09 +03:00 |
|
|
|
5cd1ea7356
|
Web: Added extensions:recommendations for jest
|
2022-03-15 18:31:49 +03:00 |
|
Timofey Boyko
|
a31ef97615
|
Web:People: remove old article
|
2022-03-15 17:49:31 +03:00 |
|
Timofey Boyko
|
b4709b87a2
|
Web:Common:Loaders: update article loaders
|
2022-03-15 17:41:37 +03:00 |
|
Timofey Boyko
|
c85f40078a
|
Web:Files: rename 'catalog' to 'article' and update exports/imports
|
2022-03-15 17:18:46 +03:00 |
|
Timofey Boyko
|
bd85e558dc
|
Web:Common: rename 'catalog' to 'article' and update exports
|
2022-03-15 17:18:07 +03:00 |
|
|
|
e0df6dfa12
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-03-15 15:23:59 +03:00 |
|
|
|
76b9b03952
|
Web: Common: add skipLogout option
|
2022-03-15 14:33:21 +03:00 |
|
|
|
9886c434b2
|
Web: Login: fix
|
2022-03-15 14:32:53 +03:00 |
|
Timofey Boyko
|
3c092803ea
|
Web:People:Components:Catalog: fix loaders for main button and header with isLoaded prop
|
2022-03-15 14:21:53 +03:00 |
|
Timofey Boyko
|
87bd5b9c29
|
Web:Common:Loaders: fix width for catalog loaders for people
|
2022-03-15 14:20:43 +03:00 |
|
|
|
9c537f3d8e
|
Web: Components: Fix jest warnings from eslint
|
2022-03-15 14:01:51 +03:00 |
|
|
|
2f4a93188f
|
Web: delete feature disallow char
|
2022-03-15 13:57:33 +03:00 |
|
Timofey Boyko
|
6d6d3432e6
|
Web:Files: update imports after move tree folders from old article
|
2022-03-15 13:46:28 +03:00 |
|
Timofey Boyko
|
db50dfe801
|
Web:Files: remove old article components
|
2022-03-15 13:45:23 +03:00 |
|
|
|
8231afe6d1
|
Web: Client: fixed visible for banner
|
2022-03-15 14:38:26 +05:00 |
|
Timofey Boyko
|
0917fd8684
|
Web:Files:Components: move TreeFolders from article to folder tree body
|
2022-03-15 12:33:46 +03:00 |
|
|
|
5c820fdcd5
|
Index: create index only in service
|
2022-03-14 21:47:34 +03:00 |
|
|
|
8f685a76d4
|
Merge pull request #581 from ONLYOFFICE/feature/button-redesign
Feature/button redesign
|
2022-03-14 19:32:28 +03:00 |
|
mushka
|
f608ffcd1a
|
returned ability to set custom min width
|
2022-03-14 19:22:18 +03:00 |
|
mushka
|
15b9113ba0
|
fixed min-width bug
|
2022-03-14 19:20:01 +03:00 |
|
mushka
|
338c66720b
|
resolved missed merge conflicts
|
2022-03-14 19:10:10 +03:00 |
|
mushka
|
ddd973c024
|
fixed dark theme supportion
|
2022-03-14 19:03:23 +03:00 |
|
mushka
|
57f75cd8a5
|
merge with feature/virtual-rooms-1.2
|
2022-03-14 18:53:15 +03:00 |
|
mushka
|
5e8d4cd4f1
|
added dark theme support
|
2022-03-14 18:45:02 +03:00 |
|
mushka
|
4e6d79eda2
|
change gap between loader and text from 8 to 12px
|
2022-03-14 18:36:00 +03:00 |
|
mushka
|
7537292369
|
fixed padding-forced vertical discentering bug
|
2022-03-14 18:28:46 +03:00 |
|
mushka
|
e614136645
|
small tweaks
|
2022-03-14 18:26:13 +03:00 |
|
|
|
48f747fa5e
|
Web: Client: added inMaintenance prop
|
2022-03-14 19:40:08 +05:00 |
|
|
|
5fa55cd5ad
|
Web: Files: fixed onClose Bar function
|
2022-03-14 19:39:41 +05:00 |
|
|
|
2f9174d02a
|
Web: Components: fixed snackbar onLoad
|
2022-03-14 19:39:14 +05:00 |
|
|
|
55ef22b5f5
|
Web: Login: fix
|
2022-03-14 17:13:22 +03:00 |
|
Timofey Boyko
|
4495de8686
|
Web:People: remove catalog from pages and refactoring
|
2022-03-14 17:11:18 +03:00 |
|
|
|
5ea216e0c9
|
Web: Login: fix
|
2022-03-14 17:08:33 +03:00 |
|
Timofey Boyko
|
7567a66119
|
Web:Files: remove catalog from pages and refactoring
|
2022-03-14 16:54:03 +03:00 |
|
|
|
4538a11b89
|
Web: Login: fix
|
2022-03-14 14:21:42 +03:00 |
|
|
|
d5f5bcc37a
|
Web: Components: EmailInput: fix
|
2022-03-14 14:18:10 +03:00 |
|
|
|
0547ed5b73
|
Merge branch 'hotfix/campaigns-banner' of github.com:ONLYOFFICE/AppServer into hotfix/campaigns-banner
|
2022-03-14 15:55:15 +05:00 |
|
|
|
115aa461c6
|
Merge branch 'develop' into hotfix/campaigns-banner
|
2022-03-14 15:51:38 +05:00 |
|
|
|
8cd7050f7c
|
Web: Files: added banner url check
|
2022-03-14 15:45:32 +05:00 |
|
|
|
79c9f3eb46
|
Web: Components: deleted bar-banner component
|
2022-03-14 15:44:07 +05:00 |
|
|
|
35f3111bcb
|
Web: Common: fixed transition
|
2022-03-14 15:43:42 +05:00 |
|
|
|
c35bb972c3
|
Web: Common: added orientation handler
|
2022-03-14 15:43:05 +05:00 |
|
|
|
1e89c8dd57
|
Web: Files: Hotkeys: fixed HotkeysPanel scroll
|
2022-03-14 13:19:51 +03:00 |
|
|
|
780ec9a251
|
Web: Client: fix
|
2022-03-14 12:49:50 +03:00 |
|
|
|
dcb22b1189
|
Web: Client: fix password input behavior
|
2022-03-14 12:28:41 +03:00 |
|
