Commit Graph

7615 Commits

Author SHA1 Message Date
TimofeyBoyko
fdbe61603b Web:Files:Article: add empty accounts item 2022-06-22 16:24:18 +03:00
d05f13b143 fix 2022-06-22 16:21:39 +03:00
TimofeyBoyko
073c24014a Web:Files:Article: add new header items: files, rooms, other 2022-06-22 16:14:42 +03:00
914c9bc799 File: fix download 2022-06-22 15:54:43 +03:00
274e89f51c Web: Files: added limit for download action 2022-06-22 15:38:05 +03:00
5e4d065623 Fixed Bug 57720 - Client. Fixed display the current directory 2022-06-22 14:58:34 +03:00
5cb96c0727 Merge branch 'release/v1.2' into feature/download-dialog 2022-06-22 14:32:57 +03:00
TimofeyBoyko
40d69ea88f Web:Files:Article: rename SettingsItems to SettingItem 2022-06-22 14:20:27 +03:00
TimofeyBoyko
6c6052293b Web:Files:Article: change default icon to settings item 2022-06-22 14:17:35 +03:00
TimofeyBoyko
ceaa29e294 Web:Files:Article: hide thirparty list, download app list and banner for docspace 2022-06-22 14:17:07 +03:00
2273887a6a Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-22 14:11:19 +03:00
cd2687e260 Fixed Bug 57630: Web: Files: Fixed animation when switching between folders. 2022-06-22 14:11:07 +03:00
de7148686c fix Bug 52860 2022-06-22 13:48:11 +03:00
TimofeyBoyko
4b7520c6a8 Web:Files:Article: add new icons for article items 2022-06-22 12:32:21 +03:00
1658240e2f Web: Files: fixed download action 2022-06-22 12:07:57 +03:00
b88dadf961 Merge branch 'feature/download-dialog' of github.com:ONLYOFFICE/AppServer into feature/download-dialog 2022-06-22 11:53:01 +03:00
f84d98c6df Web: Files: fixed downloadFiles toast 2022-06-22 11:52:37 +03:00
7189a99583 Merge branch 'feature/download-dialog' of https://github.com/ONLYOFFICE/AppServer into feature/download-dialog 2022-06-22 11:36:35 +03:00
3b99ef503c Merge branch 'release/v1.2' into feature/download-dialog 2022-06-22 11:36:20 +03:00
TimofeyBoyko
36835eea13 Merge branch 'develop' into feature/virtual-rooms-page 2022-06-22 11:17:05 +03:00
f2da6fc55c
Merge pull request #693 from ONLYOFFICE/feature/docspace
Feature/docspace
2022-06-22 11:55:36 +04:00
417b13b844 Fix Bug 57704: left/right arrow select item in compact view 2022-06-21 22:09:40 +03:00
7f77633a92 Fix Bug 57639: different actions menu 2022-06-21 21:41:29 +03:00
aad8a92b4c RoomInvite replaced by LinkInvite 2022-06-21 20:33:05 +03:00
bbcd5b7382 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-21 19:45:30 +03:00
95c23cc95a Fix Bug 57680 - Mobile. Couldn't not select more than 1 tile in thumbnails mode 2022-06-21 19:45:16 +03:00
b30ec3c1bd Files: added room api docs 2022-06-21 18:43:54 +03:00
231c99a5f0 fix Bug 57693 2022-06-21 17:52:32 +03:00
1aadf26fe2 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-21 17:05:04 +03:00
fa3b7003ba Fixed Bug 57701 - Client.HotKeys. Fixed the creation of the document 2022-06-21 16:49:30 +03:00
8ad241fc6d Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-21 16:21:47 +03:00
9c1eb1e185 Fixed Bug 57683 - Client.Info. Hidden "Content" field for third-party folders 2022-06-21 16:21:07 +03:00
aaf331557e Fixed Bug 57646: Web: Files: Added the ending of file/folder creation 2022-06-21 16:07:21 +03:00
14eb735fed Fixed Bug 57642 - Docs: Actions: Fixed form template creation after resizing window to tablet size 2022-06-21 14:10:01 +03:00
TimofeyBoyko
4bf70be27d Web:Files: applied changes from 610f738 2022-06-21 14:09:58 +03:00
6f0fa1555f Web: Files: Removed static description from GalleryForm item info 2022-06-21 13:23:50 +03:00
66cdf0bdaf Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-21 13:03:31 +03:00
mushka
343dd2174c files 2022-06-21 12:42:58 +03:00
610f738ca6 Web: Files: Fix password protected files operations 2022-06-21 12:29:26 +03:00
a4d33b9939 Fixed Bug 57660 - Docs: Fixed display info-panel content for forms-gallery 2022-06-21 12:19:15 +03:00
TimofeyBoyko
3f1623716d Web:Files: move global event args to one payload 2022-06-21 11:30:26 +03:00
TimofeyBoyko
7726b8f9ef Web:Files:CreateEvent: add onClose function after user click save button 2022-06-21 11:29:31 +03:00
TimofeyBoyko
c4de30ee0f Web:Files:HOCs: fix warning after removing fileActionStore 2022-06-21 11:28:44 +03:00
TimofeyBoyko
c4483f2892 Merge branch 'develop' into feature/create-from-modal 2022-06-21 11:05:53 +03:00
494b2bc1e0 merge 2022-06-21 10:53:05 +03:00
0a27a98511 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-21 10:52:53 +03:00
18f944b2c6 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-21 10:10:12 +03:00
b2f9e35041 Fixed Bug 57663: Client: Files: Fixed displaying icons for connecting accounts 2022-06-20 22:42:48 +03:00
fc567a1040 Fixed Bug 57637: Client: Files: Fixed icon size for editing item 2022-06-20 22:09:36 +03:00
72f0ac4f9b file converter server: fixed bugs 2022-06-20 19:58:08 +03:00
TimofeyBoyko
9a58baa435 Web:Files: delete filesActionStore and useless code after adding global events for create and rename file/folder 2022-06-20 19:01:10 +03:00
c3faf982c5 Files: fix download 2022-06-20 18:29:07 +03:00
aa53acccd9 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-20 17:54:19 +03:00
fa458aa1a5 Web: Files: fixed selection when clicking on badge or file/folder name 2022-06-20 17:54:14 +03:00
e0a23a91a3 Web: Files: added error on download action 2022-06-20 17:50:32 +03:00
5ac3d3e5b6 Web: Files: added new logic when select file format 2022-06-20 17:28:55 +03:00
34cb63fd3f fix 2022-06-20 17:23:32 +03:00
5a06f23111 fix Bug 57618 2022-06-20 17:14:37 +03:00
03e756277b fixed warnings 2022-06-20 17:01:59 +03:00
ac94309716 Web: Files: removed custom format from download dialog selector 2022-06-20 16:55:21 +03:00
3b5cb1b7fe Web: Files: fixed display of items in download dialog 2022-06-20 16:33:05 +03:00
c192e0fd0a Merge branch 'release/v1.2' into feature/download-dialog 2022-06-20 15:41:53 +03:00
79cce9cfc1 Web: Files: Added file ext after update date on File Row view mode 2022-06-20 15:35:27 +03:00
TimofeyBoyko
fe4f4ac80d Web:Files:GlobalEvents: delete console log 2022-06-20 15:06:04 +03:00
a8bf285dc1 Web: Files: Added and applied new modern row mode 2022-06-20 15:01:54 +03:00
57916d46ba Files: removed unnecessary, refactor 2022-06-20 14:39:08 +03:00
44747e837a Files: tag id replaced with tag name 2022-06-20 14:30:49 +03:00
2eb288f307 Web: Files: removed comments 2022-06-20 14:28:10 +03:00
9e99fed6b5 Web: Files: added new DownloadDialog, refactoring 2022-06-20 14:18:40 +03:00
231daa2e0b Web: removed useless translations 2022-06-20 14:16:11 +03:00
e6602a22ab Files: fix copyas 2022-06-20 13:21:40 +03:00
e68ac70005 Merge branch 'develop' into feature/docspace 2022-06-20 12:15:08 +03:00
TimofeyBoyko
413962bbaa Web:Files:GlobalEvents: add title validation on rename 2022-06-20 12:14:49 +03:00
TimofeyBoyko
efa8a383d7 Web:Files:GlobalEvents: change dialog styles for device width less than 400px 2022-06-20 11:29:47 +03:00
mushka
d4cfd235fc merge with release 2022-06-20 11:25:28 +03:00
TimofeyBoyko
991e3cc012 Web:Files:GlobalEvents: refactoring rename and create events 2022-06-20 11:05:58 +03:00
efba3d824e Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-20 11:04:43 +03:00
TimofeyBoyko
0bfa280c38 Web:Files:FilesActionsStore: fix rename event 2022-06-20 10:34:59 +03:00
e2bdaa40e4 Web: Files: returned set filter url. 2022-06-20 10:30:18 +03:00
TimofeyBoyko
c3620c6c91 Web:Files:Components: add rename and create global events 2022-06-20 10:09:03 +03:00
TimofeyBoyko
a71e637c98 Web:Files:FilesActionsStore: add type as argument to editCompleteAction and change setAction from fileActionStore to global event 2022-06-20 10:08:28 +03:00
TimofeyBoyko
71fea71531 Web:Files:FilesActionsStore: add type as argument to editCompleteAction and change setAction from fileActionStore to global event 2022-06-20 10:07:07 +03:00
TimofeyBoyko
3703693b34 Web:Files:DialogsStore: change create oform file from docx from action store to global event 2022-06-20 10:05:31 +03:00
TimofeyBoyko
fd3a45f301 Web:Files:ContextOptionStore: change rename file or folder from action store to global event 2022-06-20 10:04:33 +03:00
TimofeyBoyko
441786da21 Web:Files:Home: change create oform file from action store to global event 2022-06-20 10:02:48 +03:00
e2cee2c2fc Merge branch 'release/v1.2' into develop
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.FederatedLogin/OAuth20Token.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/ASC.Resource.Manager/Program.cs
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	config/appsettings.json
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/ISecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/ThumbnailSettings.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/Model/SessionModel.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/Token.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/DocStore
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Server/ASC.People.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/Resource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-06-19 22:44:48 +03:00
72b0a81f51 fix 2022-06-17 20:51:01 +03:00
8ea04bcc81 Merge branch 'develop' into feature/12.0
# Conflicts:
#	common/ASC.MessagingSystem/Data/MessagesRepository.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
2022-06-17 19:19:00 +03:00
c83bd81bd5 Web: Files: Styled table badge (more closer to figma) 2022-06-17 18:21:16 +03:00
TimofeyBoyko
ae66c8e4f6 Web:Files:Section:Header: change create file or folder from action store to global event 2022-06-17 16:16:14 +03:00
TimofeyBoyko
10a745c1e6 Web:Files:withHotkeys: change create file or folder from action store to global event 2022-06-17 16:15:54 +03:00
TimofeyBoyko
a029abadf5 Web:Files:EmptyContainer: change create file or folder from action store to global event 2022-06-17 16:00:15 +03:00
TimofeyBoyko
0ab899d5c9 Web:Files: add GlobalEvents component 2022-06-17 15:51:55 +03:00
TimofeyBoyko
1a34e82155 Web:Files:Article: change create file or folder from action store to global event 2022-06-17 15:49:29 +03:00
080cde2888 Web: Files: Fix empty second line of FileRowContent on third-party folders 2022-06-17 15:39:45 +03:00
TimofeyBoyko
bac023f04c Web:Files:Constants: add global events name 2022-06-17 14:54:17 +03:00
29d3bb3fee Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-17 13:18:03 +03:00
597db4684e refactoring 2022-06-17 13:17:53 +03:00
3684775829 Files: security fix 2022-06-17 12:27:07 +03:00
ff6a403c3c Files: refactor 2022-06-17 11:22:55 +03:00
fa9316807c Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-17 11:15:51 +03:00
06ce968e9f Web: Files: fixed edit component styles 2022-06-17 11:15:32 +03:00
2b8b7c9898 Files: added permission check for link generation 2022-06-17 10:59:03 +03:00
1f65ea35a7 Files: removed unnecessary 2022-06-17 10:52:32 +03:00
09de3c141c Web: Files: Deleted useless code. 2022-06-17 10:31:38 +03:00
0fbe11ed1c Merge branch 'develop' into feature/docspace 2022-06-17 10:26:51 +03:00
b62ba1d729 fix tests 2022-06-17 10:17:17 +03:00
mushka
930b05fc31 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-16 19:01:53 +03:00
mushka
776a37f538 changed InfoPanel behaviour on module switch + added InfoPanelLoader components + changed the way how InfoPanelHeader passed itself to Section + united GalleryHeader and InfoPanelHeader to one component 2022-06-16 19:01:30 +03:00
34d55db6a6 Files: added invitation by link without email, added existing user to room by link 2022-06-16 18:39:50 +03:00
fc93c6336a Files: added email invitation 2022-06-16 18:34:38 +03:00
d3890b3e18 Files: deleted unnecessary 2022-06-16 18:28:15 +03:00
67b9a00068 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-16 17:23:09 +03:00
b26c2a8a6f edit VersionHistory.json 2022-06-16 17:21:42 +03:00
e9a1220c0e Web: Files: fixed oforms creation 2022-06-16 17:18:04 +03:00
56ece27e1b moved from ddf515b8 2022-06-16 17:16:46 +03:00
0d1239af95 add thumbnails for video 2022-06-16 16:43:29 +03:00
TimofeyBoyko
0317a4f4a3 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-16 16:41:49 +03:00
TimofeyBoyko
7b2fe1790c Web:Files:EditingWrapperComponent: fix dark theme for tile view 2022-06-16 16:41:33 +03:00
d3bb2419c1 Web: Files: fixed oforms creation, added display oforms gallery button for all languages 2022-06-16 16:15:01 +03:00
83d9e01d04 Web: Files: fixed header jumping for mobile devices 2022-06-16 13:39:36 +03:00
f2e2ccee72 Web: Files: Header: refactoring 2022-06-16 13:28:38 +03:00
1ac2e80310 Web: Files: fixed download dialog styles 2022-06-16 12:29:50 +03:00
8c8bef2418 Web: Files: fixed finalizeVersionAction 2022-06-16 12:03:47 +03:00
430542b2ea moved from ddf515b8 2022-06-16 11:35:24 +03:00
c9fb0d3dac moved from ddf515b8 2022-06-16 11:13:53 +03:00
a98e5d9c6a Web: Files: Fix display name decoding ('Shared With Me' Author column issue) 2022-06-15 19:49:18 +03:00
3a6eb0c8de Web: Files: removed table-row z-index 2022-06-15 17:25:53 +03:00
59f50effc5
Merge branch 'develop' into bugfix/fix-private-room 2022-06-15 14:48:49 +03:00
mushka
78cdd52e94 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-15 14:25:45 +03:00
mushka
f2d7a02288 added decoding for unicode characters in InfoPanel 2022-06-15 14:25:33 +03:00
f3f3ed96ae moved from ddf515b8 2022-06-15 12:46:21 +03:00
c37af416da Files: fix 404 2022-06-15 10:41:59 +03:00
77ecf6f988 Files: fix 2022-06-14 18:12:37 +03:00
TimofeyBoyko
52d9f7f20f Web:Files:init virtual rooms page with empty container and table and tile views 2022-06-14 16:41:26 +03:00
TimofeyBoyko
0746b20089 Web:Files: add context options for virtual rooms page 2022-06-14 16:34:07 +03:00
TimofeyBoyko
668ac51998 Web:Files: add new pin and settings images 2022-06-14 16:30:41 +03:00
7194fec848 Files: fix 2022-06-14 13:30:12 +03:00
d4622ee902 Web: Files: added error handling for create/edit operations 2022-06-14 12:51:54 +03:00
Artem Tarasov
2eebeb3c1a Merge branch 'develop' into feature/doceditor-ssr 2022-06-14 11:22:23 +03:00
35bebe49f9 moved from ddf515b8 2022-06-14 11:11:41 +03:00
c2b7f99f16 refactoring get thumbnailFile 2022-06-14 10:45:52 +03:00
722f3568bb refactoring get ThumbnailFile 2022-06-14 10:28:57 +03:00
a98eb791e8 Files: refactor 2022-06-14 01:33:37 +03:00
de36de1870 Files: fix 2022-06-14 00:04:45 +03:00
269cdd9825 Files: refactor 2022-06-13 21:50:49 +03:00
f68585bf9d Files: fix 2022-06-13 21:04:51 +03:00
3e2483a016 Files: added rooms folder cache clearing 2022-06-13 17:41:13 +03:00
5be6e7cbee Files: fix 2022-06-13 17:40:34 +03:00
2336dc9762 Files: refactor 2022-06-13 17:40:25 +03:00
239d1803c7 FIles: refactor 2022-06-13 17:32:24 +03:00
e618f7f450 Files: fix filter, added clearing rooms cache 2022-06-10 22:32:21 +03:00
d370c797bb Files: added virtual rooms default share 2022-06-10 22:31:24 +03:00
2811e694c6 Files: fix System.NullReferenceException 2022-06-10 22:30:49 +03:00
7fdf89ecae Files: added thirdparty rooms tags query 2022-06-10 22:30:28 +03:00
d43693acb2 get status Thumbnail.Created for thirdparty 2022-06-10 16:06:32 +03:00
7ddb0506c9 Web: Files: moved Hotkeys translation, added button to open hotkeys 2022-06-10 11:30:57 +03:00
1b6d96400c Files: changed filtering rooms by types 2022-06-09 20:11:12 +03:00
d132f0d565 fileconverter: refactoring 2022-06-09 17:38:27 +03:00
22b341c942 fileconverter: added logs 2022-06-09 17:02:19 +03:00
9edcce8858 moved from ddf515b8 2022-06-09 15:11:45 +03:00
16b5a4cac8 Files: refactor 2022-06-09 13:24:54 +03:00
Artem Tarasov
885ab9b041 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-09 13:05:48 +03:00
Artem Tarasov
67ec336b60 Web: Files: changed setSelection to setBufferSelection when scroll to item 2022-06-09 13:05:29 +03:00
ef4b0a17f2 Files: added room presets 2022-06-09 11:38:34 +03:00
8ad71434c1 Files: added room presets 2022-06-09 11:33:31 +03:00
8f8fc7323d Files: refactor 2022-06-09 11:33:14 +03:00
Artem Tarasov
2aa0bc254a Web: Files: fixed selector 2022-06-09 11:03:06 +03:00
95e7d85c53 Fixed Bug 57445: Client: Files: Added property to restore selection after fetching items 2022-06-09 10:44:13 +03:00
Artem Tarasov
c28a513a9a Web: Files: fixed scroll to item for table view 2022-06-09 10:24:00 +03:00
Artem Tarasov
dccd09dd89 Web: Files: added prop 'id' for list items 2022-06-09 10:23:02 +03:00
Artem Tarasov
2ca378643d Web: Files: added scroll to the created file and to the last opened image 2022-06-09 01:22:50 +03:00
7b1ea58cdf fileconverter: moved timer to separete worker service 2022-06-08 17:25:25 +03:00
e2ba706d71 Fix after merge 2022-06-08 16:38:34 +03:00
b693779ea1 Merge branch 'develop' into feature/docspace-pin 2022-06-08 16:38:16 +03:00
TimofeyBoyko
c0084cb7dc Web:Files/Components: add new images for virtual rooms page 2022-06-08 16:17:46 +03:00
02b4031ba0 fix Bug 57463 2022-06-08 12:53:33 +03:00
397cde0a3b Files: added pin/unpin, fix tags 2022-06-07 19:07:55 +03:00
5203feffe7 Web: Files: added table loader 2022-06-07 16:15:55 +03:00
TimofeyBoyko
617f3974e0 Web:Files: add new route virtual rooms 2022-06-07 13:19:19 +03:00
Artem Tarasov
cec8eeeff1 Web: Files: Fixed Bug 57442 - Client.Block: disabled lock/unlock action for non-editable formats 2022-06-07 10:04:33 +03:00
161ef0f1f9 Web: Files: fixed withFileActions re-render, removed tiles log 2022-06-06 18:11:53 +03:00
mushka
dced443306 removed unused get func from SettingsStore 2022-06-06 18:04:16 +03:00
720121f56e add google and onedrive 2022-06-06 17:28:51 +03:00
8c56de7a26 moved from ddf515b8 2022-06-05 18:44:37 +03:00
9f74ef2bc3 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-03 15:16:34 +03:00
ff118752ed Web: Files: Fixed memory leak after resize. 2022-06-03 15:16:19 +03:00
efcf805aec Web: Files: fix show paging 2022-06-03 14:46:23 +03:00
0eade93e81 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-03 14:25:47 +03:00
f0363e6a81 Web: Files: Removed hover border overlay on hotkey border in table view. 2022-06-03 14:25:32 +03:00
4e7e9415d9 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-03 13:38:17 +03:00
493a7eb39b Fixed Bug 57469 - Client.Files.Upload. "Something went wrong" when opening the upload panel. 2022-06-03 13:38:11 +03:00
dfd595193d Fix Bug 57383: open editor when created form 2022-06-03 13:37:02 +03:00
cc7c29c8cf Files: fix 2022-06-03 13:26:16 +03:00
da4bdc89cd Web: Files: Added a default cursor for files in the folder selection dialog. 2022-06-03 12:56:39 +03:00
e594cdaf4d Web: Files/Components: Fixed dark theme of files icons for selection folder dialog. 2022-06-03 12:53:12 +03:00
bbf1a0cbfa Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-03 12:19:49 +03:00
def3db7860 Web: Files: Return bad code after merge. 2022-06-03 12:19:26 +03:00
00a2bfa884
Merge pull request #686 from ONLYOFFICE/bugfix/field-created-on-file
Bugfix/field created on file
2022-06-03 12:03:40 +03:00
d221e4dca2 Web: Files/Components: Added restriction on moving a folder into itself 2022-06-03 11:37:30 +03:00
a0729a8084 thumbnail: first version
add from google and dropbox
2022-06-03 10:41:05 +03:00
57df81aa76 Files: added logo audit, fix 2022-06-03 01:27:56 +03:00
848751220c Files: added logos for rooms 2022-06-02 21:41:16 +03:00
85bb4df966 edit translations 2022-06-02 18:41:50 +03:00
e2d047ad54 Fix Bug 57447: active restore button in trash 2022-06-02 17:12:52 +03:00
8079b217ac Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-02 17:06:21 +03:00
db238ffedb update lo 2022-06-02 17:03:42 +03:00
30ae545e6f Fix Bug 57443: layering icon over text 2022-06-02 14:19:18 +03:00
34028b0990 Fixed Bug 57414 - Client.Upload. Fixed file extension display after upload and conversion 2022-06-02 13:46:30 +03:00
2b63336d62 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-02 13:22:46 +03:00
e2d39453f8 edit translations 2022-06-02 13:21:37 +03:00
fa3aca4a3e Web: Files: removed group sharing for personal 2022-06-02 11:25:01 +03:00
d38d88c0ea Fixed Bug 54591 - Client.Files. Fixed deleting third party files/folders toast. 2022-06-02 11:12:19 +03:00
3757174d08 fix test 2022-06-01 20:25:03 +03:00
bcec4e7e05 fix 57264 2022-06-01 18:55:22 +03:00
146891713d Web: Files: fixed group context menu 2022-06-01 18:15:52 +03:00
19d9a258b9 Merge branch 'release/v1.2' into feature/group-context-menu 2022-06-01 17:48:36 +03:00
f070c50c63 Web: Files: added clear selection after mark as favorite 2022-06-01 17:39:08 +03:00
b1abac2eae Files: fixed move operation 2022-06-01 17:18:26 +03:00
cbcb8f903a Web: Files: combined add to favorites / remove from favorites in a single block 2022-06-01 17:14:54 +03:00
a861268e4f moved from ddf515b8 2022-06-01 17:07:08 +03:00
b8162f4af7 Web: Files: removed count of files from group context menu label 2022-06-01 17:06:54 +03:00
9467a7e366 Web: Files: added separators to group context menu, remove empty trash 2022-06-01 16:54:32 +03:00
6c04530f20 Web: Files: Delete useless translation. 2022-06-01 16:19:59 +03:00
229a6e8f0d Merge branch 'release/v1.2' into bugfix/field-created-on-file 2022-06-01 17:40:32 +05:00
9df538e4b5 Web: Files: fixed setSelected 2022-06-01 15:30:18 +03:00
8af30212aa Web: Files: added group context options 2022-06-01 15:13:09 +03:00
3ebd67f444 merge from develop 2022-06-01 14:44:30 +03:00
36fd7e6e0c Web: Files: removed useless code 2022-06-01 13:23:59 +03:00
aef79ffbe7 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-01 12:34:01 +03:00
76c4d2ebfc Web: Fixed color in dark theme for dialog. 2022-06-01 12:33:49 +03:00
Timofey Boyko
ff9c0f54ae Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-01 11:56:31 +03:00
Timofey Boyko
af00060711 Fix Bug 57426 - Client. Folder name tooltip at cursor position when navigation bar is open 2022-06-01 11:56:21 +03:00
e7650b126b Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-01 10:51:41 +03:00
e24891953e Web: Files: Fixed border color of header of upload panel. 2022-06-01 10:51:30 +03:00
Timofey Boyko
7efeeabe1b Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-01 10:41:22 +03:00
Timofey Boyko
5e78699844 Web:Files:FormGallery: fix interface jumping when info panel is open 2022-06-01 10:40:59 +03:00
141ee254e6 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-01 12:21:46 +05:00
90da8a3fa1 Fix bug 57415 - Web: Files: fixed clear uploaded files history 2022-06-01 12:21:34 +05:00
4c2064714d Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-31 18:38:13 +03:00
8b1facfcae edit translations 2022-05-31 18:37:00 +03:00
b81d3ff507 Files: fix routing 2022-05-31 16:49:54 +03:00
9902b536d9 Files: added thirdparty rooms filter 2022-05-31 16:49:39 +03:00
9584e8ba74 Files: fix 2022-05-31 16:47:59 +03:00
eda86591a1 Files: fix "MySql connection already in use" 2022-05-31 16:47:37 +03:00
2461b16468 fix Bug 53137: save lastModified when uploading file 2022-05-31 16:20:11 +03:00
mushka
aaff52299b Fix InfoPanelToggleWrapper in FormGallery on desktop 2022-05-31 15:48:42 +03:00
fa38dad158
Merge pull request #681 from ONLYOFFICE/feature/info-panel-store-relocation
InfoPanelStore relocation
2022-05-31 15:29:42 +03:00
mushka
cf01904b94 fixed GalleryHeader`s InfoPanelToggle on tablet and mobile 2022-05-31 14:14:10 +03:00
Timofey Boyko
12702e0b57 Web:Files:TableView: increase z-index for hover row 2022-05-31 13:50:04 +03:00
Timofey Boyko
0b252d79a6 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-31 13:24:34 +03:00
Timofey Boyko
55515ded68 Fix Bug 57407 - Client.OformsGallery. Something went wrong when template info opened 2022-05-31 13:24:21 +03:00
mushka
7d327bd9f7 removed infoPanelStore from hotkeyStore 2022-05-31 13:15:54 +03:00
478d4a429c Web: Client: Files: Fixed displaying rename action on editing third party item 2022-05-31 12:27:21 +03:00
Timofey Boyko
ce0fca842b Fix Bug 54569 - Client.Files. Switch tab automatically completes the creation of the file 2022-05-31 12:24:13 +03:00
cca2e4aa1f Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-31 09:37:21 +03:00
056fe260cd Web: Files: Removed scroll sticking if you try to move the scroll slider. 2022-05-31 09:37:06 +03:00
7d98feae07 Web: Files: Commented console logs 2022-05-30 19:32:38 +03:00
461e628c59 Web: Files: Fix upload on DnD to Catalog 2022-05-30 19:13:17 +03:00
02e08d8097 Web: Files: Fix issues with parallel uploads (empty folders + files) 2022-05-30 18:28:01 +03:00
a4f412ee89 Merge branch 'release/v1.2' into feature/upload-empty-folders 2022-05-30 17:36:42 +03:00
4b35b21b6e Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-30 16:29:13 +03:00
69dceb030a Fix Bug 57375: cancel uploads 2022-05-30 15:51:52 +03:00
299e776a66 Fixed Bug 57376 - Client.Upload. The previous list of downloaded files is displayed on the download panel after it is closed 2022-05-30 15:44:50 +03:00
5a26c4f404 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-30 15:33:17 +03:00
73364c1fba Files: refactor 2022-05-30 14:32:00 +03:00
2a7853bf5b Files: added creating thirdparty rooms 2022-05-30 14:31:30 +03:00
1edb778115 Files: added thirdparty rooms 2022-05-30 14:30:08 +03:00
68cbced3d0 Web: Files: Removed file offset when selecting them. (macOS, Safari) 2022-05-30 13:58:10 +03:00
mushka
b20d37c22e relocated InfoPanelStore from Files to Common.Auth 2022-05-30 13:46:45 +03:00
5a98f14cc7 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-30 13:30:31 +03:00
2119e35224 Web: Files: Removed additional borders on the left and right in the table view (macOS, Safari). 2022-05-30 13:28:59 +03:00
e704983452 Filex: fix controller 2022-05-29 22:36:28 +03:00
8bf6cdda9f Files: fix, added thirdparty archiving, deleting 2022-05-29 22:36:15 +03:00
d8e48dca88 Web: Files: Added showing of empty folder creation progress 2022-05-27 22:22:20 +03:00
10091ac5d1 Web: Files: Added empty folder tree creation on DropZone upload only 2022-05-27 20:50:32 +03:00
9b779be2f4 Files: added thirdparty rooms 2022-05-27 19:02:47 +03:00
bb64f104c5 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-27 17:26:10 +03:00
e1e021f3fa edit translations 2022-05-27 17:25:03 +03:00
717dac9e69 Web: Files: added lastModifiedDate to start upload session 2022-05-27 18:21:59 +05:00
19aacaa69c Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-27 16:19:49 +03:00
da19e06d1f Web: Files: Hotkeys: fixed arrow key events 2022-05-27 16:19:43 +03:00
2d72dcf337 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-27 16:15:16 +03:00
4d02251c6b edit translations 2022-05-27 16:14:45 +03:00
mushka
5ad2231fc3 Merge branch 'release/v1.2' into feature/modal-redesign 2022-05-27 15:24:29 +03:00
881a70a540 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-27 14:58:43 +03:00
c092ae1d13 Fixed Bug 57327: Wrong size of icon on mobile shortcut 2022-05-27 14:58:32 +03:00
7acd9e894f Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-27 14:11:20 +03:00
98903043e6 Fix Bug 57353: hide version history for media 2022-05-27 14:11:06 +03:00
bb7871abad Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-27 14:09:34 +03:00
a16b2c7927 edit translations 2022-05-27 14:08:27 +03:00
8a48a64d02 Web: Files: Tile: fix context menu crash 2022-05-27 13:14:29 +03:00
a7c5e5cb5e Web: Files: fix tile check logic 2022-05-27 13:04:38 +03:00
e6e7afd1f7 Web: Files: Hotkeys: fixed lagging 2022-05-27 12:02:06 +03:00
f7342801a2 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-27 11:54:29 +03:00
515c401914 Merge branch 'release/v1.2' into feature/upload-empty-folders
# Conflicts:
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	yarn.lock
2022-05-27 11:05:36 +03:00
3f217af868 fix 57264 2022-05-26 22:00:09 +03:00
470c983e2e Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-26 21:46:36 +03:00
04e5a83e8e Web: Files: Tile: fix tile check 2022-05-26 21:45:51 +03:00
Timofey Boyko
63d4de9ee9 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 21:18:36 +03:00
Timofey Boyko
335d344cb4 Web:Files:Home: add check for empty column before set dropbbable-hover class 2022-05-26 21:18:27 +03:00
Timofey Boyko
2ad3a2fa6e Web:Files:TableView: fix bug with wrong background for empty column with drag and drop 2022-05-26 21:17:49 +03:00
Timofey Boyko
8710b8b4b8 Web:Files:TableView: move storage names from table header to table container component 2022-05-26 20:03:24 +03:00
325a53579a Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-26 19:22:45 +03:00
032191f542 edit translations 2022-05-26 19:22:25 +03:00
437808b6bd Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-26 18:07:41 +03:00
f3505e2b4a Web: fix smart banner meta 2022-05-26 17:35:59 +03:00
5f9c5c54e7 Files: added db entity fields 2022-05-26 17:34:04 +03:00
66ad7f5c9e fix 57358 2022-05-26 17:29:57 +03:00
Timofey Boyko
6ce9963ee6 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 17:07:32 +03:00
Timofey Boyko
26a7533ac7 Web:Files:DragTooltip: increase z-index 2022-05-26 17:07:27 +03:00
7691ab5f90 fix 57359 2022-05-26 17:03:43 +03:00
dc7d837e46 Merge branch 'release/v1.2' into feature/smart-banner 2022-05-26 16:57:04 +03:00
e2e8f3fce9 Merge branch 'feature/docspace-tags' into feature/docspace-thirdparty 2022-05-26 16:39:19 +03:00
3123bbd187 Files: added tags filtering 2022-05-26 16:37:31 +03:00
aa9b6cbb19 fix 57223 2022-05-26 16:20:30 +03:00
10e2b77ca9 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 15:11:08 +03:00
mushka
9a91b32783 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 15:08:56 +03:00
mushka
31380a6956 Fixed for unexisting InfoPanel EmptyScreen 2022-05-26 15:08:17 +03:00
1d4d8055bb Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-26 15:00:35 +03:00
6c349b5240 edit translations 2022-05-26 14:59:50 +03:00
e9866bf339 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 14:59:28 +03:00
06a565b02d Web:Files:Adding props areaSelect. 2022-05-26 14:58:16 +03:00
518fe17d14 refactor 2022-05-26 14:43:56 +03:00
mushka
8b63d4e489 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 14:37:05 +03:00
mushka
a70b8895c5 Bug 52730: Empty screen for InfoPanel in all sections except My documents 2022-05-26 14:36:55 +03:00
76db35e748 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-26 13:40:26 +03:00
968e4440ea Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-26 13:18:06 +03:00
52a779326e edit translations 2022-05-26 13:16:53 +03:00
03eaaf4b19 Files: added thirdparty rooms connection 2022-05-26 13:13:25 +03:00
597e121a95 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 15:08:52 +05:00
ba1b93d777 Web: People, Files: fixed banner display delay 2022-05-26 15:08:10 +05:00
Timofey Boyko
4f9cc695e3 Fix Bug 57339 - Client.Files.Upload.Dragndrop. The file does not load when dragging it to the left menu folder 2022-05-26 13:03:01 +03:00
29b3c61355 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 12:55:16 +03:00
2e021b107c Web: Files: fixed selected hover styles 2022-05-26 12:55:09 +03:00
5414a9b3df Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-26 12:10:16 +03:00
cfeca5f1d0 Web: Files: Badges: fix title 2022-05-26 12:09:49 +03:00
2b72a57115 Web: Files: added hover selection for tile folders 2022-05-26 12:05:29 +03:00
e7886aff2c Log: refactoring 2022-05-26 12:01:54 +03:00
ceeb190c0a Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-26 11:31:03 +03:00
7c7c12fe72 Web: Files: fixed horizontal scroll when file selected for mobile devices 2022-05-26 11:25:58 +03:00
cdf2acf313 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-26 10:27:31 +03:00
Timofey Boyko
8baead7b2c Fix Bug 57348 - Client.Files. fix layout for overwrite confirmation dialog 2022-05-26 10:09:47 +03:00
7d42847f60 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-25 20:05:01 +03:00
0bce8b6d17 edit translations 2022-05-25 18:41:16 +03:00
b13fd240ad Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-25 18:11:50 +03:00
903767b3e8 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	web/ASC.Web.Client/public/locales/ro/Error403.json
#	web/ASC.Web.Client/public/locales/ro/ErrorInvalid.json
#	web/ASC.Web.Client/public/locales/ro/Offline.json
2022-05-25 18:07:28 +03:00
83c5b3bd9e Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 18:02:18 +03:00
8612f14060 Web: Client: Fixed displaying page icon for creating page shortcut, fixed page display mode at manifest 2022-05-25 18:01:38 +03:00
Timofey Boyko
41e0f6fb5a Web:Files:Section: fix simple files row code format 2022-05-25 17:55:53 +03:00
e514f67cea edit translations 2022-05-25 17:51:59 +03:00
Timofey Boyko
e56f1c55e4 Web:Files:Section: fix horizontal scroll when drag and drop active 2022-05-25 17:30:49 +03:00
Timofey Boyko
ba28b13321 Web:Files/Common: fix section width on desktop 2022-05-25 17:24:55 +03:00
e01858d2e8 merge from develop 2022-05-25 16:58:31 +03:00
e6d7979e92 dbcontext: EnableRetryOnFailure for MySQL provider 2022-05-25 16:55:38 +03:00
2eee88dc99 Web: Files: fixed dragging styles 2022-05-25 16:28:57 +03:00
f6dd1a386b Fixed Bug 57346: Client: Files: Fixed opening version history window on mobile devices via context menu 2022-05-25 16:28:24 +03:00
Timofey Boyko
9f77e862d8 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 15:57:08 +03:00
7bfcddc043 Merge branch 'release/v1.2' into feature/smart-banner 2022-05-25 15:56:27 +03:00
6e3db60440 Web: Translations: Moved MoveToFolderMessage from OperationsPanel.json to Home.json (SingleKeyFilesTest issue fix) 2022-05-25 15:55:45 +03:00
8aa2052b31 Web: Files: add meta and icon for smart banner 2022-05-25 15:53:57 +03:00
Timofey Boyko
2a84281eb7 Web:Files:TableView: fix background for table row when drag and drop is active 2022-05-25 15:52:49 +03:00
a151611b42 Web: Files: fixed hover selection for mobile devices 2022-05-25 15:42:54 +03:00
664e718fa0 Files: added custom tags audit 2022-05-25 15:34:38 +03:00
94836dd2b5 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 14:17:42 +03:00
a5ed08b838 Fixed Bug 57338 - Client.HoveredRow. Added selection row on hover 2022-05-25 14:17:35 +03:00
be3bbf9188 Web: Client: Files: Fixed error on canceling cloud file/folder moving dialog 2022-05-25 12:33:08 +03:00
87b131c807 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 11:00:20 +03:00
032feddda8 Fix Bug 57218: oform edit icon 2022-05-25 10:59:55 +03:00
70a6a44196 Web: Client: Disable PWA feature for mobile devices 2022-05-25 10:53:39 +03:00
a66c03aa86 Merge branch 'develop' into feature/logger-refactoring
# Conflicts:
#	common/ASC.Common/Caching/AscCache.cs
#	common/ASC.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
#	common/ASC.Data.Storage/GlobalUsings.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
#	common/services/ASC.Notify/GlobalUsings.cs
#	common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
#	common/services/ASC.Notify/Services/NotifySenderService.cs
#	common/services/ASC.TelegramService/GlobalUsings.cs
#	common/services/ASC.TelegramService/TelegramHandler.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
2022-05-24 23:13:57 +03:00
948ddcf6a0 Web: Files: Tile: fix padding 2022-05-24 19:27:56 +03:00
b525696b03 fix usings 2022-05-24 18:41:28 +03:00
2a10ac929f edit translations 2022-05-24 18:41:22 +03:00
9581477d4e edit translations 2022-05-24 18:29:05 +03:00
02570e12cf Merge branch 'develop' into feature/cluster-services 2022-05-24 17:24:25 +03:00
8d9ee14ea6 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-24 16:49:36 +03:00
912f694b0d edit translations 2022-05-24 16:46:57 +03:00
f137a8904e Web: Files: InfoPanel: add missed prop 2022-05-24 16:42:05 +03:00
89ac1296e3 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-24 16:37:01 +03:00
7fb8c12d32 Web: Files: Removed removal of paths from the store for the backup module, otherwise the scroll to the selected folder does not work on the second opening. 2022-05-24 16:34:56 +03:00
b3fc8a3401 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-24 15:49:24 +03:00
37f10e7013 Web: Client: Files: Clouds Fixed default names for connected clouds 2022-05-24 15:49:15 +03:00
3ce78ed5a8 fix 57223 2022-05-24 15:22:25 +03:00
907d92fcb6 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-24 15:00:26 +03:00
bed0e0d324 edit translations 2022-05-24 14:57:37 +03:00
2be66344bd fix bug 57261 2022-05-24 14:47:44 +03:00
10b8f3ad13
Merge pull request #677 from ONLYOFFICE/feature/multiply-thumb
Feature/multiply thumb
2022-05-24 14:11:22 +03:00
mushka
fbbc98caca Revert "Bug 57230: InfoPanel now doesnt display root folder Properties"
This reverts commit 71d5d98ec1.
2022-05-24 13:40:28 +03:00
f9f36e96a3 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-24 13:28:17 +03:00
59d860b9b2 Web: Files: fixed hotkeys 2022-05-24 13:28:10 +03:00
ea4b14ac47 Merge branch 'release/v1.2' into feature/multiply-thumb 2022-05-24 12:29:49 +03:00
961a6ec536 Merge branch 'feature/multiply-thumb' of https://github.com/ONLYOFFICE/AppServer into feature/multiply-thumb 2022-05-24 12:29:35 +03:00
ea4bfc988b Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-24 11:48:21 +03:00
f51e96af1f Web: Files: Fixed not opening subfolders in the tree, added expanding the tree to the selected folder. Refactoring. (For the folder selection dialog in the backup module) 2022-05-24 11:46:37 +03:00
0466af6bbb Files: resize by width 2022-05-24 11:45:28 +03:00
Timofey Boyko
38e3aaa5c4 Web:Files:InfoPanel: fix import getCorrectDate util 2022-05-24 13:06:56 +08:00
Timofey Boyko
585a9e25a5 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-24 13:03:43 +08:00
Timofey Boyko
4fa93d8b1e Fix Bug 57273 - incorrect display of time in the info panel 2022-05-24 13:03:36 +08:00
Timofey Boyko
751c702509 Web:Files:HOCs: changed portal culture in getStatusByDate method for personal depend on the user locale and update this method with getCorrectDate util 2022-05-24 12:36:00 +08:00
d0f88846eb Web: Translations: Moved 'Version' key from VersionBadge.json to Home.json (new 'VersionBadge' key) and removed VersionBadge.json 2022-05-23 21:30:10 +03:00
8d3921eae9 Web: Translations: Removed keys: TitleDocuments, TitleSubfolders, More (UselessTranslationKeysTest issues fix) 2022-05-23 20:25:42 +03:00
13ad4381f7 Api: removed CustomHttpMethodAttribute
added AllowNotPaymentAttribute
2022-05-23 18:48:23 +03:00
d1494ca672 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-23 18:10:09 +03:00
df09f5e6b1 edit translations (SpellCheck) 2022-05-23 18:08:24 +03:00
a916b3ef69 update uk 2022-05-23 18:08:01 +03:00
Timofey Boyko
c8376ff508 Web:Files:TileView: hide desktop sorting in body for mobile size devices 2022-05-23 21:51:46 +08:00
3aa46cffa8 Web: Files: EditingWrapper: hide input 2022-05-23 16:32:49 +03:00
5d76f11b07 Web: Files: EditingWrapper: delete console log 2022-05-23 16:13:50 +03:00
b95ba16e2d Web: Files: fix tile border radius 2022-05-23 16:11:09 +03:00
864b8268a5 Web: Files: EditingWrapper: fix tile height 2022-05-23 15:39:13 +03:00
36a41e96aa Web: Files: Moved common code into function. 2022-05-23 15:31:17 +03:00
2b9131330c Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-23 15:19:07 +03:00
de0e722776 Fixed Bug 55045: Added scroll to current folder where file located in select folder dialog. 2022-05-23 15:15:39 +03:00
4e6cd1ad12 Web: Files: Banner: fix warning 2022-05-23 14:26:23 +03:00
dcc23ebbe5 Files: fix 2022-05-23 13:13:24 +03:00
mushka
e4eff11d28 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-23 12:34:52 +03:00
mushka
71d5d98ec1 Bug 57230: InfoPanel now doesnt display root folder Properties 2022-05-23 12:34:41 +03:00
5fa9c839e6 Files: fix 2022-05-23 12:29:14 +03:00
c9357da3b0 Files: added deleting tags, fix 2022-05-23 12:25:33 +03:00
196bbcc11b edit es 2022-05-23 11:57:52 +03:00
2ee9072ff5 update cs (Home) 2022-05-23 11:27:00 +03:00
44a600bee9 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-23 10:55:22 +03:00
9903f4c439 update cs, edit translations (spellCheck) 2022-05-23 10:55:02 +03:00
Timofey Boyko
9880b1659d Fix Bug 57228 - Client.Files.Share.Change the order of permission options in the list 2022-05-23 10:10:26 +03:00
8c68b9fb40 edit translations (SpellCheck) 2022-05-22 13:36:45 +03:00
6bc4035313 update translations 2022-05-21 15:25:14 +03:00
2e75100c52 update translations (Files) 2022-05-21 14:40:26 +03:00
ccf9b6285d Update translations (files) - pl 2022-05-20 20:54:21 +03:00
7b6abe81a2 Files: added custom tags 2022-05-20 19:26:13 +03:00
7493fe68e6 Merge branch 'release/v1.2' into bugfix/ReleaseBugfixes 2022-05-20 19:17:43 +03:00
182b482477
Merge pull request #671 from ONLYOFFICE/feature/update-translation-tests
Feature/update translation tests
2022-05-20 19:16:09 +03:00
b0dd87abde Update translations (files) - lv 2022-05-20 19:06:14 +03:00
4935dbc8cd Merge branch 'release/v1.2' into feature/update-translation-tests 2022-05-20 18:37:42 +03:00
27d2a98bd1 Merge branch 'feature/multiply-thumb' of https://github.com/ONLYOFFICE/AppServer into feature/multiply-thumb 2022-05-20 18:33:28 +03:00
91c4e454c5 add loggers 2022-05-20 18:24:41 +03:00
4c80a408df Files: fixed xlsx thumbnails 2022-05-20 18:24:32 +03:00
73083064ab Update translations (files) 2022-05-20 18:13:08 +03:00
4d21a1949a Web: Files: Fix annoying set thumbSize with same size (re-render issue fix) 2022-05-20 17:21:42 +03:00
04dcfb3d9a Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-20 17:11:37 +03:00
0b1b0280b0 Web:Files:Added isLoadingFilesFind, pageItemsLength, isHidePagination, setPageItemsLength to FilesStore. Added hiding pagination when deleting files.
Added a loader when searching for files when switching between pages.
2022-05-20 17:11:10 +03:00
75da995099 Merge branch 'develop' into feature/logger-refactoring 2022-05-20 17:01:51 +03:00
75b4f06c82 Fix Bug 57269: incorrect information in Size column 2022-05-20 16:40:49 +03:00
81dc197bcf Web: Files: Fix elementResizeDetector work for not first folder 2022-05-20 16:26:51 +03:00
fc4d8ceb3d Web: Files: Restored thumbnails cover in From Gallery 2022-05-20 16:25:40 +03:00
21d8d96e3c Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-20 16:23:57 +03:00
97fec09b0f Web: Files: fixed upload history when conversion single file 2022-05-20 16:23:51 +03:00
19d219ba84
Merge pull request #650 from ONLYOFFICE/feature/logger-Files.Core
Feature/logger files.core
2022-05-20 16:22:16 +03:00
be9c7ffd12 fix 2022-05-20 16:15:13 +03:00
99d82ee8d3 Fix Bug 57227: open media from upload folder 2022-05-20 15:27:45 +03:00