Commit Graph

697 Commits

Author SHA1 Message Date
Akmal Isomadinov
dd50b03ebf Web:Component:Button: Refactoring button loader 2022-11-07 11:30:10 +05:00
Akmal Isomadinov
4370c38ea7 Web:Components:Loader: Add StyledTrack and refactoring Loader component 2022-11-07 11:29:03 +05:00
Akmal Isomadinov
c4f20530b8 Web:Components:Button: Removed the old loader and added a new track loader 2022-11-04 19:29:42 +05:00
Akmal Isomadinov
bd0ef5d204 Web:Components:Loader: Add new track loader 2022-11-04 19:27:58 +05:00
Elyor Djalilov
0ea27d2ba8 bugfix: badge style 2022-11-04 18:08:01 +05:00
Akmal Isomadinov
c81351fed2 Web:Components:Theme:Fix Changed the background color and border color 2022-11-04 17:36:23 +05:00
Akmal Isomadinov
ac76354f6e Web:Components:Utils Color name changed 2022-11-04 17:28:10 +05:00
Akmal Isomadinov
51b49bc1fe Web:Components:Button: Added a new loader and removed the old loader 2022-11-04 12:52:36 +05:00
Akmal Isomadinov
66507b8ee5 Web:Components:Button:Added a new loader style and removed the old loader style 2022-11-04 12:51:23 +05:00
Akmal Isomadinov
1524f5e940 Web:Components:Button: Add new button loader 2022-11-04 12:48:07 +05:00
Akmal Isomadinov
74c00d2226 Web:Componemts:Themes:Update Colors button in Themes 2022-11-04 12:44:47 +05:00
Akmal Isomadinov
9914d45468 Web:Component:Utils:Added new colors for button in global Colors 2022-11-04 12:42:47 +05:00
d7abe3b9da
Merge pull request #963 from ONLYOFFICE/feature/whitelabel
Feature/whitelabel
2022-11-03 20:10:06 +03:00
mushka
83ecc297b8 Merge branch 'develop' into feature/info-panel-update 2022-11-03 17:09:41 +03:00
4abaa35bbe Web: Added a transparent background to the button according to the layouts. 2022-11-03 16:38:55 +03:00
a4476b6aa5 Web: Components: Removed the double display of toasts for mobile. 2022-11-03 16:33:52 +03:00
mushka
bb16de4ed9 Merge branch 'develop' into feature/info-panel-update and solved merge conflict 2022-11-03 14:52:11 +03:00
Akmal Isomadinov
d6a0019763 Web:Components:Themes: Update size height button theme 2022-11-03 14:56:54 +05:00
Viktor Fomin
aaad6d8a7f Merge branch 'develop' into feature/whitelabel 2022-11-02 15:58:41 +05:00
Viktor Fomin
8d9632602c Components: Tag: fix style 2022-11-02 15:15:08 +05:00
Viktor Fomin
7373d60dea Components: FormWrapper: fix 2022-11-01 15:54:50 +05:00
Viktor Fomin
2afea89545 Merge branch 'develop' into feature/whitelabel 2022-11-01 15:25:52 +05:00
mushka
5ef235bf8c Merge branch 'develop' into feature/info-panel-update 2022-10-31 13:55:44 +03:00
Viktor Fomin
109cf3e74e Components: Themes: fix 2022-10-31 13:24:10 +05:00
Elyor Djalilov
c4ff1d057c Merge branch 'develop' into feature/active-sessions 2022-10-31 11:24:05 +05:00
Viktor Fomin
c8f598f9d1 Components: Themes: fix 2022-10-31 04:23:56 +05:00
Viktor Fomin
e3615d4257 Merge branch 'develop' into feature/whitelabel 2022-10-29 01:25:26 +05:00
36e47cbe2e Merge branch 'develop' into feature/invite-accounts 2022-10-28 14:54:46 +03:00
Viktor Fomin
eded0a3a50 Merge branch 'develop' into feature/whitelabel 2022-10-28 16:05:38 +05:00
TimofeyBoyko
3baf50db59 Web:Common:Article: add theme support for vertical line 2022-10-28 12:54:06 +05:00
76d19a0a43 Merge branch 'develop' into feature/invite-accounts 2022-10-27 17:39:02 +03:00
5b2260fb8c Web: Components: AccessRightSelect: Added restoring selected item on rerender 2022-10-27 17:01:37 +03:00
Viktor Fomin
8a77cad5f4 Merge branch 'develop' into feature/whitelabel 2022-10-27 17:13:27 +05:00
Viktor Fomin
e234f1c619 Components: Themes: add help button colors 2022-10-27 17:09:55 +05:00
Viktor Fomin
3273340155 Components: IconButton: fix 2022-10-27 17:09:39 +05:00
Viktor Fomin
e43d24ebba Merge branch 'develop' into feature/whitelabel 2022-10-27 14:46:27 +05:00
73ad804383 Web:Components:Fix styles EmptyContentBody. 2022-10-26 15:16:41 +03:00
9c92ca67fd Web:Components:Fix. 2022-10-26 15:15:57 +03:00
0711c7c96c Web:Components:Fix styles EmptyContentBody. 2022-10-25 20:45:53 +03:00
ef275dc56c Merge branch 'develop' into bugfix/empty-screen 2022-10-25 17:17:29 +03:00
71f048621f Web:Components:Fix styles EmptyContentBody. 2022-10-25 16:30:42 +03:00
6cfb9a269f Web:Components:Add hugeDesktop. 2022-10-25 16:24:18 +03:00
Viktor Fomin
42b70a6cca Components: SaveCancelButtons: add disabled prop 2022-10-25 14:40:27 +05:00
Elyor Djalilov
ccf0da781c Web:Client:ActiveSessions: fix style 2022-10-25 14:08:13 +05:00
Elyor Djalilov
42471135ba Merge branch 'develop' into feature/active-sessions
# Conflicts:
#	packages/client/src/components/dialogs/index.js
#	packages/components/themes/base.js
#	packages/components/themes/dark.js
2022-10-25 13:41:42 +05:00
mushka
bc10920372 Merge branch 'develop' into feature/info-panel-update 2022-10-24 20:52:01 +03:00
Viktor Fomin
472d883220 Components: PasswordInput: fix id prop 2022-10-20 20:43:09 +05:00
Viktor Fomin
cb5836bed2 Merge branch 'develop' into bugfix/login 2022-10-20 17:54:36 +05:00
Viktor Fomin
76ba5fdf98 Merge branch 'develop' into bugfix/login 2022-10-20 14:22:22 +05:00
Viktor Fomin
abc85081c0 Components: Themes: add header color 2022-10-20 14:00:21 +05:00
0d680dd005 Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-20 11:36:22 +03:00
Viktor Fomin
07e80ece4e Components: Themes: add nav bg 2022-10-19 23:52:48 +05:00
9c99f3a53f Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-19 19:41:39 +03:00
mushka
864eb6b15c updated base and dark themes 2022-10-19 19:35:04 +03:00
7569a741d8 Merge branch 'develop' into feature/company-info-settings 2022-10-19 15:21:18 +03:00
5f80b9b108 Web:Client:Add tabIndex ComboBox, ComboButton. 2022-10-19 15:18:23 +03:00
c2e2d9e3fd Web:Client:Add tabIndex in Checkbox. 2022-10-19 14:49:26 +03:00
a1627e87ba Web:Client:Add tabIndex in SaveCancelButtons. 2022-10-19 14:48:42 +03:00
359bd4d8cf Web:Client:Add styles focus in ComboButton. 2022-10-19 14:47:05 +03:00
f32e02bff0 Web:Client:Add styles focus in checkbox. 2022-10-19 14:45:20 +03:00
Viktor Fomin
1e95d56732 Merge branch 'develop' into bugfix/login 2022-10-19 14:30:04 +05:00
59997d1d2c Web: Files: fixed selector-add-button theme styles 2022-10-19 12:29:01 +03:00
TimofeyBoyko
c37ebdc0f4 Web:Components:MainButtonMobile: delete useless code 2022-10-18 18:23:34 +05:00
TimofeyBoyko
6f344f80e9 Web:Components:MainButtonMobile: add cursor 2022-10-18 18:22:35 +05:00
TimofeyBoyko
ab7a8c76d2 Web:Components:MainButtonMobile: add onAlertClick and withAlertClick props 2022-10-18 16:05:41 +05:00
Viktor Fomin
8013fd2d15 Merge branch 'develop' into bugfix/login 2022-10-18 15:58:41 +05:00
TimofeyBoyko
27b0b40903 Web:Components:Avatar: add hideRoleIcon prop 2022-10-18 13:53:42 +05:00
a5165d09cf Merge branch 'develop' into feature/company-info-settings 2022-10-18 10:31:15 +03:00
Viktor Fomin
e3f786b255 Components: FormWrapper: add dark theme 2022-10-18 00:56:07 +05:00
TimofeyBoyko
ce8921f5cb Web:Components:MainButtonMobile: fix alert icon 2022-10-17 20:27:48 +05:00
TimofeyBoyko
3d358a53b3 Web:Components:Snackbar: fix mobile view 2022-10-17 19:46:28 +05:00
Viktor Fomin
b9e36a98f6 Merge branch 'develop' into bugfix/login 2022-10-17 16:25:58 +05:00
TimofeyBoyko
54b7f99f8e Merge branch 'develop' into feature/bar-quotas 2022-10-17 16:06:33 +05:00
1fac4168fe Merge branch 'develop' into feature/company-info-settings 2022-10-17 11:02:59 +03:00
TimofeyBoyko
b1d63436cc Merge branch 'develop' into feature/bar-quotas 2022-10-17 11:53:38 +05:00
TimofeyBoyko
b3395efe50 Merge branch 'develop' into feature/portal-access-rights 2022-10-17 11:45:25 +05:00
Viktor Fomin
eed9835e8f Components: IconButton: fix 2022-10-14 14:22:07 +05:00
Elyor Djalilov
fe11164286 Merge branch 'develop' into feature/active-sessions 2022-10-14 12:38:55 +05:00
TimofeyBoyko
470c100e2f Merge branch 'develop' into feature/bar-quotas 2022-10-14 12:26:16 +05:00
Elyor Djalilov
9bde9af673 Web: Client: add active sessions 2022-10-14 12:21:42 +05:00
28d918464f Merge branch 'develop' into feature/company-info-settings 2022-10-13 15:48:31 +03:00
8ccdde14e3 Web:Components:Fix styles third-party-tag. 2022-10-13 14:18:26 +03:00
efde1f00a9 Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-13 13:37:05 +03:00
TimofeyBoyko
1b1252823a Web:Components:TableContainer: fix drop down z-index for group menu item 2022-10-13 14:02:46 +05:00
8e87ad705f Web:Components:Add tag ReactSVG, add class third-party-tag. 2022-10-12 17:32:34 +03:00
TimofeyBoyko
43e9806553 Merge branch 'develop' into feature/portal-access-rights 2022-10-12 16:16:59 +05:00
3ef14d6f22 Merge branch 'develop' into feature/invite-panel 2022-10-12 10:00:10 +03:00
199e3faa65 Web: Components: Fixed styles. 2022-10-11 17:11:27 +03:00
6d78f37729 Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-11 16:05:49 +03:00
TimofeyBoyko
d557354690 Web:Components:Avatar: add new role 'manager' 2022-10-11 15:22:11 +05:00
2f64da592e Merge branch 'develop' into bugfix/backup 2022-10-11 12:52:13 +03:00
a47ce3d8c0 Merge branch 'develop' into feature/invite-panel 2022-10-11 11:58:25 +03:00
TimofeyBoyko
f91604d316 Merge branch 'develop' into feature/bar-quotas 2022-10-11 12:55:55 +05:00
cf2547e030 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/common/constants/index.js
2022-10-11 10:20:42 +03:00
4dbf1e70b7 Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.ActiveDirectory/GlobalUsings.cs
#	common/ASC.Data.Storage/StorageFactory.cs
#	common/ASC.Data.Storage/TenantQuotaController.cs
#	migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
#	packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Core/PublicResources/Resource.resx
#	web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
2022-10-10 19:16:03 +03:00
mushka
415c620574 Merge branch 'develop' into feature/doc-space-info-panel 2022-10-10 17:27:16 +03:00
TimofeyBoyko
75e2294fd7 Merge branch 'develop' into feature/bar-quotas 2022-10-10 19:04:38 +05:00
19e336f734 Web: Components: fixed combo-button 2022-10-10 15:57:38 +03:00
734a03019a
Merge pull request #877 from ONLYOFFICE/feature/phone-input
Feature/phone input
2022-10-10 12:04:59 +03:00
4013f00115 Web: fixed context-menu height. 2022-10-10 10:39:09 +03:00
Elyor Djalilov
7f7b4c38df Web: InputPhone: bugfix 2022-10-10 12:21:28 +05:00
1ea1cedb3b Merge branch 'develop' into feature/invite-panel 2022-10-10 09:32:13 +03:00
Elyor Djalilov
044494625f Web: InputPhone: bugfix 2022-10-07 20:29:42 +05:00
TimofeyBoyko
0af18bf639 Merge branch 'develop' into bugfix/context-menu-header 2022-10-07 19:32:45 +05:00
TimofeyBoyko
3fa401c790 Web:Components:Combobox: disable mobile view for low count of options 2022-10-07 19:24:39 +05:00
mushka
7de3650533 Merge branch 'develop' into feature/doc-space-info-panel 2022-10-07 16:21:59 +03:00
Elyor Djalilov
54f80ce4c7 bugfix 2022-10-07 17:17:52 +05:00
Elyor Djalilov
664d5480fd Web: InputPhone: bugfix 2022-10-07 17:17:23 +05:00
8d5ac645e6 Web: Fixed scroll shift and page height reduction, moved logic to a common component. 2022-10-07 15:09:55 +03:00
Elyor Djalilov
34f5c7b434 Web: InputPhone: changed mask of several countries 2022-10-07 15:59:12 +05:00
e19e7c9dc2 Merge branch 'develop' into feature/invite-panel 2022-10-07 10:46:48 +03:00
Elyor Djalilov
0f5498f81d Web: InputPhone: bug with style fixed 2022-10-06 20:07:49 +05:00
TimofeyBoyko
df17649b19 Web:Components:ContextMenu: fix header styles 2022-10-06 17:39:15 +03:00
TimofeyBoyko
f2a9985694 Web:Components: add header context menu for accounts 2022-10-06 17:33:26 +03:00
6bbf8a606a Web: Fixed the display of the payer's avatar. 2022-10-06 14:15:38 +03:00
Elyor Djalilov
4aaa63543f Web: InputPhone: bug with mask fixed 2022-10-06 15:54:19 +05:00
Elyor Djalilov
3a1333c4a7 Web: InputPhone: flag display fixed 2022-10-06 15:48:08 +05:00
Elyor Djalilov
85332ffbb4 Web: InputPhone: bug with mask fixed 2022-10-06 15:25:25 +05:00
ac85ff775e Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-06 12:56:09 +03:00
37f8589603 Web: Components: fixed combobox styles 2022-10-06 12:41:30 +03:00
Elyor Djalilov
d0f625d4f1 Web: InputPhone: bug with validate fixed 2022-10-06 11:31:02 +05:00
Elyor Djalilov
2c71e239b1 Web: PhoneInput: added prop scaled 2022-10-05 19:19:50 +05:00
Elyor Djalilov
84f1167c49 Web: InputPhone: bug with validate fixed 2022-10-05 19:10:15 +05:00
Elyor Djalilov
1faa5500af Web: PhoneInput: bug with validate fixed 2022-10-05 18:42:23 +05:00
Elyor Djalilov
62f5945efd Web: InputPhone: bug with style fixed 2022-10-05 18:24:17 +05:00
55e17eef42 Web:Components:Add icon in tag. 2022-10-05 15:23:39 +03:00
d37a6068fc Merge branch 'develop' into feature/invite-panel 2022-10-05 15:04:24 +03:00
Elyor Djalilov
2c2419d983 Web: PhoneInput: bugfix with prefix 2022-10-05 16:36:34 +05:00
412e7298cf Merge branch 'develop' into feature/stripe 2022-10-05 14:00:39 +03:00
TimofeyBoyko
62c1acb5e4 Web:Components:DropDownIten: fix dark theme for icon with rect fill 2022-10-05 13:02:34 +03:00
Elyor Djalilov
2faed80c67 Web: InputPhone: refactoring 2022-10-04 22:09:54 +05:00
b56a90e917 Web: Components: ToggleButton: fixed colors for dark theme 2022-10-04 17:19:20 +03:00
a6448a476f Web: Components: ToggleButton: removed useless code 2022-10-04 17:16:56 +03:00
ca1cd06fad Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/public/images/plus.react.svg
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/components/PrivateRoute/index.js
2022-10-04 17:13:46 +03:00
Elyor Djalilov
c6342bc580 Web: Components: InputPhone: bug fixed 2022-10-04 18:59:47 +05:00
115892a497 Web: Fixed styles according layouts. 2022-10-04 11:17:48 +03:00
Elyor Djalilov
4ec2ebdbba bugfix 2022-10-04 12:17:19 +05:00
a043d0ad6a Web: Components: Added a center location. 2022-10-04 09:28:15 +03:00
TimofeyBoyko
8c5abf813d Merge branch 'develop' into feature/bar-quotas 2022-10-04 06:56:00 +03:00
Elyor Djalilov
e2cf41096f dark theme fixed 2022-10-03 21:02:00 +05:00
e9dbf8fe2b Web: Fixed the use of styles. 2022-10-03 17:59:23 +03:00
Elyor Djalilov
61ad16eba9 some refactoring 2022-10-03 18:41:15 +05:00
6007a122d5 Web: Components: fixed row styles 2022-10-03 14:59:02 +03:00
28115f7e72 Web: Components: fixed settings icon styles 2022-10-03 14:58:38 +03:00
1ca392f678 Web: Components: fixed catalog styles 2022-10-03 14:58:10 +03:00
Elyor Djalilov
a2537731bb refactoring 2022-10-03 14:44:39 +05:00
Elyor Djalilov
41261e64b9 Merge branch 'develop' into feature/phone-input
# Conflicts:
#	packages/components/index.js
2022-10-03 12:20:33 +05:00
Elyor Djalilov
fb6f817369 added invalid flag 2022-10-03 11:08:22 +05:00
mushka
1b2dae0890 Merge branch 'develop' into feature/doc-space-info-panel 2022-10-02 03:45:40 +03:00
mushka
4a701676ae updated dark theme for infoPanel 2022-10-02 03:42:40 +03:00
mushka
ab45eaa8a7 updated base theme for infoPanel 2022-10-02 03:42:31 +03:00
mushka
547ed8f93e added clasName to submenu bottom line for outsied css styling 2022-10-02 03:42:16 +03:00
mushka
113d832b29 transfered colors for history to dark theme 2022-10-02 02:46:16 +03:00
mushka
09bbc46519 new colors for history in base theme 2022-10-02 02:45:51 +03:00
mushka
7186c933e6 provided combobox with new withBackdrop prop 2022-10-02 02:44:56 +03:00
5d44074890 Web: Files: fixed row styles 2022-09-30 14:57:43 +03:00
6edf75e309 Web: Files: fixed row styles 2022-09-30 14:47:15 +03:00
09a2113b59 Web: Fixed row selection width. 2022-09-30 13:19:50 +03:00
96308af2fa Web: Added fixed icon container length to prevent interface jumps. 2022-09-30 12:20:12 +03:00
955a9379de Web: Ipad: fixed Safari styles 2022-09-29 17:29:09 +03:00
Elyor Djalilov
07f087abdd some refactoring 2022-09-29 17:37:33 +05:00
4f313d7ab7 Web: Components: fixed tree-menu styles 2022-09-29 12:32:43 +03:00
Elyor Djalilov
7b1b7dd1b6 bugfix 2022-09-28 19:18:07 +05:00
3906f27d50 Web: Files: disabled switching to shared folder 2022-09-28 13:44:06 +03:00
eb66d3bf57 Web: Components: fixed InifiniteLoader crash 2022-09-28 13:41:25 +03:00
Elyor Djalilov
ae27814149 test with mask 2022-09-28 12:08:49 +05:00
TimofeyBoyko
a5f236e7cd Web:Components:Snackbar: fix prop types 2022-09-27 12:29:34 +03:00
Elyor Djalilov
71255c180c added flag and mask for countries 2022-09-27 10:26:10 +05:00
mushka
af16f21d4a Merge branch 'develop' into feature/doc-space-info-panel 2022-09-26 11:00:34 +03:00
33d0c10eb3
Merge branch 'develop' into feature/personal-redesign-empty-screen 2022-09-23 16:53:50 +03:00
Elyor Djalilov
2cadf93c1a added flag and mask for countries 2022-09-23 18:53:00 +05:00
7f1d946269 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
#	packages/client/src/pages/PortalSettings/index.js
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
2022-09-23 16:11:23 +03:00
c2ab59c2ff
Merge branch 'develop' into feature/new-profile 2022-09-23 15:17:22 +03:00
389298dfd6 Web: Client: added theme to logo 2022-09-23 13:32:43 +03:00
ac5a8c9f20
Merge branch 'develop' into bugfix/wizard 2022-09-23 12:58:34 +03:00
3e1383c7e7 Web: Components: Added description. 2022-09-23 12:39:13 +03:00
48694a16b1 Web: Added context menu to the mobile view. 2022-09-23 12:33:04 +03:00
9469a977fb
Merge branch 'develop' into feature/personal-redesign-empty-screen 2022-09-23 11:06:35 +03:00
57f9f8420f Merge branch 'develop' into feature/invite-panel 2022-09-22 18:13:42 +03:00
Elyor Djalilov
ad97a9131a bugfix with border color 2022-09-22 20:03:03 +05:00
4a51d86d21 Web: Removed different height of icons and rows. 2022-09-22 16:23:19 +03:00
0db21e1ce6 Web:Components:Change styles EmptyPageStyles. 2022-09-22 15:23:27 +03:00
Elyor Djalilov
56dfc4de0d some refactoring 2022-09-22 17:20:27 +05:00
2ed2f68cb6 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-22 12:48:46 +03:00
TimofeyBoyko
dd71b12fe0 Web:Components:TableContainer: add tag ref for header cell 2022-09-22 12:17:43 +03:00
760beb27c5
Merge branch 'develop' into feature/recent-redesign-empty-screen 2022-09-21 17:04:04 +03:00
79097aecec Components: ModalDialog: fix style 2022-09-21 16:26:19 +03:00
17e2b45f18 Web:Components:Fix styles EmptyPageStyles. 2022-09-21 16:16:04 +03:00
8023fbf0e5 Components: ModalDialog: fix close button position 2022-09-21 16:01:04 +03:00
d5b144a82f Web: Client: fixed ThirdPartyServicesSettings styles 2022-09-21 16:00:44 +03:00
79fa7815c4 Merge branch 'develop' into feature/company-info-settings 2022-09-21 14:48:28 +03:00
f417db1323 Merge branch 'develop' into feature/invite-panel 2022-09-21 13:57:50 +03:00
d9dd4c7139 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-21 13:52:51 +03:00
64fd6d387e Merge branch 'develop' into feature/invite-panel 2022-09-21 13:13:08 +03:00
2b2aeea246 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-21 12:48:03 +03:00
31458b11e5
Merge branch 'develop' into bugfix/fixed-settings-loaders 2022-09-21 12:32:57 +03:00
ffabcea9d6
Merge branch 'develop' into feature/archived-redesign-empty-screen 2022-09-21 11:07:04 +03:00
f7910ac9a1
Merge branch 'develop' into bugfix/catalog-item-icon 2022-09-21 11:05:27 +03:00
9252d093cb Web: Components: InputBlock: Fixed color and hoverColor usage 2022-09-21 10:40:10 +03:00
TimofeyBoyko
38538837ed Web:Components:CatalogItem: show icon only on hover 2022-09-21 10:35:52 +03:00
f904dd730c Web:Components:Delete secondaryButton theme. 2022-09-21 10:26:05 +03:00
3ac9b98ad2 Components: fix styles 2022-09-21 03:03:11 +03:00
f2112d44a1 Components: Combobox: fix 2022-09-21 02:55:18 +03:00
6507232172 Components: SocialButton: fix warning 2022-09-21 02:15:26 +03:00
c3f2d3542c Components: Themes: add style 2022-09-20 22:01:48 +03:00
6f003a8459 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-20 21:54:33 +03:00
de7c191dc7 Merge branch 'feature/archived-redesign-empty-screen' of github.com:ONLYOFFICE/AppServer into feature/archived-redesign-empty-screen 2022-09-20 16:51:20 +03:00
7d1403e1ff Web:Components:Delete StyledSecondaryButton, fix notDropdown styles. 2022-09-20 16:51:13 +03:00
476c0fc669 Web:Components:Delete StyledSecondaryButton. Add flag isDropdown for icon dropdown. 2022-09-20 16:50:20 +03:00
mushka
2d9b5654e6 fixed combo button crashing on not having a selectedItem 2022-09-20 14:54:40 +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
e48371ba7f Merge branch 'develop' into bugfix/tags 2022-09-20 14:13:33 +03:00
9fc617c652
Merge branch 'develop' into feature/archived-redesign-empty-screen 2022-09-20 13:52:31 +03:00
TimofeyBoyko
f1a8310ac3 Web: move svg from toast to public path 2022-09-20 12:56:14 +03:00
TimofeyBoyko
edea9df880 Web:Components:Tag: add max width for default tag 2022-09-20 12:28:46 +03:00
1cc72b52da Web: Fixed dark theme. 2022-09-20 12:03:28 +03:00
fd4b664b64 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-09-20 11:29:26 +03:00
092b8292da Web:Client:Add LoaderSubmenu in SubmenuCommon. 2022-09-20 10:44:28 +03:00
f251632987 Web: Components: Separated styles. 2022-09-20 10:40:30 +03:00
b261f94687 Web: Components: Added props. 2022-09-20 10:39:23 +03:00
e5d5d6aebe Components: Themes: fix height 2022-09-19 23:18:21 +03:00
6448b63318 Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/constants/index.js
#	web/ASC.Web.Api/Program.cs
2022-09-19 18:16:34 +03:00
f5ac695648 Web:Components:Add props isDisplayImage in MainButton. 2022-09-19 18:05:37 +03:00
TimofeyBoyko
cefb3fa6f0 Web:Components:Snackbar: update styles 2022-09-19 17:09:31 +03:00
14ab783da7 Web:Components:Fix EmptyPageStyles. 2022-09-19 16:49:39 +03:00
fa01783cdb Web: Client: fixed Article loader 2022-09-19 16:41:11 +03:00
8a380d24f5 Web: Added dark theme. 2022-09-19 16:31:00 +03:00
225482602e Web:Components:Rename props in isEmptyPage. 2022-09-19 14:22:00 +03:00
50122071d7 Web: Components: AccessRightSelect: Fixed styles 2022-09-19 12:45:49 +03:00
6b3ebed8b9 Web: Fixed bugs. 2022-09-19 11:59:47 +03:00
ae0eb0a143 Merge branch 'develop' into feature/archived-redesign-empty-screen 2022-09-19 09:55:07 +03:00
e8531daac8 Merge branch 'develop' into feature/invite-panel 2022-09-19 09:46:21 +03:00
16ae9ca998 Web:Components:Changed styles for RootFolder to EmptyContentBody. 2022-09-18 17:32:54 +03:00
5c3c5de4d0 Components: Combobox: fix warning 2022-09-18 02:30:43 +03:00
1fa2dc05cb Components: Themes: fix 2022-09-16 17:01:29 +03:00
mushka
9c8fa64983 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-16 15:33:29 +03:00
83791ef405 Components: Combobox: fix styles 2022-09-16 10:57:01 +03:00
f959d81e1f Components: Themes: fix 2022-09-16 03:05:19 +03:00
a0d0bd6f66 Components: Combobox: fix style 2022-09-16 02:27:47 +03:00
de122f813e Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-15 21:17:28 +03:00
d0a01ff723
Merge branch 'develop' into bugfix/fixed-infinite-tiles-styles 2022-09-15 20:54:58 +03:00
d21c910842 Web: Components: InfiniteLoader: removed useless selectedFolderId prop 2022-09-15 17:31:19 +03:00
bec4f11dcd Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/components/Loaders/index.js
#	packages/common/store/AuthStore.js
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	packages/login/webpack.config.js
#	products/ASC.Files/Service/Program.cs
#	web/ASC.Web.Api/Program.cs
2022-09-15 17:16:04 +03:00
74fa95d843 Web: Components: fixed styles of infinite tiles 2022-09-15 17:14:34 +03:00
Elyor Djalilov
6fc964e17b some refactoring 2022-09-15 17:52:39 +05:00
c20e01e351 Web: Added information about storage size, added checks. 2022-09-15 14:59:55 +03:00
aa195fe76b
Merge branch 'develop' into feature/company-info-settings 2022-09-15 14:40:00 +03:00
TimofeyBoyko
0dba384037 Merge branch 'develop' into feature/redesign-personal-filter 2022-09-15 14:29:57 +03:00
b4009910a3 Web: Components: fixed tap selection 2022-09-15 12:02:50 +03:00