Commit Graph

6401 Commits

Author SHA1 Message Date
8ba2f0c694 Merge branch 'develop' into feature/backup
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
2021-10-25 11:02:42 +03:00
94a466ed48 Merge branch 'release/1.0.0' into develop
# Conflicts:
#	packages/asc-web-components/aside/aside.js
2021-10-22 09:02:39 +03:00
effe9ce9fa Web: Files: fixed drag 2021-10-21 19:20:04 +03:00
576c62e337
Merge pull request #400 from ONLYOFFICE/bugfix/tile-view
Bugfix/tile view
2021-10-21 19:16:16 +03:00
81019049d7
Merge branch 'develop' into feature/personal-share-dialog 2021-10-21 19:14:59 +03:00
Artem Tarasov
9bc6cc3c51 Web: Files: TilesView: fixed position of checkbox 2021-10-21 18:24:07 +03:00
556059437d Web: Files: Fixed hiding context-menu before displaying share panel 2021-10-21 17:53:28 +03:00
d6da7a7fb2
Merge pull request #411 from ONLYOFFICE/bugfix/scrollbar
Bugfix/scrollbar
2021-10-21 16:15:24 +03:00
Artem Tarasov
d1baceb64f Web: Files: TilesView: fixed position checkbox on mobile 2021-10-21 15:23:40 +03:00
94bd11930c
Merge pull request #406 from ONLYOFFICE/feature/avatar-edit-action
Feature/avatar edit action
2021-10-21 15:15:43 +03:00
Artem Tarasov
27eff81dbc Merge branch 'release/1.0.0' into bugfix/tile-view 2021-10-21 15:14:58 +03:00
Artem Tarasov
489506a42f Web: Files: TilesView: fixed styles 2021-10-21 15:13:28 +03:00
25b59177d8 Web: Files: disable aside scroll in Upload Panel 2021-10-21 15:05:13 +03:00
e88a5b6af4 Web: Files: Disabled the restore and download buttons while the comment is saved. 2021-10-21 14:13:39 +03:00
bc48169e75 Web: Files: Deleted useless file. 2021-10-21 14:03:36 +03:00
081ab8ff3e Web: Files: Deleted useless code. 2021-10-21 13:56:36 +03:00
3a2111bfe4 Web: Files: Disabled save and cancel buttons when is saving comment. 2021-10-21 13:56:02 +03:00
c61e42e771 Web: Fixed styles. 2021-10-21 13:47:14 +03:00
ac0e803072 Web: Files: Remove color flicker loader on instant restoration of history. 2021-10-21 13:11:09 +03:00
cc9857c904 Web: Deleted useless code. 2021-10-21 12:29:25 +03:00
e13f3869f8 Web: Fixed after merge. 2021-10-21 12:24:24 +03:00
30f8385466 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/scrollbar 2021-10-21 12:24:16 +03:00
44f5f05ae6 Web: Refactoring. 2021-10-21 12:21:10 +03:00
152207d85a Merge branch 'develop' into bugfix/version-history-list
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
2021-10-21 12:02:57 +03:00
Artem Tarasov
96d92d9b6a
Merge pull request #407 from ONLYOFFICE/feature/create-files-without-submit
Web: Files: added file creation after focus loss
2021-10-21 11:40:15 +03:00
85c96024cd Web: Files: fixed convert files upload 2021-10-21 11:30:40 +03:00
0990af91a9 Web: Deleted useless code. 2021-10-21 11:07:22 +03:00
087c7af06c Web: Files: Removed the jump to the beginning of the list when the recovery process is over. 2021-10-21 10:55:11 +03:00
Artem Tarasov
623f451696 Web: Files: VersionHistory: fixed width of VersionHistoryPanel 2021-10-21 10:10:49 +03:00
aadf41f44d Web: Files: fix scrollbar in upload panel 2021-10-20 18:44:14 +03:00
18be8a7cff Web: Files: Added opportunity to open SharingPanel in module mode on personal desktop and tablet 2021-10-20 17:48:07 +03:00
Artem Tarasov
04778445dc Merge branch 'bugfix/tile-view' of github.com:ONLYOFFICE/AppServer into bugfix/tile-view
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
2021-10-20 16:56:50 +03:00
Artem Tarasov
17a31e8513 Web: Files: TableView: fixed position of image in row 2021-10-20 16:51:47 +03:00
7fffe69143 Web: Files: Refactoring. 2021-10-20 16:21:20 +03:00
Artem Tarasov
23b30f5d8d Web: Common: PageLayout: table style fix 2021-10-20 15:52:02 +03:00
b00836cc46 Web: Files: Fixed showing not version badge after scrolling. 2021-10-20 15:36:14 +03:00
03aae77431 Web: Files: delete log 2021-10-20 17:22:04 +05:00
6e58edd5aa Web: Files: Added re-render rows when is process restoring for disable rows. 2021-10-20 15:13:52 +03:00
3f2839f315 WEb: Files: Added variable size list for version history. 2021-10-20 15:11:19 +03:00
fa12a2be1c Web: Files: fixed folder actions after merge develop 2021-10-20 16:47:59 +05:00
26956a9ba1 Web: Files: added file creation after focus loss 2021-10-20 12:58:11 +03:00
392122ae39 Web: Files: fix files operation 2021-10-20 12:41:34 +03:00
80d9471f7a Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/tile-view 2021-10-20 12:15:00 +03:00
15ddc24309 Merge branch 'develop' into bugfix/folder-header-menu 2021-10-20 13:27:14 +05:00
cee21c2df0
Merge pull request #403 from ONLYOFFICE/bugfix/get-fileops
file api: get file operation status 100 only if Result field is not null
2021-10-20 11:24:02 +03:00
f35ea7d172 Web: People: delete useless 2021-10-20 11:21:28 +03:00
Artem Tarasov
ba5bcda891 Web: Files: TilesView: fixed font and icon size 2021-10-20 10:57:30 +03:00
951593bbe4
Merge pull request #405 from ONLYOFFICE/bugfix/bug-53122
fixed bug 53122
2021-10-19 22:32:30 +03:00
191ddfabc4 fixed bug 53122 2021-10-19 21:34:09 +03:00
aa69a52272 fix test 2021-10-19 20:29:45 +03:00