Commit Graph

26061 Commits

Author SHA1 Message Date
TimofeyBoyko
f91604d316 Merge branch 'develop' into feature/bar-quotas 2022-10-11 12:55:55 +05:00
8e3826bd71
Merge pull request #699 from ONLYOFFICE/feature/doc-space-info-panel
InfoPanel for DocSpace
2022-10-10 21:18:11 +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
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
75e2294fd7 Merge branch 'develop' into feature/bar-quotas 2022-10-10 19:04:38 +05: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
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
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
mushka
cd63f5c6d4 added mechanism that removes all left-out separators from context menu after show-info key deletion 2022-10-07 20:15:15 +03:00
mushka
8e2335416a removed unused file 2022-10-07 18:55:26 +03:00
mushka
1da45e8c3b fixed rerendering on selectiong change visual issue 2022-10-07 18:49:31 +03:00
Elyor Djalilov
044494625f Web: InputPhone: bugfix 2022-10-07 20:29:42 +05:00
964e372477
Merge pull request #895 from ONLYOFFICE/bugfix/context-menu-header
Bugfix/context menu header
2022-10-07 18:27:54 +03:00
mushka
5975024de1 removed unused code 2022-10-07 18:10:47 +03:00
mushka
969f104466 removed unused console.log 2022-10-07 17:55:00 +03:00
mushka
5cdcd122b8 fixed checkAndOpenLocationAction method 2022-10-07 17:54:51 +03:00
fe2dd3c394 Merge branch 'develop' into feature/login-settings
# Conflicts:
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2022-10-07 17:47:24 +03:00
TimofeyBoyko
0af18bf639 Merge branch 'develop' into bugfix/context-menu-header 2022-10-07 19:32:45 +05:00
TimofeyBoyko
68fc4fb2d4 Web:Common:FilterInput: delete useless code 2022-10-07 19:24:56 +05:00
TimofeyBoyko
3fa401c790 Web:Components:Combobox: disable mobile view for low count of options 2022-10-07 19:24:39 +05:00
mushka
29f0041529 discarded feed changes 2022-10-07 17:16:32 +03:00
mushka
aecc841e55 Merge branch 'develop' into feature/doc-space-info-panel 2022-10-07 17:15:15 +03:00
mushka
e1c2d82fb2 implemented new checkAndOpenLocationAction method to history view item list 2022-10-07 17:12:39 +03:00
mushka
92478ca4dc coded out new filesActionsStore method to check given folder accesibility by its id and open it if it is or show warning if it isnt 2022-10-07 17:12:10 +03:00
d0682bb467
Merge pull request #779 from ONLYOFFICE/feature/user-quota
Feature/user quota
2022-10-07 17:09:52 +03:00
302b9c57ff fix 2022-10-07 17:08:38 +03:00
8f14b6ce27 Merge branch 'develop' into feature/user-quota 2022-10-07 16:54:14 +03:00