Commit Graph

26653 Commits

Author SHA1 Message Date
afc9d1ce17 Merge branch 'develop' into feature/remove-waste 2022-10-19 14:18:52 +03:00
16bb42d0af fix ASC.Data.Storage.Encryption 2022-10-19 13:12:33 +03:00
4e0d77a239 fix wizard 2022-10-19 12:48:23 +03:00
7a2aff8fa2
Merge pull request #929 from ONLYOFFICE/bugfix/fixed-selector-add-button-styles
Web: Files: fixed selector-add-button theme styles
2022-10-19 12:34:46 +03:00
59997d1d2c Web: Files: fixed selector-add-button theme styles 2022-10-19 12:29:01 +03:00
b9968f8b5a Whitelabel: fix payment 2022-10-19 11:38:12 +03:00
9df8c0d69f Quota: fix 2022-10-18 21:37:16 +03:00
d30f95576b
Merge pull request #921 from ONLYOFFICE/bugfix/shared-drag-n-drop
Web:Client:Home: disable drag
2022-10-18 18:51:46 +03:00
TimofeyBoyko
4618cafeba Web:Client: move disableDrag from 'Home' to 'FilesStore' 2022-10-18 20:46:39 +05:00
TimofeyBoyko
4f266d497e Web:Files:HOCs: disable drag into folder at trash 2022-10-18 20:43:10 +05:00
TimofeyBoyko
069c86618c Web:Client:Home: disable drag and drop for trash, recent, favorites folders 2022-10-18 20:27:02 +05:00
TimofeyBoyko
b4ba9140e0 Merge branch 'develop' into bugfix/shared-drag-n-drop 2022-10-18 20:19:32 +05:00
09a63ba190
Merge pull request #928 from ONLYOFFICE/bugfix/fix-drag-styles
Web:Client:Home: fix drag styles for rooms
2022-10-18 18:13:46 +03:00
a2afba0a28 Quota: fix 2022-10-18 18:13:35 +03:00
TimofeyBoyko
3df5d383ea Web:Client:Home: delete useless code 2022-10-18 20:07:28 +05:00
TimofeyBoyko
1b5b91d450 Web:Client:Home: fix active drag styles for rooms for tile view 2022-10-18 20:04:21 +05:00
TimofeyBoyko
5b912d76f7 Web:Client:Home: fix active drag styles for rooms for row view 2022-10-18 19:48:49 +05:00
TimofeyBoyko
3bc60b0cff Web:Client:Home: fix drag styles for rooms 2022-10-18 19:33:37 +05:00
be8b455718 Files: UsersInRoom feature 2022-10-18 17:12:35 +03:00
212c96bd5b
Merge pull request #927 from ONLYOFFICE/bugfix/accounts-info
Bugfix/accounts info
2022-10-18 17:02:05 +03:00
cf8c59f93b Web: Fixed styles. 2022-10-18 16:57:21 +03:00
711b83b567 Web: Returned display of account information. 2022-10-18 16:53:50 +03:00
1c05d8777f
Merge pull request #926 from ONLYOFFICE/bugfix/error-alert
Bugfix/show upload panel
2022-10-18 16:25:35 +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
950dc4c50f Merge branch 'develop' into bugfix/error-alert 2022-10-18 17:51:53 +05:00
cf3f17a72e
Merge pull request #924 from ONLYOFFICE/bugfix/fixed-folder-deletion
Bugfix/fixed folder deletion
2022-10-18 14:48:36 +03:00
33875234ad Web: Files: fixed delete-dialog text 2022-10-18 14:45:47 +03:00
bc7053cf8b Web: Files: fixed folder deletion toast 2022-10-18 14:28:23 +03:00
a0128b4e59 Web: Files: fixed folder deletion 2022-10-18 14:27:52 +03:00
TimofeyBoyko
b12ba06731 Web:Client:Article: add onAlertClick and withAlertButton for shared main button 2022-10-18 16:06:43 +05:00
TimofeyBoyko
ab7a8c76d2 Web:Components:MainButtonMobile: add onAlertClick and withAlertClick props 2022-10-18 16:05:41 +05:00
26d4e5427f
Merge pull request #923 from ONLYOFFICE/bugfix/file-conversion
Bugfix/file conversion
2022-10-18 13:10:16 +03:00
7b4e49c58f Web: Removed adding a file to the list if a password was entered. 2022-10-18 12:48:56 +03:00
d8437330ec Web: Added password verification. 2022-10-18 12:47:30 +03:00
8ecbe1c49f Merge branch 'develop' of https://github.com/ONLYOFFICE/DocSpace into develop 2022-10-18 12:34:15 +03:00
521d69be08 Added set APP_CORE_BASE_DOMAIN and ENV_EXTENSION 2022-10-18 12:33:59 +03:00
e40e707640 Update docker-entrypoint.py
Fix set APP_CORE_BASE_DOMAIN equals ""
2022-10-18 12:32:13 +03:00
de502227ce
Merge pull request #922 from ONLYOFFICE/bugfix/role-icon
Bugfix/role icon
2022-10-18 12:31:19 +03:00
TimofeyBoyko
c8049509f7 Web:Client:NavMenu: hide role icon for mobile vieww 2022-10-18 14:18:44 +05:00
TimofeyBoyko
27b0b40903 Web:Components:Avatar: add hideRoleIcon prop 2022-10-18 13:53:42 +05:00
TimofeyBoyko
aeac81a9ee Web:Client:Home: disable drag
drop for shared and archived
2022-10-18 13:10:33 +05:00
33ca5a8f78 Update db.yml
Map to local port 33060 for connection to host's clients
2022-10-18 10:49:49 +03:00
27713eed69
Merge pull request #918 from ONLYOFFICE/feature/bar-quotas
Feature/bar quotas
2022-10-17 19:00:49 +03:00
72bcfd1586
Merge pull request #887 from ONLYOFFICE/feature/apisystem
api system
2022-10-17 18:58:54 +03:00
TimofeyBoyko
f7903116bd Web:Client:MainButton: fix download count when error 2022-10-17 20:58:53 +05:00
TimofeyBoyko
ce8921f5cb Web:Components:MainButtonMobile: fix alert icon 2022-10-17 20:27:48 +05:00
502aac91b1 ApiSystem: log, service 2022-10-17 18:24:50 +03:00
TimofeyBoyko
6d0a501cf0 Web:Client:MainBar: fix 2022-10-17 19:50:29 +05:00
c938a98d00 fix ValidateDomain 2022-10-17 17:48:41 +03:00