|
|
6d78f37729
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-11 16:05:49 +03: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 |
|
|
|
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 |
|
Elyor Djalilov
|
7f7b4c38df
|
Web: InputPhone: bugfix
|
2022-10-10 12:21:28 +05: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 |
|
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 |
|
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 |
|
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 |
|
