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