TimofeyBoyko
|
7a1ddd3c20
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-11 14:04:42 +05:00 |
|
|
|
538300d205
|
Merge pull request #886 from ONLYOFFICE/feature/stripe
Feature/stripe
|
2022-10-11 11:56:09 +03:00 |
|
|
|
fcabf8b73c
|
fix
|
2022-10-11 11:13:22 +03:00 |
|
|
|
b160c16fc2
|
creating rooms and users feature available only for paid portals
|
2022-10-11 11:02:43 +03:00 |
|
|
|
f013c74475
|
Web: Added additional units for measuring the amount of information, added verification.
|
2022-10-11 10:58:10 +03:00 |
|
|
|
cf2547e030
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/common/constants/index.js
|
2022-10-11 10:20:42 +03:00 |
|
|
|
0d7f77a18a
|
Merge pull request #897 from ONLYOFFICE/bugfix/accounts-filter
Bugfix/accounts filter
|
2022-10-11 10:12:57 +03:00 |
|
TimofeyBoyko
|
fe8b7ec257
|
Web:Client: add 'DocSpaceAdmin' translation key
|
2022-10-11 12:12:38 +05:00 |
|
TimofeyBoyko
|
4f03d67b58
|
Web:Client:InfoPanel: fix user role
|
2022-10-11 12:05:58 +05:00 |
|
|
|
6bf3720ace
|
Merge pull request #903 from ONLYOFFICE/feature/doc-space-info-panel
Feature/info panel udpate
|
2022-10-11 09:53:29 +03:00 |
|
TimofeyBoyko
|
da14ffd656
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-11 11:52:34 +05:00 |
|
mushka
|
09ece8865d
|
removed old unused methods
|
2022-10-11 09:51:21 +03:00 |
|
|
|
8e3826bd71
|
Merge pull request #699 from ONLYOFFICE/feature/doc-space-info-panel
InfoPanel for DocSpace
|
2022-10-10 21:18:11 +03:00 |
|
|
|
190ee44952
|
fix
|
2022-10-10 19:52:12 +03:00 |
|
mushka
|
0da82b28eb
|
added mechanism of searcing an account on its link click
|
2022-10-10 19:41:09 +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
|
0608694746
|
fixed account email text truncation
|
2022-10-10 18:47:33 +03:00 |
|
mushka
|
edb3f894f6
|
fixed selected folder path parts error
|
2022-10-10 18:38:52 +03:00 |
|
mushka
|
415c620574
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-10 17:27:16 +03:00 |
|
mushka
|
946c4a8408
|
selectionParentRoom setting mechanism fix
|
2022-10-10 17:21:43 +03:00 |
|
mushka
|
be3bb23144
|
fixed loader error in accounts
|
2022-10-10 17:19:19 +03:00 |
|
TimofeyBoyko
|
998c06d0ea
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-10 19:04:53 +05:00 |
|
|
|
b12f7a5696
|
Merge pull request #901 from ONLYOFFICE/bugfix/block-move-to-button
Bugfix/block move to button
|
2022-10-10 17:04:48 +03:00 |
|
TimofeyBoyko
|
2bafe2c590
|
Web:Client: disable 'Move to' button to the current folder
|
2022-10-10 18:59:28 +05:00 |
|
TimofeyBoyko
|
0e9ccf9f12
|
Web:Client: disable 'Move to' button to the current folder
|
2022-10-10 18:58:49 +05:00 |
|
TimofeyBoyko
|
cebab845cd
|
Merge branch 'develop' into bugfix/block-move-to-button
|
2022-10-10 18:32:19 +05:00 |
|
|
|
49ccd70e8e
|
Merge pull request #889 from ONLYOFFICE/feature/two-factor-authentication
Feature/two factor authentication
|
2022-10-10 16:25:03 +03:00 |
|
TimofeyBoyko
|
df103904d5
|
Web:Client:Components: disable move to button of selection panel body while loading folders tree
|
2022-10-10 18:20:28 +05:00 |
|
mushka
|
27d7f9678f
|
fixed openLocationAction not defined issue on opne file location from history
|
2022-10-10 16:14:49 +03:00 |
|
mushka
|
f6f6bd871e
|
fixed members blinking on room change
|
2022-10-10 16:02:36 +03:00 |
|
|
|
f61a303e01
|
Merge pull request #900 from ONLYOFFICE/bugfix/fixed-combo-box-styles
Web: Components: fixed combo-button
|
2022-10-10 15:59:17 +03:00 |
|
|
|
19e336f734
|
Web: Components: fixed combo-button
|
2022-10-10 15:57:38 +03:00 |
|
|
|
91ba9d1147
|
Merge pull request #899 from ONLYOFFICE/bugfix/fixed-action-button
Web: Common: fixed action button styles, removed useless code
|
2022-10-10 15:30:37 +03:00 |
|
|
|
368a23fd4e
|
Web: Common: fixed action button styles, removed useless code
|
2022-10-10 15:11:43 +03:00 |
|
mushka
|
513f1aab67
|
deleted unused console.log
|
2022-10-10 15:01:44 +03:00 |
|
mushka
|
7551b5c271
|
fixed historyBlockMessage crashing on empty selection
|
2022-10-10 14:58:53 +03:00 |
|
mushka
|
36c6372a53
|
fixed issue with equal root folder and file ids
|
2022-10-10 14:57:42 +03:00 |
|
|
|
486ddb25bf
|
refactoring
|
2022-10-10 14:55:22 +03:00 |
|
|
|
397af4e55d
|
refactoring
|
2022-10-10 14:32:48 +03:00 |
|
TimofeyBoyko
|
b6cf14f62e
|
Merge branch 'develop' into bugfix/accounts-filter
|
2022-10-10 14:57:56 +05:00 |
|
TimofeyBoyko
|
fe310ee9d4
|
Web:Common:FilterInput: fix combo-item styles
|
2022-10-10 14:29:16 +05:00 |
|
TimofeyBoyko
|
763d8ff860
|
Web:Common:Loaders: add support dark-theme for filter block loader
|
2022-10-10 14:11:05 +05:00 |
|
|
|
770c414c93
|
Merge pull request #883 from ONLYOFFICE/bugfix/branding-loader
Bugfix/branding loader
|
2022-10-10 12:07:50 +03:00 |
|
|
|
734a03019a
|
Merge pull request #877 from ONLYOFFICE/feature/phone-input
Feature/phone input
|
2022-10-10 12:04:59 +03:00 |
|
TimofeyBoyko
|
9a831cd2bf
|
Web:Client: fix filter header translation key
|
2022-10-10 14:01:27 +05:00 |
|
TimofeyBoyko
|
09dbd9d088
|
Web: move translation key 'AdvancedFilter' from Files to Common
|
2022-10-10 13:53:24 +05:00 |
|
Elyor Djalilov
|
7f7b4c38df
|
Web: InputPhone: bugfix
|
2022-10-10 12:21:28 +05:00 |
|
|
|
a563bbe3cf
|
Merge branch 'develop' into feature/two-factor-authentication
# Conflicts:
# web/ASC.Web.Api/Api/AuthenticationController.cs
|
2022-10-09 21:32:14 +03:00 |
|
|
|
4d19337805
|
Merge pull request #792 from ONLYOFFICE/feature/login-settings
Feature/login settings
|
2022-10-09 20:56:22 +03:00 |
|
|
|
75aebdd9b2
|
optimization
|
2022-10-09 19:35:59 +03:00 |
|
