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 |
|
