IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,390 Commits 40 Branches 22 Tags 420 MiB
12548b6ea8
Commit Graph

23390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gazizova-vlada
12548b6ea8 Web:Components:Removed light theme color changes for StyledButtonAlertIcon. 2022-08-15 11:51:33 +03:00
gazizova-vlada
4863150dc6 Web:Client:Added InfoPanelToggleTheme. 2022-08-15 11:16:17 +03:00
gazizova-vlada
3a80b93bca Web:Common:Added InfoPanelToggleTheme. 2022-08-15 11:15:44 +03:00
gazizova-vlada
d96a3140dc Web:Common:Added FloatingButtonTheme. 2022-08-15 10:38:46 +03:00
gazizova-vlada
4e9c7a713d Merge 2022-08-12 18:07:44 +03:00
gazizova-vlada
b82a4206e0 Merge branch 'develop' into feature/settings-common 2022-08-12 18:04:11 +03:00
gazizova-vlada
2823752690 Web:Files:Added LoadingButtonTheme. 2022-08-12 14:33:59 +03:00
gazizova-vlada
72207f7496 Web:Common:Fix. 2022-08-12 14:33:21 +03:00
gazizova-vlada
b0781a59f0 Web:Common:Added LoadingButtonTheme. 2022-08-12 14:33:09 +03:00
gazizova-vlada
200b425a39 Web:Common:Added LinkForgotPasswordTheme. 2022-08-12 12:35:50 +03:00
Pavel Bannov
87ee619e09
Merge pull request #756 from ONLYOFFICE/feature/async-fix 
Feature/async fix
 2022-08-12 11:59:54 +03:00
gazizova-vlada
ac01f1f91c Web:Components:Added ComboButtonTheme. 2022-08-12 11:16:43 +03:00
gazizova-vlada
53ddfa421d Web:Components:Added InputBlockTheme. 2022-08-12 11:14:23 +03:00
gazizova-vlada
aeef316114 Web:Components:Added TextInputTheme. 2022-08-12 11:13:37 +03:00
gazizova-vlada
7b03dfe3ae Web:Components:Added TextareaTheme. 2022-08-12 11:12:51 +03:00
gazizova-vlada
b3e682299c Web:Common:Added TextareaTheme, InputBlockTheme, TextInputTheme, ComboButtonTheme. 2022-08-12 11:12:08 +03:00
Ilya Oleshko
296959b9ea
Merge pull request #757 from ONLYOFFICE/bugfix/editor-ssr-fix 
Bugfix/editor ssr fix
 2022-08-12 10:44:24 +03:00
Artem Tarasov
7673750d41 Web: Editor: fixed duplication of global styles on each request 2022-08-12 10:02:41 +03:00
pavelbannov
23b059c0cc fix 2022-08-11 22:35:53 +03:00
pavelbannov
2314d6fc47 Merge branch 'develop' into feature/async-fix 
# Conflicts:
#	common/ASC.Socket.IO/.yarn/install-state.gz
#	common/ASC.SsoAuth/.yarn/install-state.gz
#	common/ASC.UrlShortener/.yarn/install-state.gz
#	common/ASC.WebDav/.yarn/install-state.gz
 2022-08-11 22:33:13 +03:00
pavelbannov
5b613b8078 Files: async fix 2022-08-11 22:25:29 +03:00
pavelbannov
7d32616524 Files: fix 2022-08-11 19:02:52 +03:00
pavelbannov
44bd9f1d6d Files: fix 2022-08-11 16:55:35 +03:00
pavelbannov
2936cb4ca2 Files: fix 2022-08-11 16:44:08 +03:00
pavelbannov
e54617c275 Files: fix 2022-08-11 16:37:18 +03:00
pavelbannov
0ad8be0d1a Files: fix 2022-08-11 14:30:01 +03:00
gazizova-vlada
cc8e575d8a Web:Files:Added VersionBadgeTheme. 2022-08-11 11:32:50 +03:00
gazizova-vlada
fe15fcffb3 Web:Common:Added VersionBadgeTheme. 2022-08-11 11:32:15 +03:00
pavelbannov
c0bf10af9e Files: fix 2022-08-10 22:27:44 +03:00
pavelbannov
a63ee39d36 Files: removed unused method 2022-08-10 21:23:46 +03:00
pavelbannov
69e5665763 Files: async fix 2022-08-10 19:45:59 +03:00
Ilya Oleshko
779c726e6d
Merge pull request #730 from ONLYOFFICE/feature/sso 
Feature/sso
 2022-08-10 16:00:35 +03:00
Nikolay Rechkin
48d8e16d49 Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso 2022-08-10 15:33:13 +03:00
Nikolay Rechkin
97aee7f8c2 SSO: fix login 2022-08-10 15:33:02 +03:00
Viktor Fomin
1c07363c48 SSO: fix edit 2022-08-10 15:30:41 +03:00
Viktor Fomin
d0ea9b4d7e SSO: fix clear data 2022-08-10 13:47:45 +03:00
Viktor Fomin
c0066f7eea fix gitignore merge 2022-08-10 10:00:10 +03:00
Viktor Fomin
2e06c8fd58 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/sso 
# Conflicts:
#	build/install/win/DocSpace.aip
 2022-08-10 09:57:03 +03:00
pavelbannov
39c7a8ac2c Files: fix 2022-08-09 23:23:36 +03:00
Alexey Bannov
ea2f03331b refactoring 2022-08-09 19:13:07 +03:00
Viktor Fomin
abe3f73cb6 SSO: auto set checkboxes 2022-08-09 18:36:35 +03:00
Viktor Fomin
75a7553397 SSO: fix delete 2022-08-09 18:28:57 +03:00
Nikolay Rechkin
83e7ad25d2 SSO: fixed successful login 2022-08-09 17:14:35 +03:00
pavelbannov
05d5421ebc fix 2022-08-09 17:11:40 +03:00
Nikolay Rechkin
3dd880be41 Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso 2022-08-09 16:53:53 +03:00
Nikolay Rechkin
bfe43ebe96 SSO: fix login 2022-08-09 16:53:22 +03:00
pavelbannov
baaec9dcef Merge branch 'develop' into feature/async-fix 
# Conflicts:
#	common/ASC.Socket.IO/.yarn/install-state.gz
#	common/ASC.SsoAuth/.yarn/install-state.gz
#	common/ASC.UrlShortener/.yarn/install-state.gz
#	common/ASC.WebDav/.yarn/install-state.gz
 2022-08-09 16:27:35 +03:00
pavelbannov
d679a3d9a7 Files: async fix 2022-08-09 16:09:14 +03:00
Sergey Kirichenko
09be9c3907
Modify rabbit, redis docker running (#754) 
* Modify rabbit, redis run

* Modify
STORAGE_ROOT

* Syntax modify

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
 2022-08-09 15:57:34 +03:00
Alexey Bannov
717b1f899a Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop 2022-08-09 12:51:40 +03:00