|
|
e25759e4b6
|
Web: Files: Added re-render rows when is process restoring for disable rows.
|
2021-11-03 09:57:52 +03:00 |
|
|
|
9c8d0dae82
|
WEb: Files: Added variable size list for version history.
|
2021-11-03 09:57:51 +03:00 |
|
|
|
6cf7c6d43e
|
Web: Common: PageLayout: Refactoring, deleted useless code.
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
|
2021-11-03 09:57:51 +03:00 |
|
|
|
e2c435d3a6
|
Web: Files: Fixed styles for version history panel.
|
2021-11-03 09:57:12 +03:00 |
|
|
|
76b4251559
|
Web: Files: VersionHistoryPanel: Deleted body scroll? fixed styles.
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
|
2021-11-03 09:57:12 +03:00 |
|
|
|
77271fabe3
|
Web: Files: VersionHistory: Fixed styles for version history, added blocked interactions with version histories during restore.
# Conflicts:
# products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
|
2021-11-03 09:55:39 +03:00 |
|
|
|
44f2a1c17f
|
Web: Common: Fixed styles for body list without scroll.
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
|
2021-11-03 09:54:16 +03:00 |
|
|
|
21419325be
|
Web: Files: fixed updating the folder tree after upload
|
2021-11-02 15:42:49 +03:00 |
|
|
|
96d12d3afc
|
Web: Files: fixed updating the folder tree after upload
|
2021-11-02 15:26:43 +03:00 |
|
|
|
fc28c971c8
|
Web: Files: fixed upload folder hierarchy
|
2021-11-02 14:43:15 +03:00 |
|
|
|
5ba3df944c
|
Web: Files: fixed upload folder hierarchy
|
2021-11-02 14:21:45 +03:00 |
|
|
|
4e018d2d71
|
Web: Bump version to 1.0.1
|
2021-11-02 14:02:46 +03:00 |
|
|
|
93fae1580e
|
Web: Files: fixed files upload
|
2021-11-02 13:14:52 +03:00 |
|
|
|
a106c6ae1c
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-panel
|
2021-11-02 12:57:34 +03:00 |
|
|
|
b5c506b7a4
|
Web: Files: fix isUpdated sharing panel
|
2021-11-02 12:57:17 +03:00 |
|
|
|
fc93266964
|
Web: Files: fixed folder update after upload
|
2021-11-02 10:54:35 +03:00 |
|
|
|
b681b8225e
|
Files: added feature for remove elastic
|
2021-11-01 17:31:22 +03:00 |
|
|
|
89391ab385
|
Merge branch 'develop' into bugfix/tooltip
|
2021-11-01 15:02:25 +03:00 |
|
|
|
e6628c4963
|
Merge branch 'hotfix/v1.0.1' into feature/files-upload
|
2021-11-01 14:08:44 +03:00 |
|
|
|
8cc08045b7
|
Merge branch 'master' into develop
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-header.js
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
|
2021-11-01 13:54:40 +03:00 |
|
|
|
cf3c74c50f
|
Fixed Bug 53081. Fixed dragging thirdparty folder
|
2021-11-01 13:19:16 +03:00 |
|
|
|
3da81e5f16
|
Merge branch 'develop' into bugfix/tooltip
|
2021-10-31 18:35:22 +03:00 |
|
|
|
4243922078
|
Web: Client: EditingWrapperComponent: Fixed enter press event
|
2021-10-29 18:33:55 +03:00 |
|
|
|
508dcb4856
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-10-29 17:41:21 +03:00 |
|
|
|
c0f0e73d2c
|
Web: Client: EditingWrapperComponent: Fixed checking relatedTarget inside event on blur
|
2021-10-29 17:41:11 +03:00 |
|
|
|
1882f9db43
|
Fixed settings issue
|
2021-10-29 17:21:51 +03:00 |
|
|
|
795da675b7
|
fix Bug 53436
|
2021-10-29 16:37:51 +03:00 |
|
|
|
19252882ed
|
Web: Files: delete useless
|
2021-10-29 16:29:18 +03:00 |
|
|
|
34e163aac4
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/tooltip
|
2021-10-29 13:20:28 +03:00 |
|
|
|
26511d9fb7
|
Merge branch 'develop' into feature/webhooks
# Conflicts:
# ASC.Tests.sln
|
2021-10-29 13:18:57 +03:00 |
|
|
|
73a810fb43
|
Elastic: fixed files query
|
2021-10-28 20:02:22 +03:00 |
|
|
|
b30ae58185
|
Web: Files: fixed upload folder hierarchy
|
2021-10-28 16:44:46 +03:00 |
|
|
|
42dab36a34
|
Web: Files: fix set state
|
2021-10-28 16:36:58 +03:00 |
|
|
|
b72ef82341
|
Web: Files: fixed folder upload
|
2021-10-28 16:30:00 +03:00 |
|
|
|
d6336a0292
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-panel
|
2021-10-28 15:27:06 +03:00 |
|
|
|
de2be37d24
|
Web: Files: fix max width tooltip
|
2021-10-28 15:07:13 +03:00 |
|
|
|
1a404a3f0f
|
Fixed Bug-51497: Downloading of unsupported formats for viewing is carried out in the current tab.
|
2021-10-28 14:57:53 +03:00 |
|
|
|
0d6cacb1b7
|
Web: Files: fixed onBackToParentFolder
|
2021-10-28 13:50:04 +03:00 |
|
|
|
c16bfd98a4
|
Fix bug 53336: empty tab when sharing via email
|
2021-10-28 12:15:35 +03:00 |
|
|
|
a1d8a700c0
|
Web: Files: fixed Paging re-render
|
2021-10-28 12:11:53 +03:00 |
|
|
|
dcb8f108b8
|
Web: Files: fixed Paging re-render
|
2021-10-28 11:30:23 +03:00 |
|
|
|
6d62e54813
|
Web: Files: fixed files upload if filter is set
|
2021-10-28 10:57:15 +03:00 |
|
|
|
71ad551bb8
|
Web: Files: disable button on mobile panel
|
2021-10-27 21:35:46 +03:00 |
|
|
|
22e764b376
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-panel
|
2021-10-27 21:30:43 +03:00 |
|
|
|
361e6bccf5
|
Fix bug 53335: disable button in sharing panel
|
2021-10-27 21:30:27 +03:00 |
|
|
|
ca52c409c2
|
Web: Files: fixed folders upload
|
2021-10-27 20:41:54 +03:00 |
|
|
|
f923786cf4
|
Web: Files: fixed upload
|
2021-10-27 19:55:21 +03:00 |
|
|
|
0215599566
|
merge from develop
|
2021-10-27 19:37:12 +03:00 |
|
|
|
93545f04fa
|
Web: Files: fixed files upload
|
2021-10-27 19:16:06 +03:00 |
|
|
|
1a5e098c80
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-panel
|
2021-10-27 11:21:45 +03:00 |
|
|
|
0dbf4bca55
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53344
|
2021-10-27 11:17:31 +03:00 |
|
|
|
b7bf07cc92
|
Web: Files: fix clear selection
|
2021-10-27 11:16:52 +03:00 |
|
|
|
cece18f0e7
|
Merge branch 'release/1.0.0' into bugfix/icons-blur
|
2021-10-26 16:56:35 +03:00 |
|
|
|
f5d31dcff2
|
Web: Files: Fixed icons blur, added new icons
|
2021-10-26 16:55:52 +03:00 |
|
|
|
9128a3d0ff
|
Web: Files: Added docxf and oform format icons
|
2021-10-26 16:55:09 +03:00 |
|
|
|
cb8bc701ec
|
fix migrations
|
2021-10-26 16:14:40 +03:00 |
|
|
|
9d62a39ea7
|
Web: Files: reset selection on fetch
|
2021-10-26 16:14:04 +03:00 |
|
|
|
629d22b4cd
|
Web: Files: fix selection after delete
|
2021-10-26 15:57:25 +03:00 |
|
|
|
7745ec214b
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53344
|
2021-10-26 15:01:55 +03:00 |
|
|
|
51312c813f
|
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
|
2021-10-26 14:50:33 +03:00 |
|
|
|
9d0de00fac
|
Fix Bug 53332 - Client.Files. ‘Warning. Bad request’ on .fb2 sharing on personal
|
2021-10-26 14:50:25 +03:00 |
|
|
|
5a75cd893a
|
Fix bug 53344: file selection after restore
|
2021-10-26 13:21:51 +03:00 |
|
|
|
e29b8f5b0e
|
Merge branch 'release/1.0.0' into bugfix/Bug-53346
|
2021-10-26 11:00:17 +03:00 |
|
|
|
6f921f249f
|
Fixed Bug-53346: Added tree expansion when opening the folder where the file is located.
|
2021-10-26 10:59:34 +03:00 |
|
|
|
73cddf6da2
|
Fix bug 53337: open new tab via share twitter
|
2021-10-26 10:48:50 +03:00 |
|
|
|
b1134d239c
|
Merge branch 'develop' into feature/auto-migrations
# Conflicts:
# common/ASC.Core.Common/EF/Context/UserDbContext.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/MySqlAccountLinkContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/MySqlDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/MySqlFeedDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/MySqlMailDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20210803212546_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/MySqlMessagesContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/MySqlNotifyDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/MySqlResourceDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/MySqlTelegramDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/MySqlTenantDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210309095256_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210803213502_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/MySqlWebstudioDbContextModelSnapshot.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.Designer.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.Designer.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.Designer.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
|
2021-10-25 20:52:13 +03:00 |
|
|
|
e04190acc5
|
Merge pull request #425 from ONLYOFFICE/bugfix/redesign-sharing-panel-desktop
Bugfix/redesign sharing panel desktop
|
2021-10-25 20:19:00 +03:00 |
|
|
|
5ecd932939
|
Merge pull request #422 from ONLYOFFICE/bugfix/fix-file-creation
Web: Files: fixed files creation
|
2021-10-25 17:50:14 +03:00 |
|
|
|
0c5717a895
|
Web: Files: fixed onKeyUpUpdateItem
|
2021-10-25 17:44:56 +03:00 |
|
|
|
886944eb2e
|
Fixed Bug 53150 - Client.Files. Fixed creation of multiple folders
|
2021-10-25 17:17:12 +03:00 |
|
|
|
7739606140
|
Merge branch 'release/1.0.0' into bugfix/Bug51497
# Conflicts:
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
|
2021-10-25 16:58:34 +03:00 |
|
|
|
b756de0122
|
Web: Files: Added loading in the current tab from the loading panel.
|
2021-10-25 16:43:24 +03:00 |
|
|
|
884b812430
|
Fixed Bug-51497: Downloading of unsupported formats for viewing is carried out in the current tab.
|
2021-10-25 15:53:07 +03:00 |
|
|
|
b3747a92a4
|
Merge branch 'develop' into feature/wizard/migration
|
2021-10-25 14:54:05 +03:00 |
|
|
|
fc53f350cd
|
Web: Files: fixed getting playlist
|
2021-10-25 14:31:20 +03:00 |
|
|
|
403388fbf1
|
Added solution filter
Removed unused services
replaced sh with bat
start service from source
|
2021-10-25 14:29:36 +03:00 |
|
|
|
fa39817631
|
Fixed Bug 53333 - Client.Files. Fixed opening media files from upload panel
|
2021-10-25 14:25:51 +03:00 |
|
Artem Tarasov
|
12845ab89d
|
Web: Files: SharingPanel: fixed toggle button margin
|
2021-10-25 14:07:07 +03:00 |
|
|
|
f715d15473
|
Merge branch 'develop' into feature/net6
|
2021-10-25 14:03:31 +03:00 |
|
Artem Tarasov
|
275dc977d6
|
Web: Files: SharingPanel: fixed footer style
|
2021-10-25 13:49:42 +03:00 |
|
Artem Tarasov
|
cbd868ab36
|
Web: Files: SharingPanel: fixed body and rows style
|
2021-10-25 13:17:38 +03:00 |
|
|
|
ff4e73a54d
|
Files: update migrations
|
2021-10-22 20:11:03 +03:00 |
|
|
|
be2be3d47c
|
Web: Files: fixed files creation
|
2021-10-22 18:46:35 +03:00 |
|
|
|
3ae83ff00c
|
Web: Files: fixed TableRow background styles
|
2021-10-22 16:12:25 +03:00 |
|
|
|
e5e4a89e5b
|
Merge branch 'develop' into feature/net6
|
2021-10-22 16:10:37 +03:00 |
|
|
|
1e15174d23
|
Web: Files: fixed styles after merge
|
2021-10-22 15:01:43 +03:00 |
|
|
|
6d7f8574fe
|
net6: update packets
|
2021-10-22 13:28:48 +03:00 |
|
|
|
b73680260f
|
Merge branch 'release/1.0.0' into bugfix/section-header
|
2021-10-22 13:03:55 +03:00 |
|
|
|
c163576b8b
|
Web: Files: Fixed styles for section header for tablet/mobile view.
|
2021-10-22 13:03:17 +03:00 |
|
Artem Tarasov
|
2739a254fc
|
Web: Files: SharingPanel: fixed row height in SharingPanel
|
2021-10-22 12:51:54 +03:00 |
|
|
|
5bd9c06c1a
|
Merge branch 'develop' into table-group-menu
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-10-22 12:20:20 +03:00 |
|
|
|
dd8f77f827
|
Merge branch 'develop' into feature/wizard/migration
|
2021-10-22 11:44:21 +03:00 |
|
|
|
4f6477c85e
|
Fixed Bug 53276 - Client.Files.Download. Fixed download single files without conversion
|
2021-10-22 11:15:17 +03:00 |
|
|
|
1d49d85e23
|
Merge pull request #415 from ONLYOFFICE/bugfix/files-loader
Bugfix/files loader
|
2021-10-22 10:47:31 +03:00 |
|
|
|
522a55f02c
|
Web: Files: Fixed hiding context-menu before displaying share panel
|
2021-10-22 10:17:42 +03:00 |
|
|
|
bc0e35dc97
|
Web: Files: Added opportunity to open SharingPanel in module mode on personal desktop and tablet
|
2021-10-22 10:17:22 +03:00 |
|
|
|
3a33cf8d3a
|
Merge branch 'release/1.0.0' into bugfix/files-loader
|
2021-10-22 10:11:53 +03:00 |
|
|
|
a6a0ce4106
|
Web: Files: Fixed jumps of the filter loader.
|
2021-10-22 10:11:23 +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 |
|
|
|
e310d5e655
|
net6: httpClient: add using
|
2021-10-21 17:56:31 +03:00 |
|
|
|
556059437d
|
Web: Files: Fixed hiding context-menu before displaying share panel
|
2021-10-21 17:53:28 +03:00 |
|
|
|
f6f317ec42
|
net6: refactoring and bugfix
|
2021-10-21 16:23:26 +03:00 |
|
|
|
c2d0ff17d0
|
Merge branch 'develop' into table-group-menu
|
2021-10-21 15:34:57 +03:00 |
|
Artem Tarasov
|
d1baceb64f
|
Web: Files: TilesView: fixed position checkbox on mobile
|
2021-10-21 15:23:40 +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 |
|
|
|
0844c3491b
|
Merge branch 'develop' into table-group-menu
|
2021-10-21 12:34:28 +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 |
|
|
|
0a2e2d1ffc
|
Web: Files: fixed table container group menu styles
|
2021-10-20 10:58:25 +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 |
|
|
|
7d511385bc
|
removed unused references
|
2021-10-19 19:08:47 +03:00 |
|
|
|
01da3ea518
|
Files: fix
|
2021-10-19 18:37:23 +03:00 |
|
|
|
8422e1a555
|
file api: get file operation status 100 only if Result field is not null
|
2021-10-19 18:36:30 +03:00 |
|
|
|
5a47095182
|
fix
|
2021-10-19 18:34:59 +03:00 |
|
|
|
5a5e299d98
|
Merge branch 'develop' into feature/webhooks
# Conflicts:
# ASC.Web.sln
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
|
2021-10-19 18:30:59 +03:00 |
|
|
|
8ad7ebaba6
|
Web: Files: fix padding
|
2021-10-19 18:12:48 +03:00 |
|
|
|
1c7d4a9714
|
Web: Files: fix condition
|
2021-10-19 17:55:05 +03:00 |
|
|
|
f04a1a5403
|
Web: People: fixed table group menu, added new icons
|
2021-10-19 17:36:47 +03:00 |
|
|
|
017d3675a5
|
Files: removed unused code
|
2021-10-19 15:49:52 +03:00 |
|
|
|
30f089e9b7
|
Merge branch 'develop' into table-group-menu
|
2021-10-19 15:44:29 +03:00 |
|
|
|
3ea9f1ff20
|
Web: Files: delete useless
|
2021-10-19 15:42:03 +03:00 |
|
|
|
4e6593c080
|
Web: Files: fix storage download
|
2021-10-19 15:22:52 +03:00 |
|
|
|
0440f26bbc
|
Web: Files: replacing selection with buffer selection in folder menu
|
2021-10-19 16:17:49 +05:00 |
|
|
|
9735000d64
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/tile-view
|
2021-10-19 14:10:32 +03:00 |
|
|
|
5a3b7fdc6c
|
Web: Common: PageLayout: Refactoring, deleted useless code.
|
2021-10-19 13:58:55 +03:00 |
|
|
|
c7a1ef34c8
|
Web: Files: Fixed styles for version history panel.
|
2021-10-19 13:43:34 +03:00 |
|
|
|
b82dc5bf91
|
Web: Files: VersionHistoryPanel: Deleted body scroll? fixed styles.
|
2021-10-19 13:41:52 +03:00 |
|
|
|
9514fb2ce7
|
Web: Files: VersionHistory: Fixed styles for version history, added blocked interactions with version histories during restore.
|
2021-10-19 12:22:16 +03:00 |
|
|
|
30dc2623ba
|
Web: Common: Fixed styles for body list without scroll.
|
2021-10-19 12:18:07 +03:00 |
|
|
|
691cbf1d06
|
Web: Files: fix checkbox and icon align
|
2021-10-19 12:08:53 +03:00 |
|
|
|
d91ad66a67
|
Web: Files: added delete dialog when we delete a folder via the folder menu
|
2021-10-19 14:03:20 +05:00 |
|
|
|
d99dfecba3
|
Fixed Bug 53155: Cannot set properties of undefined (setting 'isFolder')
|
2021-10-19 11:51:06 +03:00 |
|
|
|
49f9798907
|
Web: Files: align checkbox on tile
|
2021-10-18 17:41:50 +03:00 |
|
|
|
f35787fea0
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/tile-view
|
2021-10-18 16:07:36 +03:00 |
|
|
|
36206576e8
|
Web: People: fixed table styles
|
2021-10-18 14:30:49 +03:00 |
|
|
|
b6461e46f4
|
net6: replacing System.Drawing with ImageSharp
|
2021-10-18 14:24:05 +03:00 |
|
|
|
0af3d7cc90
|
Merge pull request #399 from ONLYOFFICE/bugfix/bug-53106
fixed bug 53106
|
2021-10-18 14:19:46 +03:00 |
|
|
|
ed10d59870
|
Web: Files: fixed TableGroupMenu onChange
|
2021-10-18 14:16:56 +03:00 |
|
|
|
d6f1570fa2
|
fix Bug 53052
|
2021-10-18 14:07:48 +03:00 |
|
|
|
e8f535d710
|
Web: People: fixed table styles
|
2021-10-18 13:11:26 +03:00 |
|
|
|
0c63c41ef7
|
Web: Files: changed folder icons, added new icons
|
2021-10-18 12:24:01 +03:00 |
|
|
|
36b13211fa
|
Web: Components: fixed table styles, fixed table, refactoring
|
2021-10-18 12:22:33 +03:00 |
|
|
|
67179fd267
|
Merge branch 'release/1.0.0' into table-group-menu
|
2021-10-18 10:53:09 +03:00 |
|
|
|
4fc807590d
|
Web: Files: fixed the background for the selected element after a second click
|
2021-10-18 10:52:13 +03:00 |
|
|
|
f3796d1d56
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-10-18 10:36:06 +03:00 |
|
|
|
c9efdd20f4
|
Web: Files: added double click support for table view
|
2021-10-18 10:35:53 +03:00 |
|
|
|
351939b56e
|
Fix bug 53150: folder duplicate by Enter
|
2021-10-16 15:39:32 +03:00 |
|
|
|
c7a4096c0d
|
Web: Files: fix height selected tile
|
2021-10-16 15:32:45 +03:00 |
|
|
|
aafc615ade
|
Web: Files: fix tile select on mobile
|
2021-10-16 15:25:14 +03:00 |
|
|
|
e46ee43ec0
|
Web: Files: Added check of downloadFiles response
|
2021-10-15 22:31:32 +03:00 |
|
|
|
b5157877d3
|
Web: Files: Removed viewUrl from bulkDownload params
|
2021-10-15 22:27:30 +03:00 |
|
|
|
16b78b94cd
|
fixed bug 53106
|
2021-10-15 19:35:41 +03:00 |
|
|
|
a45cef0981
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug52986
|
2021-10-15 16:12:11 +03:00 |
|
|
|
1b701b9bb9
|
Web: Files: delete useless
|
2021-10-15 16:12:00 +03:00 |
|
|
|
de0d04d8b9
|
Web: Files: added iconUrl to restore and empty recycle bin operations
|
2021-10-15 14:35:06 +03:00 |
|
|
|
f06c435c6c
|
Fix Bug 53105: close delete dialog on press enter
|
2021-10-15 13:15:55 +03:00 |
|
|
|
c198e0e4ff
|
Web: Files: added a close condition when we want to copy the folder to the same place where it is
|
2021-10-15 13:15:03 +05:00 |
|
|
|
ff97e3134f
|
Web: Components: added new icons, created GroupMenuItem component
|
2021-10-14 18:18:08 +03:00 |
|
|
|
845f906028
|
Fix bug 53150: folder duplicate by Enter
|
2021-10-14 14:56:48 +03:00 |
|
|
|
e3718c3697
|
Merge branch 'release/1.0.0' into table-group-menu
# Conflicts:
# packages/asc-web-components/table-container/StyledTableContainer.js
|
2021-10-14 13:46:11 +03:00 |
|
|
|
6f25c3f668
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-10-14 13:10:03 +03:00 |
|
|
|
5005e0a6c0
|
Web: Icons: Fixed old checkbox icons, change header plus icon
|
2021-10-14 13:09:54 +03:00 |
|
|
|
3603b9d899
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-10-14 11:56:09 +03:00 |
|
|
|
eb48347dcf
|
Fixed Bug 53113 - Docs: You don't have enough permission to view/move the file
|
2021-10-14 11:56:02 +03:00 |
|
|
|
ddf8b26d6f
|
Fix Bug 53139: tile align
|
2021-10-14 11:49:24 +03:00 |
|
|
|
552744ca82
|
Fix bug 53118: tile selection
|
2021-10-13 17:17:07 +03:00 |
|
|
|
e36697c9df
|
Web: Files: TableGroupMenu moved to header
|
2021-10-13 16:04:49 +03:00 |
|
|
|
e389c4f57b
|
Fix bug 53107: upload row line height
|
2021-10-13 14:07:58 +03:00 |
|
|
|
8626a8ad8d
|
Web: Files: show error when downloading
|
2021-10-13 13:20:46 +03:00 |
|
|
|
735a9b60cf
|
net6: warning CA1416
also remove unnecessary usings
|
2021-10-13 11:07:03 +03:00 |
|
|
|
3bb46b6e16
|
Web: Files: Tiles: Fixed checkbox displaying logic at tile for folder
|
2021-10-12 16:00:58 +03:00 |
|
|
|
42fdb1eb11
|
Web: Files: Tiles: Fixed icon element width for mobile devices
|
2021-10-12 15:55:09 +03:00 |
|
|
|
7bd30497a9
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-10-12 15:44:24 +03:00 |
|
|
|
9330ed07d0
|
Web: Files: Tiles: Restored icons to 32px, fixed container size
|
2021-10-12 15:44:16 +03:00 |
|
|
|
bb2cac21d7
|
Fix bug 51706: missing icons
|
2021-10-12 15:38:05 +03:00 |
|
|
|
e59b4eedf1
|
Web: Files: Added limitation on the visible length of the folder name of select file component.
|
2021-10-12 15:27:06 +03:00 |
|
|
|
076805b7a0
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-10-12 15:14:08 +03:00 |
|
|
|
e5509572b2
|
Fixed Bug 53073 - Client.Files.Editor. Added showing scroll after building folder tree.
|
2021-10-12 15:13:00 +03:00 |
|
|
|
79b7c37736
|
rename Postgre to PostgreSql
|
2021-10-12 13:25:04 +03:00 |
|
|
|
ae9a3187bc
|
net6: warning SYSLIB0014
|
2021-10-12 13:14:33 +03:00 |
|
|
|
5164524d43
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-10-12 12:41:34 +03:00 |
|
|
|
d370435d5f
|
Web: Files: fixed icon size for tile
|
2021-10-12 12:41:20 +03:00 |
|
|
|
4c454c7ad1
|
Web: Files: fixed dragging thirdparty folder
|
2021-10-12 11:46:09 +03:00 |
|
|
|
4f0edbe593
|
fix Bug 52983
|
2021-10-12 10:24:51 +03:00 |
|
|
|
8ade3e157a
|
Fixed Bug 53077 - Client.Files.Editor.Added limitation on the visible length of the folder name.
|
2021-10-12 08:44:14 +03:00 |
|
|
|
14ce87cead
|
Web: Files: Fixed width of row selection for Safari for macOS.
|
2021-10-11 18:43:06 +03:00 |
|
|
|
c186df6438
|
Merge branch 'release/1.0.0' into bugfix/Bug53028
|
2021-10-11 17:20:07 +03:00 |
|
|
|
1d0b36a7e9
|
Fixed Bug 53028 - Fixed border styles for Safari macOS.
|
2021-10-11 16:58:22 +03:00 |
|
|
|
2c08df99cf
|
Web: Files: Tiles: Fixed icon displaying for editing and creating new items
|
2021-10-11 16:11:27 +03:00 |
|
|
|
83227d1499
|
Web: Files: Store: Fixed default icon size for tile view
|
2021-10-11 16:08:27 +03:00 |
|
|
|
dd3b65114c
|
Merge pull request #391 from ONLYOFFICE/bugfix/Bug-52897
Bugfix/bug 52897
|
2021-10-11 13:24:23 +03:00 |
|
|
|
23bcd92528
|
Web: Files: added reset buffer selection
|
2021-10-11 12:09:13 +03:00 |
|
|
|
8cf7d046e4
|
Web: Files: fixed selectbox
|
2021-10-11 12:00:41 +03:00 |
|
|
|
e39f39fce5
|
Web: Files: fixed selection
|
2021-10-11 11:07:29 +03:00 |
|
|
|
8b9dd7fbb4
|
Web: Files: HOC: Added item icon element for editing state (Table view), paste default if property undefined
|
2021-10-10 23:30:59 +03:00 |
|
|
|
b1714defe9
|
Files: fix sync convert
|
2021-10-08 20:04:15 +03:00 |
|
|
|
916f7cfdf2
|
Fixed Bug 53011 - Client.Files.Version history: Disabled click on restore link when is restoring process.
|
2021-10-08 18:03:46 +03:00 |
|
|
|
b2eba16548
|
Web: Files: added selection to tile and row
|
2021-10-08 11:27:04 +03:00 |
|
|
|
9feceaf67b
|
Web: Files: fixed selection when clicking on the context menu
|
2021-10-07 19:55:07 +03:00 |
|
|
|
0a8fb2d55c
|
Web: Files: added row selection
|
2021-10-07 19:42:49 +03:00 |
|
|
|
afa804ed35
|
Merge branch 'release/1.0.0' into bugfix/Bug-52897
# Conflicts:
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
|
2021-10-07 19:20:15 +03:00 |
|
|
|
31570e57d7
|
Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row
|
2021-10-07 17:47:54 +03:00 |
|
|
|
335c580d78
|
Web: Dev: Downgrade lerna to v3.22.1 and update webpack-dev-server and webpack-cli (yarn start + Ctrl-C stop issue)
|
2021-10-07 17:32:32 +03:00 |
|
|
|
a6573d9f98
|
Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row
|
2021-10-07 15:59:50 +03:00 |
|
|
|
09406a3640
|
Fixed Bug 52993 - Added title with file extension.
|
2021-10-07 15:30:53 +03:00 |
|
|
|
c0deac1eb6
|
Files: startedit. fix empty body
|
2021-10-06 22:43:28 +03:00 |
|
|
|
deffb0c901
|
Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row
|
2021-10-06 21:01:53 +03:00 |
|
|
|
b656659942
|
Web: Fix naming
|
2021-10-06 20:54:09 +03:00 |
|
|
|
c99313d0ae
|
Web: Added homepage and combineUrl to checkProtocol
|
2021-10-06 20:53:40 +03:00 |
|
|
|
5dbf54c2b3
|
Web: Fix open '/Products/Files' and '/Products/Files/?desktop=true' (desktop provider 'onlyoffice' issue)
|
2021-10-06 20:52:22 +03:00 |
|
|
|
fcffb01e78
|
File: fileHandler download now returns 302 status
|
2021-10-06 16:14:09 +03:00 |
|
|
|
36c25c8278
|
Web: fixed media query
|
2021-10-06 15:44:39 +03:00 |
|
|
|
cfb8174772
|
fix Bug 52655
|
2021-10-06 15:32:03 +03:00 |
|
|
|
a33d49f356
|
Web: Files: fixed icons, fixed styles
|
2021-10-06 15:23:12 +03:00 |
|
|
|
f87b71f2e5
|
Web: Files: fixed header icons, fixed styles
|
2021-10-06 15:02:56 +03:00 |
|
|
|
596ff52ed4
|
Merge pull request #376 from ONLYOFFICE/bugfix/profile-form-validation
Bugfix/profile form validation
|
2021-10-06 13:58:03 +03:00 |
|
|
|
d84f24ea15
|
Fix bug 52937: desktop download link
|
2021-10-06 13:52:56 +03:00 |
|
|
|
e734f222f5
|
Merge branch 'release/1.0.0' into bugfix/profile-form-validation
|
2021-10-06 13:32:50 +03:00 |
|
|
|
e686c2814e
|
Bug 52975 - Client.Files.Download. Added closing the download dialog
|
2021-10-06 13:13:10 +03:00 |
|
|
|
55cb1e875e
|
Web: fixed header height
|
2021-10-06 12:22:28 +03:00 |
|
|
|
6902180804
|
Web: Files: Fixed button color according to layouts.
|
2021-10-06 12:17:34 +03:00 |
|
|
|
1cbea0fcfc
|
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
|
2021-10-06 12:04:32 +03:00 |
|
|
|
57e050ba92
|
Web: Desktop: Changed provider to "onlyoffice" and renamed guid to cryptoEngineId
|
2021-10-06 11:26:06 +03:00 |
|
|
|
66e2fc8663
|
Web: Refactoring.
|
2021-10-06 11:04:29 +03:00 |
|
|
|
7f8458a4f5
|
Web: Files: Added RegExp from constants.
|
2021-10-06 10:37:16 +03:00 |
|
|
|
2cbac71368
|
Merge branch 'release/1.0.0' into bugfix/profile-form-validation
|
2021-10-06 10:29:19 +03:00 |
|
|
|
4c3e48e522
|
Fixed Bug 52892. Added validation for folder name.
|
2021-10-06 10:12:20 +03:00 |
|
|
|
d3ccf56d60
|
Merge branch 'release/1.0.0' into bugfix/profile-form-validation
|
2021-10-06 09:21:09 +03:00 |
|
|
|
1513a42a6a
|
fix Bug 52655
|
2021-10-05 18:20:29 +03:00 |
|
|
|
09326e04c6
|
Merge branch 'release/1.0.0' into bugfix/profile-form-validation
|
2021-10-05 18:15:21 +03:00 |
|
|
|
15b475677f
|
Web: Added RegExp constant for checking folder name.
|
2021-10-05 17:45:33 +03:00 |
|
|
|
1c48a111b4
|
Bug 52866 - Client.YDisk.Upload.
|
2021-10-05 17:00:07 +03:00 |
|
|
|
3262e9f767
|
Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row
|
2021-10-05 13:01:43 +03:00 |
|
|
|
2ae932ebbd
|
Merge pull request #374 from ONLYOFFICE/bugfix/Bug-52940
Fixed Bug 52940 - Client.Files. Fixed display of the "download as" bu…
|
2021-10-05 12:44:37 +03:00 |
|
|
|
d0229aa17f
|
Merge pull request #370 from ONLYOFFICE/bugfix/fix-operations-notifications
Bugfix/fix operations notifications
|
2021-10-05 12:32:39 +03:00 |
|
|
|
4f9fddf794
|
Merge pull request #373 from ONLYOFFICE/feature/debug-info
Feature/debug info
|
2021-10-05 12:31:20 +03:00 |
|
|
|
0f59548066
|
Merge pull request #365 from ONLYOFFICE/bugfix/Bug52644
Fix bug 52644: fixed download screen in ios pwa
|
2021-10-05 12:28:01 +03:00 |
|
|
|
3eea8beea0
|
Web: Files: fixed row selection
|
2021-10-05 12:14:21 +03:00 |
|
|
|
17515d760a
|
Fixed Bug 52940 - Client.Files. Fixed display of the "download as" button in the context menu
|
2021-10-05 10:41:15 +03:00 |
|
|
|
7a72a9f80d
|
Merge branch 'release/1.0.0' into feature/debug-info
|
2021-10-05 09:58:24 +03:00 |
|
|
|
6e926eceb9
|
Web: Removed browserslist (loading bundle issues)
|
2021-10-05 09:48:08 +03:00 |
|
|
|
e727138aae
|
fix Bug 52926
|
2021-10-04 20:37:28 +03:00 |
|
|
|
f0d6e9a87a
|
Web: Files: fixed updated date
|
2021-10-04 17:51:15 +03:00 |
|
|
|
cee2e96e79
|
Merge branch 'release/1.0.0' into bugfix/fix-operations-notifications
|
2021-10-04 17:02:42 +03:00 |
|
|
|
645f0aac04
|
Fixed Bug 50655 - Docs.Clouds. Cannot read properties of undefined
|
2021-10-04 15:42:38 +03:00 |
|
|
|
515502cc79
|
Fix bug 52901: fix typo
|
2021-10-04 11:03:23 +03:00 |
|
|
|
32e63d9c52
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug52644
|
2021-10-04 11:00:30 +03:00 |
|
|
|
22782982ba
|
fix Bug 52860
|
2021-10-03 23:54:37 +03:00 |
|
|
|
815f75363a
|
Web: Files: fixed operations toasts
|
2021-10-03 15:25:22 +03:00 |
|
|
|
822aba4713
|
Web: Files: fixed download action
|
2021-10-03 14:47:28 +03:00 |
|
|
|
cfe4963cad
|
Web: Files: fixed EmptyTrashDialog
|
2021-10-03 13:24:40 +03:00 |
|
|
|
1896f6604d
|
Web: Files: fixed markAsRead
|
2021-10-02 16:18:55 +03:00 |
|
|
|
341277df89
|
Web: Files: fixed deleteItemAction func, refactoring
|
2021-10-02 16:12:52 +03:00 |
|
|
|
0d3660518b
|
Web: Files: fixed deleteAction func, refactoring
|
2021-10-02 15:32:14 +03:00 |
|
Artem Tarasov
|
ff17eee038
|
Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row
|
2021-10-01 18:56:07 +03:00 |
|
Artem Tarasov
|
1142d67903
|
Web: Files: TilesView: style fix
|
2021-10-01 18:54:59 +03:00 |
|
|
|
ddae8125b0
|
Web: Client: Files: restored key property for webdav connections
|
2021-10-01 18:29:00 +03:00 |
|
|
|
6579ee6547
|
Web: Files: fixed Url field for webdav connection
|
2021-10-01 18:11:15 +03:00 |
|
Artem Tarasov
|
ade675d404
|
Web: Files: TilesView: added icon for folderTile, hidden checkbox and icon when creating item
|
2021-10-01 18:07:52 +03:00 |
|
Artem Tarasov
|
7b77aa3ade
|
Web: Files: RowsView: fixed selected and dragging styles
|
2021-10-01 17:44:46 +03:00 |
|
|
|
7e2d4f0657
|
Merge pull request #366 from ONLYOFFICE/bugfix/fixed-selected-items-operations
Bugfix/fixed selected items operations
|
2021-10-01 17:39:38 +03:00 |
|
|
|
1df1e12e59
|
Merge pull request #367 from ONLYOFFICE/bugfix/fixed-table-share-icon
Bugfix/fixed table share icon
|
2021-10-01 17:38:21 +03:00 |
|
|
|
486efa8276
|
Web: Client: Files: Removed unused property from DateCell component
|
2021-10-01 17:29:01 +03:00 |
|
|
|
0904538f39
|
Web: Client: Files: Added displaying created and updated date for view types
|
2021-10-01 17:12:41 +03:00 |
|
|
|
cf8fec4c15
|
Web: Files: added pulling out setBufferSelection of props
|
2021-10-01 19:09:44 +05:00 |
|
|
|
e407a66dc1
|
Merge branch 'develop' into bugfix/folder-header-menu
|
2021-10-01 19:01:45 +05:00 |
|
|
|
1738c9c2f9
|
Web: Files: added share, delete and internal link in header folder
|
2021-10-01 18:54:23 +05:00 |
|
Artem Tarasov
|
0a4b0d8e6a
|
Files: TableView: TableRow: fixed selected and dragging styles
|
2021-10-01 15:31:04 +03:00 |
|
|
|
1727201852
|
Fixed Bug 52888 - Client.Files. Fixed share button size
|
2021-10-01 15:19:14 +03:00 |
|
|
|
dd7a504e06
|
Files: refactoring
|
2021-10-01 14:01:44 +03:00 |
|
|
|
6b326e8e27
|
Web: Files: fixed bufferSelection item
|
2021-10-01 13:29:46 +03:00 |
|
|
|
0f833ae1de
|
net6: warning SYSLIB0020
|
2021-10-01 13:26:36 +03:00 |
|
|
|
dcf16ec0f2
|
Web: Files: fixed ChangeOwnerPanel
|
2021-10-01 13:09:50 +03:00 |
|
|
|
8edd95ad71
|
Web: Files: fixed operations for selected files
|
2021-10-01 11:58:26 +03:00 |
|
Artem Tarasov
|
4a6738f898
|
Web: Common/Components/Files: deleted unnecessary code, refactoring
|
2021-10-01 11:05:03 +03:00 |
|
|
|
e5c5eac837
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-10-01 11:04:33 +03:00 |
|
|
|
53c77f5214
|
Files: fix startedit
|
2021-10-01 11:04:19 +03:00 |
|
|
|
11cf304fc2
|
Web: Files: fixed default value for bufferSelection
|
2021-10-01 11:03:52 +03:00 |
|
|
|
d9ebd6a61b
|
Fix bug 52644: fixed download screen in ios pwa
|
2021-10-01 00:23:14 +03:00 |
|
|
|
24224a7437
|
Files: fix rename folders. fix favorites
|
2021-09-30 21:26:01 +03:00 |
|
|
|
5f0fe2f205
|
Merge branch 'develop' into feature/disable-selection-for-context-menu
|
2021-09-30 19:37:13 +03:00 |
|
|
|
bc48760294
|
Merge branch 'release/1.0.0' into develop
|
2021-09-30 19:36:18 +03:00 |
|
|
|
73c6409b83
|
Web: Client: Files: Added "en" Yandex disk icon
|
2021-09-30 17:52:43 +03:00 |
|
|
|
b51cf18617
|
Web: Files: renamed tempSelection to bufferSelection
|
2021-09-30 17:46:16 +03:00 |
|
|
|
fe4f892e9f
|
Merge branch 'release/1.0.0' into bugfix/webdav-reconnect
|
2021-09-30 17:09:41 +03:00 |
|
|
|
446e10e153
|
Web: Client: Files:
Fixed input focus issue.
Fixed open reconnect for providers.
Fixed open connected folder inside clouds window.
|
2021-09-30 17:08:57 +03:00 |
|
Artem Tarasov
|
fe3459a0ba
|
Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row
|
2021-09-30 16:27:51 +03:00 |
|
Artem Tarasov
|
a75745aaaf
|
Web: Components/Files: fixed selection styles for table
|
2021-09-30 16:27:01 +03:00 |
|
|
|
f08c1fc4f0
|
fix build
|
2021-09-30 15:50:45 +03:00 |
|
|
|
8a3cb45e77
|
Merge branch 'develop' into feature/disable-selection-for-context-menu
|
2021-09-30 15:33:11 +03:00 |
|
|
|
fd1cdb0217
|
Web: Files: disabled item selection when clicking the context menu
|
2021-09-30 15:26:20 +03:00 |
|
|
|
ae8d1f6725
|
Web: Files: added tempSelection observable field
|
2021-09-30 15:25:13 +03:00 |
|
Sergey Kirichenko
|
dbc174e955
|
Add support to deb package (#266)
|
2021-09-30 15:05:43 +03:00 |
|
|
|
49b61f92b6
|
Merge pull request #358 from ONLYOFFICE/bugfix/fix-bug-52839
Web: Client: Files: Added kDrive, WebDav and Yandex clouds icons for …
|
2021-09-30 12:32:38 +03:00 |
|
|
|
2e80f8c30a
|
fix Bug 52679
|
2021-09-30 12:21:48 +03:00 |
|
|
|
ebcb6c93ea
|
Web: Client: Files: Added kDrive, WebDav and Yandex clouds icons for tree menu
|
2021-09-30 12:13:52 +03:00 |
|
|
|
88e0392289
|
Merge pull request #352 from ONLYOFFICE/bugfix/fixed-tree-menu-folding
Web: Files: fixed tree folding if request timed out
|
2021-09-30 11:51:50 +03:00 |
|
Artem Tarasov
|
94140528d3
|
Web: Files: TilesView: fixed hover styles of icon/checkbox
|
2021-09-30 11:08:10 +03:00 |
|
Artem Tarasov
|
8382581ff1
|
Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row
|
2021-09-30 10:59:20 +03:00 |
|
Artem Tarasov
|
e64a7f07de
|
Web: Common/Components/Files: fixed styles when selecting row
|
2021-09-30 10:55:26 +03:00 |
|
|
|
f6d7517afd
|
Web: Files: Fix Bug 52832 - Docs. Desktop. Creating or opening a document from an application results in opening in a browser
|
2021-09-30 10:46:11 +03:00 |
|
|
|
9d76069ec8
|
fix Bug 52666
|
2021-09-30 09:52:46 +03:00 |
|
|
|
1bc64ce5ae
|
Files: check state before get stream
|
2021-09-30 09:51:38 +03:00 |
|
|
|
19bf04e461
|
fix Bug 52768
|
2021-09-29 19:08:30 +03:00 |
|
|
|
3213632148
|
Merge pull request #355 from ONLYOFFICE/bugfix/Bug52840
Bugfix/bug52840
|
2021-09-29 17:50:20 +03:00 |
|
|
|
057e2d7bec
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug52840
|
2021-09-29 17:11:43 +03:00 |
|
|
|
e46d383196
|
Fix bug 52840: hide delete button in preview mode
|
2021-09-29 17:05:42 +03:00 |
|
|
|
8831bf6614
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/tiles
|
2021-09-29 16:59:51 +03:00 |
|
|
|
3a1f0c31ec
|
Files: Fix regDesktop of undefined
|
2021-09-29 16:56:48 +03:00 |
|
|
|
a61effd5b6
|
Web: Files: fixed tile view on mobile/tablet
|
2021-09-29 16:49:00 +03:00 |
|
|
|
fba2abd327
|
Web: Files: select tile on click
|
2021-09-29 16:26:27 +03:00 |
|
|
|
013138c466
|
Web: Files: fixed folder open from context menu
|
2021-09-29 16:25:54 +03:00 |
|
|
|
cea85e82a9
|
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-29 15:03:04 +03:00 |
|
|
|
e4fa7cf5fd
|
Fix Bug 52834 - Docs. Desktop: regDesktop not calling when isEncryption equals false (personal mode issue)
|
2021-09-29 15:02:54 +03:00 |
|
|
|
a60d1d96c7
|
Web: Files: fixed tree folding if request timed out
|
2021-09-29 13:51:32 +03:00 |
|
|
|
82e25852ad
|
Files: fix get file info
|
2021-09-29 13:17:32 +03:00 |
|
|
|
9f4e2cc69e
|
Files: fixed index queries
|
2021-09-29 12:56:32 +03:00 |
|
|
|
1f9116d322
|
Files: fix thirdparty
|
2021-09-28 18:12:06 +03:00 |
|
|
|
410b61f796
|
Web: Files: fixed url for desktop editors
|
2021-09-28 16:17:34 +03:00 |
|
|
|
41b9869def
|
Web: Files: added move, copy and download actions in folder header menu
|
2021-09-28 17:46:35 +05:00 |
|
|
|
90a1b71d7b
|
Merge branch 'release/1.0.0' into feature/move-check
|
2021-09-28 11:59:53 +03:00 |
|
|
|
dbdf84d0b9
|
Files: fix remove or copy
|
2021-09-28 11:58:19 +03:00 |
|
|
|
39a1d433da
|
Files: MoveOrCopyBatchCheckFromBody is now GET
|
2021-09-28 11:57:03 +03:00 |
|
|
|
acded72c12
|
Files: fix upload files
|
2021-09-27 22:28:49 +03:00 |
|
|
|
01929aa943
|
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-27 16:04:50 +03:00 |
|
|
|
6591080403
|
Fix Bug 52797 with unsupported browsers. Added new packages/browserslist-config-asc with browserlist.config.js
|
2021-09-27 16:04:37 +03:00 |
|
|
|
e7d6eadf2a
|
Fixed Bug 52785 - Android.Docs.Mobile. Fixed onMouseDown event
|
2021-09-27 14:02:36 +03:00 |
|
|
|
cbd50439e4
|
Web: Files: fixed drag for mobile devices
|
2021-09-27 12:13:14 +03:00 |
|
|
|
790d696a58
|
Web: Files: fixed view for mobile devices
|
2021-09-27 11:53:22 +03:00 |
|
|
|
bab3425bd1
|
Files: fix string ids
|
2021-09-24 21:40:29 +03:00 |
|
|
|
4531d38e6f
|
Web: Removed duplicates
|
2021-09-24 21:18:50 +03:00 |
|
|
|
2aebbe0bb5
|
Web: Files: fixed moveTo operation
|
2021-09-24 16:48:53 +03:00 |
|
|
|
ded321d9eb
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-24 15:57:48 +03:00 |
|
|
|
f137fc5d46
|
Fixed Bug 52756 - Client.Files. Fixed DnD when opening files/folders
|
2021-09-24 15:57:41 +03:00 |
|
|
|
ea589789d3
|
fix Bug 50655
|
2021-09-24 15:47:27 +03:00 |
|
|
|
877c242dba
|
Web: Files: fixed cbMenuItems
|
2021-09-24 14:27:51 +03:00 |
|
|
|
b42e137f10
|
Web: Files: fixed error log
|
2021-09-24 13:47:21 +03:00 |
|
|
|
c1c1517a1e
|
Web: Files: fixed moveTo/copyTo operations
|
2021-09-24 13:39:07 +03:00 |
|
|
|
b9f203955b
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-24 10:55:53 +03:00 |
|
|
|
06dda4229a
|
fix Bug 52608
|
2021-09-23 21:48:52 +03:00 |
|
|
|
315665e87a
|
BuildAndDeploy
|
2021-09-23 20:58:39 +03:00 |
|
|
|
dd8fec1a86
|
Fix bug 52310: open files from upload panel
|
2021-09-23 05:43:15 +03:00 |
|
|
|
227937728d
|
Fix Bug 52730 - Client.Files.Image/Media. Fixed download for MediaViewer
|
2021-09-22 19:16:30 +03:00 |
|
|
|
6e016945d7
|
Fixed Bug 52727 - Client.Files. Disabled drag for trash folder
|
2021-09-22 18:55:37 +03:00 |
|
|
|
2d8dde7632
|
Web: Files: fix toastr
|
2021-09-22 13:52:01 +03:00 |
|
|
|
c0a5a9f532
|
Web: Files: fixed toast in empty trash
|
2021-09-21 15:07:34 +03:00 |
|
|
|
3f2e615ad3
|
Web: Files: fixed link copied toast
|
2021-09-21 14:52:16 +03:00 |
|
|
|
7549ba691c
|
fix Bug 52632
fix Bug 52631
|
2021-09-20 20:04:54 +03:00 |
|
|
|
225258eec0
|
Merge branch 'develop' into feature/header-menu-items
# Conflicts:
# products/ASC.Files/Client/src/store/FilesActionsStore.js
|
2021-09-20 15:24:31 +03:00 |
|
|
|
c22c337b9a
|
WEb: Files: Removed deleted option when the user selects files one of which does not have permission to delete.
|
2021-09-20 15:17:38 +03:00 |
|
|
|
42f6216149
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
|
2021-09-20 15:17:21 +03:00 |
|
|
|
477ed8d76f
|
Web: Files: Added Restore option for Recycle Bin folder.
|
2021-09-20 15:09:50 +03:00 |
|
|
|
a57b25c8e2
|
Web: Files: Fixed options for Privacy folder.
|
2021-09-20 15:08:34 +03:00 |
|
|
|
2933267f7f
|
Web: Files: Added "Removed from list" for share folder.
|
2021-09-20 14:59:27 +03:00 |
|
|
|
0a5a081a28
|
Web: Files: Removed possibility to delete in Common folder when user is not admin of files module.
|
2021-09-20 14:55:38 +03:00 |
|
|
|
238eb7aa40
|
Web: Files: Fixed conditions.
|
2021-09-20 14:06:55 +03:00 |
|
|
|
ebd36bb201
|
Web: Files: Fixed showing options.
|
2021-09-20 12:46:05 +03:00 |
|
|
|
56b92fb173
|
Merge branch 'feature/header-menu-items' of github.com:ONLYOFFICE/AppServer into feature/header-menu-items
|
2021-09-20 11:55:47 +03:00 |
|
|
|
fe4e1dbfb0
|
Web: Files: Renamed function.
|
2021-09-20 11:55:28 +03:00 |
|
|
|
77355533dd
|
Merge branch 'develop' into feature/header-menu-items
|
2021-09-20 11:16:56 +03:00 |
|
|
|
90a9575c26
|
Merge pull request #340 from ONLYOFFICE/bugfix/open-media-history-version
Bugfix/open media history version
|
2021-09-20 10:24:19 +03:00 |
|
|
|
8b46721228
|
Web: Files: Refactoring.
|
2021-09-20 08:57:26 +03:00 |
|
|
|
3c5d896da6
|
Web: Refactoring.
|
2021-09-20 08:24:12 +03:00 |
|
|
|
6a87a3152a
|
Web: Files: Removed options not available for interaction for the header menu.
|
2021-09-17 19:35:24 +03:00 |
|
|
|
021ab20fed
|
fix tests
|
2021-09-17 18:28:50 +03:00 |
|
|
|
69b9692ba7
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-17 15:37:14 +03:00 |
|
|
|
73327994b0
|
Fix bug 52478: Client.Files: Open location in context menu
|
2021-09-17 15:36:35 +03:00 |
|
|
|
f5a73c66d6
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-17 15:14:41 +03:00 |
|
|
|
19b82b1ed3
|
Web: Returned old solution with disabled context menu item.
|
2021-09-17 15:14:11 +03:00 |
|
|
|
98a3696817
|
Web: Files: fix
|
2021-09-17 15:11:33 +03:00 |
|
|
|
f8848acb20
|
Fix bug 52618: folder open location
|
2021-09-17 15:08:40 +03:00 |
|
|
|
c6573c5e26
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-17 15:02:02 +03:00 |
|
|
|
463ffa9d2e
|
Web: Files: delete separator
|
2021-09-17 15:01:56 +03:00 |
|
|
|
e22d88fc3d
|
Web: Files: Deleted useless console.log.
|
2021-09-17 14:19:54 +03:00 |
|
|
|
13f4b9d5dd
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-17 14:09:49 +03:00 |
|
|
|
d47d33f34a
|
Fix Bug 52609- Docs.Mobile. Version history does not open when called from the context menu.
|
2021-09-17 14:09:34 +03:00 |
|
|
|
b49156bcf5
|
Web: Files: moved cbMenuItems to store, removed unnecessary elements from the header
|
2021-09-17 13:03:46 +03:00 |
|
|
|
9e7aea85de
|
Web: Files: added isImage function to MediaViewersFormatsStore
|
2021-09-17 13:00:41 +03:00 |
|
|
|
f28deed1a7
|
fix Bug 52608
|
2021-09-17 12:43:52 +03:00 |
|
|
|
d58a1a9860
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-17 11:10:34 +03:00 |
|
|
|
9c67085ee5
|
Web: Files: Deleted useless console.log.
|
2021-09-17 11:10:25 +03:00 |
|
|
|
4d85d8e3e6
|
Web: Files: Fixed the font of the text when creating the document.
|
2021-09-17 11:09:25 +03:00 |
|
|
|
90498e5520
|
Web: Files: fixed setNewBadgeCount import
|
2021-09-17 11:00:51 +03:00 |
|
|
|
d3ba218321
|
Web: Files: Added highlighting of links with file types for mobile devices in the conversion dialog.
|
2021-09-17 10:36:25 +03:00 |
|
|
|
30a2718e97
|
Web: Files: Added the ability to open the option to Share in Favorites and Recent folders.
|
2021-09-17 09:49:12 +03:00 |
|
|
|
a96b66569a
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-16 19:07:38 +03:00 |
|
|
|
46f83fd3a1
|
Web: Files: fix: Clicking on the ellipsis opens a list of connections.
|
2021-09-16 19:05:14 +03:00 |
|
|
|
fc7da14976
|
fix Bug 52590
|
2021-09-16 18:50:03 +03:00 |
|
|
|
81154bd2dd
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-16 15:27:01 +03:00 |
|
|
|
0de6dd9df0
|
Web: Files: fixed files re-render
|
2021-09-16 15:26:50 +03:00 |
|
|
|
c241d60ca2
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-16 15:16:24 +03:00 |
|
|
|
0d3b9bb7b7
|
Web: Files: add custom cursor
|
2021-09-16 15:16:14 +03:00 |
|
|
|
ac58470a1b
|
fix Bug 52594
|
2021-09-16 14:49:44 +03:00 |
|
|
|
c8d55d40ea
|
Web: Files: change media preview route
|
2021-09-16 16:27:34 +05:00 |
|
|
|
2d1f27bbab
|
Merge branch 'release/1.0.0' into bugfix/open-media-history-version
|
2021-09-16 16:24:10 +05:00 |
|
|
|
fe8c8799a3
|
Web: Files: Fixed bug 52596, сhanged url address of media files to open correctly in version history
|
2021-09-16 16:23:26 +05:00 |
|
|
|
d20b3f8322
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-16 14:20:36 +03:00 |
|
|
|
7fda0356ad
|
Web: files: Fixed so that the link, when disabled, displays the default sharing settings.
|
2021-09-16 14:20:26 +03:00 |
|
|
|
912ccb3540
|
Web: Files: fixed class name
|
2021-09-16 14:12:42 +03:00 |
|
|
|
8fbf96c89d
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-16 13:44:11 +03:00 |
|
|
|
f2dd335c72
|
Web: Files: fixed cursor
|
2021-09-16 13:43:49 +03:00 |
|
|
|
33cb69437c
|
Web: Files: rewrite fill on class
|
2021-09-16 13:43:34 +03:00 |
|
|
|
4a07df8411
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-16 13:03:38 +03:00 |
|
|
|
6266ab98ac
|
Web: Files: Replacing numbers with constants.
|
2021-09-16 13:03:32 +03:00 |
|
|
|
a8a5510b94
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-16 13:03:27 +03:00 |
|
|
|
d55ab622cc
|
Web: Files: fixed setNewBadgeCount
|
2021-09-16 13:03:22 +03:00 |
|
|
|
95c773e28e
|
Web: Files: fixed cursor
|
2021-09-16 13:01:46 +03:00 |
|
|
|
09e260d259
|
Web: Files: add fill select row
|
2021-09-16 12:55:34 +03:00 |
|
|
|
149799073d
|
Fix bug 52478: Client.Files: Open location in context menu
|
2021-09-16 12:28:27 +03:00 |
|
|
|
5a5d33ed23
|
Fixed Bug 52588 - Client.Clouds.WebDav. Added URL field
|
2021-09-16 11:57:34 +03:00 |
|
|
|
d4d405df0b
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-16 11:34:44 +03:00 |
|
|
|
61cce5ffa1
|
Web: Files: Home: fixed fetchFiles
|
2021-09-16 11:34:39 +03:00 |
|
|
|
2849361259
|
Web: Files: added tables settings for each user
|
2021-09-16 11:32:52 +03:00 |
|
|
|
743f5f8a21
|
Fixed Bugs 51981, 51982 - Client.Sort. Added user filter to storage
|
2021-09-16 11:27:25 +03:00 |
|
|
|
bda448b222
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-16 10:11:51 +03:00 |
|
|
|
a1a819a3fa
|
Fix Bug: Inaccessible items should not be displayed in the checkbox of the menu.
|
2021-09-16 10:11:44 +03:00 |
|
|
|
b88a6f5ddf
|
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-15 15:56:28 +03:00 |
|
|
|
ea4fa97838
|
Merge branch 'develop' into feature/wizard/migration
# Conflicts:
# ASC.Tests.sln
# common/ASC.Core.Common/EF/Model/Tenant/DbQuota.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/Tests/ASC.Common.Tests/ASC.Common.Tests.csproj
# common/Tests/ASC.Core.Common.Tests/ASC.Core.Common.Tests.csproj
# common/Tests/ASC.Notify.Textile.Tests/ASC.Notify.Textile.Tests.csproj
|
2021-09-15 15:52:13 +03:00 |
|
|
|
1ca554f82d
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# packages/asc-web-components/campaigns-banner/index.js
# web/ASC.Web.Client/src/Shell.jsx
|
2021-09-15 14:45:33 +03:00 |
|
|
|
b66a05769a
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-15 14:38:49 +03:00 |
|
|
|
9cd7b8d66c
|
Fix bug 52569: Client.Files: lock badge in trash
|
2021-09-15 14:37:46 +03:00 |
|
|
|
d4c8c2bc56
|
Fix bug 52565: Client.Files: Uncaught TypeError: Cannot read properties of undefined
|
2021-09-15 14:32:20 +03:00 |
|
|
|
20c36b9428
|
AppLimit.CloudComputing.SharpBox up to 1.1.0.455
|
2021-09-15 13:52:05 +03:00 |
|
|
|
a748b35f67
|
fix bug 51819.
Files: open edit. added view param
|
2021-09-15 13:26:56 +03:00 |
|
|
|
cfaa39a8c7
|
Web: Client: Files: FilesStore: Added error toast for caught fetch errors
|
2021-09-15 11:33:26 +03:00 |
|
|
|
32a5a3ac57
|
Fixed Bug 52566 - Client.Files.Download as. Fixed conversion formats
|
2021-09-15 10:55:12 +03:00 |
|
|
|
4661f9478d
|
Web: Files: fixed progress moveTo / copyTo for third-party files
|
2021-09-15 10:47:14 +03:00 |
|
|
|
77323e02cc
|
fix Bug 50294
|
2021-09-14 22:19:26 +03:00 |
|
|
|
7f38771b6d
|
fix Bug 50655
|
2021-09-14 20:11:47 +03:00 |
|
|
|
50c0ad1856
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-14 15:50:32 +03:00 |
|
|
|
1ade2986cb
|
Web: Files: fix favorite context item order
|
2021-09-14 15:01:25 +03:00 |
|
|
|
fab214ac28
|
Web: Files: fix filename font size
|
2021-09-14 14:49:34 +03:00 |
|
|
|
663dc48075
|
Web: Files: add fallback banner lng
|
2021-09-14 14:40:58 +03:00 |
|
|
|
aa45c61d5a
|
Merge branch 'feature/new-campaigns' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
|
2021-09-14 14:18:22 +03:00 |
|
|
|
2e8386749a
|
Web: Files: fix
|
2021-09-14 14:17:56 +03:00 |
|
|
|
d6bc9155d0
|
Web: Files: add error handler
|
2021-09-14 14:13:02 +03:00 |
|
|
|
e8a71e9641
|
fix Bug 49996
|
2021-09-14 13:40:12 +03:00 |
|
|
|
657c32ee0b
|
Web: Files: delete create file/folder toast
|
2021-09-14 13:29:45 +03:00 |
|
|
|
5c35839685
|
Fix bug 52478: Client.Files: Open location in context menu
|
2021-09-14 12:57:29 +03:00 |
|
|
|
a7de875342
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-14 12:30:32 +03:00 |
|
|
|
b43dd4302a
|
Web: Files: fix checkbox on tile
|
2021-09-14 12:30:25 +03:00 |
|
|
|
79b778c36d
|
Merge branch 'develop' into feature/new-campaigns
|
2021-09-14 11:48:24 +03:00 |
|
|
|
b4323fad80
|
Fixed Bug 52533 - Client.Files.Favorite/Recent. Fixed drag
|
2021-09-14 10:45:15 +03:00 |
|
|
|
b6d7677b23
|
Web: Files: delete useless
|
2021-09-13 17:29:46 +03:00 |
|
|
|
08e4b8c419
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-13 17:25:28 +03:00 |
|
|
|
9982c91d92
|
Web: Files: fix tile checkbox
|
2021-09-13 17:25:10 +03:00 |
|
|
|
4c3e75b7a6
|
Bug 49777: Client.Files. Fixed badge of version
|
2021-09-13 17:13:48 +03:00 |
|
|
|
1753c9aa54
|
Web: Files: fixed ThirdPartyMoveDialog styles
|
2021-09-13 16:48:55 +03:00 |
|
|
|
a757c691be
|
Web: Files: fixed setNewBadgeCount error
|
2021-09-13 15:46:05 +03:00 |
|
|
|
fe6014a440
|
Web: Update webpack to v5.52.1
|
2021-09-13 15:08:48 +03:00 |
|
|
|
549b05a1f7
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-13 14:26:09 +03:00 |
|
|
|
9b14200d84
|
Fix bug 52494: Client.Files.Checkbox activation
|
2021-09-13 14:25:37 +03:00 |
|
|
|
6a9a7af690
|
Web: Files: fixed convertDocs
|
2021-09-13 14:08:31 +03:00 |
|
|
|
40f162aca4
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-13 12:59:53 +03:00 |
|
|
|
f06e3c076b
|
Fix Bug 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries
|
2021-09-13 12:54:59 +03:00 |
|
|
|
c7ad040293
|
Web: Sorted all "package.json" files by vscode-sort-package-json
|
2021-09-13 12:36:07 +03:00 |
|
|
|
38242e83c1
|
Web: Moved other common dependencies to sharedDependencies.js
|
2021-09-13 12:29:44 +03:00 |
|
|
|
fc6478180d
|
Bug 52444 - Client.Files. Fixed opening files requiring conversion with the mouse wheel
|
2021-09-13 12:19:30 +03:00 |
|
|
|
74011d7328
|
Fixed Bug 52443 - Client.Files. Fixed downloadAs action
|
2021-09-13 11:09:59 +03:00 |
|
|
|
a47c73b5ce
|
Web: Moved "mobx", "moment", prop-types" to sharedDependencies.js
|
2021-09-10 16:50:23 +03:00 |
|
|
|
956c9b3467
|
Web: Moved "react", "react-dom", "react-router", "react-router-dom", "styled-components" to sharedDependencies.js
|
2021-09-10 15:57:14 +03:00 |
|
|
|
d2f3c93c14
|
Web: Moved "@babel/runtime", "i18next", "i18next-http-backend", "react-i18next" to sharedDependencies.js
|
2021-09-10 15:15:51 +03:00 |
|
|
|
46161eef95
|
Web: Moved axios to sharedDependencies.js
|
2021-09-10 14:49:20 +03:00 |
|
|
|
f0c7a09a6c
|
Web: Moved common shared dependencies to sharedDependencies.js + moved workbox-window
|
2021-09-10 14:20:19 +03:00 |
|
|
|
f7c46a70fa
|
Web: Updates next dev packages:
- @babel/preset-env
- css-loader
- sass
- sass-loader
- serve
- source-map-loader
- style-loader
- terser-webpack-plugin
- webpack-dev-server
+ Fixed css-loader url resolution issues
|
2021-09-10 11:30:27 +03:00 |
|
|
|
8b3bbd8a84
|
Web: Files: fixed files operations
|
2021-09-09 15:30:58 +03:00 |
|
|
|
3f678b3030
|
Web: Client: Files: Article: Fixed displaying settings menu loader
|
2021-09-09 13:48:04 +03:00 |
|
|
|
15dab2adaa
|
Web: Updated copy-webpack-plugin package
|
2021-09-09 13:17:27 +03:00 |
|
|
|
5b880d5b6a
|
Web: Updated clean-webpack-plugin package
|
2021-09-09 12:58:49 +03:00 |
|
|
|
d4bd4dcb50
|
Web: Updated webpack and it's dependencies (new v5.52.0) + moved to new webpack-dev-server v4.1.1
|
2021-09-09 11:28:52 +03:00 |
|
|
|
18718aab93
|
Web: Updated babel packages
|
2021-09-08 17:40:31 +03:00 |
|
|
|
8c731a1630
|
Web: Turned off wdyr
|
2021-09-08 16:57:40 +03:00 |
|
|
|
8c6de99101
|
Web: Updated @welldone-software/why-did-you-render, move it to the common devDependencies
|
2021-09-08 16:52:56 +03:00 |
|
|
|
fabaaef0f9
|
Web: Updated react-toastify and extended ModuleFederationPlugin shared section
|
2021-09-08 16:28:10 +03:00 |
|
|
|
11aa89a628
|
Web: Updated @babel/runtime and extended ModuleFederationPlugin shared section
|
2021-09-08 16:04:05 +03:00 |
|
|
|
124df88c58
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-08 15:47:02 +03:00 |
|
|
|
1501c1d91e
|
FIx Bug 52243 Client.Editor. There is no prompt message indicating that the file was saved successfully when using Save Copy As.
|
2021-09-08 15:46:52 +03:00 |
|
|
|
c41eb97a0f
|
Web: Extended ModuleFederationPlugin shared section
|
2021-09-08 15:41:11 +03:00 |
|
|
|
b0147cc811
|
Web: Removed duplicated dependency declaration (fast-deep-equal)
|
2021-09-08 15:40:38 +03:00 |
|
|
|
2b2f5efc14
|
Web: Files: fixed drag files without extension
|
2021-09-08 14:52:42 +03:00 |
|
|
|
551c623541
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
# Conflicts:
# packages/asc-web-components/campaigns-banner/index.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2021-09-08 14:36:10 +03:00 |
|
|
|
b0fe02a2b2
|
Web: Files: revert ADS_TIMEOUT
|
2021-09-08 14:23:16 +03:00 |
|
|
|
6e1cf0f2fc
|
Web: Files: fixed banner i18n config init
|
2021-09-08 14:14:36 +03:00 |
|
|
|
67eeb56f16
|
Web: Removed duplicated dependency declaration (email-addresses)
|
2021-09-08 13:54:49 +03:00 |
|
|
|
e1ec752da5
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-08 12:11:41 +03:00 |
|
|
|
7ad0abc09b
|
Fix bug 52310: open files from upload panel
|
2021-09-08 12:11:31 +03:00 |
|
|
|
d66e8a4046
|
Web: Files: fixed drag files
|
2021-09-08 11:36:43 +03:00 |
|
|
|
43b776b4d6
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-08 11:01:21 +03:00 |
|
|
|
d4301a0c04
|
Web: Files: hid connection clouds settings for desktop editors
|
2021-09-08 11:01:15 +03:00 |
|
|
|
a0841a3eef
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-08 10:39:42 +03:00 |
|
|
|
3c4e0a3e2f
|
Web: Files: Deleted side effect.
|
2021-09-08 10:39:28 +03:00 |
|
|
|
a28ae084ab
|
Web: Files: banner refactoring
|
2021-09-08 10:36:02 +03:00 |
|
|
|
ecc5c69722
|
Web: Files: fixed banner translations
|
2021-09-07 18:34:46 +03:00 |
|
|
|
d15ddde9ff
|
Web: Files: MainButton: fixed upload loader
|
2021-09-07 18:22:16 +03:00 |
|
|
|
9149de1ef1
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-07 17:58:13 +03:00 |
|
|
|
2e83072ed2
|
Web: Files: fixed table
|
2021-09-07 17:58:07 +03:00 |
|
|
|
a1e09f8ad9
|
fix Bug 52184
|
2021-09-07 16:48:39 +03:00 |
|
|
|
efaa0e75ce
|
Web: Files: fixed context options
|
2021-09-07 16:11:42 +03:00 |
|
|
|
fcc1835bf2
|
Web: Files: hid connection clouds for the desktop client
|
2021-09-07 15:21:42 +03:00 |
|
|
|
ef920a2023
|
Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files
|
2021-09-07 12:57:13 +03:00 |
|
|
|
7d63145043
|
Web: Client: Files: Article: Fixed displaying settings menu loader on first load
|
2021-09-07 12:56:17 +03:00 |
|
|
|
da96e47773
|
Web: Files: get campaigns translations from firebase
|
2021-09-07 12:48:41 +03:00 |
|
|
|
d51887f642
|
Web: Common: Fixed Article loaders + added MainButtonLoader
|
2021-09-07 12:29:55 +03:00 |
|
|
|
1ff5eadc8a
|
Web: fixed table view
|
2021-09-06 16:55:29 +03:00 |
|
|
|
9772cdbc7b
|
Web: Table: fixed table view for mobile devices
|
2021-09-06 15:35:17 +03:00 |
|
|
|
c15c6733d9
|
Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files
|
2021-09-06 16:59:30 +05:00 |
|
|
|
432e58f9cd
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
|
2021-09-06 11:43:35 +03:00 |
|
|
|
ec7fcd34b3
|
Merge branch 'develop' into release/1.0.0
|
2021-09-03 18:07:09 +03:00 |
|
|
|
d78195aa5a
|
Added notify
|
2021-09-03 18:04:06 +03:00 |
|
|
|
6651656b4a
|
Fix Bug 51472 - Client.Drag’n’drop. Added drag and drop by filename
|
2021-09-03 17:15:58 +03:00 |
|
|
|
8626c82482
|
fix Bug 52244 - Client.Files.Clouds. Ошибка «This MySqlConnection is already in use...» при блокировке файла в папке стороннего хранилища.
|
2021-09-03 14:57:07 +03:00 |
|
