Commit Graph

5348 Commits

Author SHA1 Message Date
2736a945dc Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-10 18:57:21 +03:00
fc8afde327 Fixed Bug 55449 - Client.Files. Fixed copying of file opened in editor. 2022-02-10 18:57:11 +03:00
a060c5954d WebL Files: Fix Bug 55397 - Client.Files. Open location menu on Folder 2022-02-10 17:19:21 +03:00
9025dcc0a3 Merge branch 'develop' into feature/backend-refactor 2022-02-10 16:55:19 +03:00
cd879ed2a7 ElasticSearch: used TimedHostedService template 2022-02-10 16:34:47 +03:00
77e14da218 fixed tests 2022-02-10 16:24:55 +03:00
402dedb49b ElasticSearch: private properties replaced by private fileds, used keyword readonly 2022-02-10 14:56:13 +03:00
320a1f2250 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/Caching/AscCache.cs
#	common/ASC.Common/Data/StreamExtension.cs
#	common/ASC.Common/Utils/RandomString.cs
#	common/ASC.Core.Common/Billing/CouponManager.cs
#	common/ASC.Core.Common/Billing/License/LicenseReader.cs
#	common/ASC.Core.Common/Core/UserGroupRef.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Notify/Jabber/JabberServiceClientWcf.cs
#	common/ASC.Core.Common/Notify/Telegram/Dao/CachedTelegramDao.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
#	common/ASC.Data.Storage/BaseStorage.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Notify.Textile/JabberStyler.cs
#	common/ASC.Textile/Blocks/GlyphBlockModifier.cs
#	common/ASC.Textile/States/TableRowFormatterState.cs
#	common/services/ASC.ApiSystem/Classes/CommonMethods.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	common/services/ASC.ClearEvents/Program.cs
#	common/services/ASC.TelegramService/Startup.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Core/Entries/File.cs
#	products/ASC.Files/Core/Core/Entries/FileEntry.cs
#	products/ASC.Files/Core/Core/Entries/FileHelper.cs
#	products/ASC.Files/Core/Core/Entries/Folder.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Helpers/ThirdpartyConfiguration.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	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/FileDataProvider.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/Files/DocumentService.cs
#	web/ASC.Web.Core/Files/DocumentServiceLicense.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Sms/SmsKeyStorage.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	web/ASC.Web.HealthChecks.UI/Program.cs
#	web/ASC.Web.Studio/Startup.cs
2022-02-10 13:16:33 +03:00
50137b8c12 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-10 11:25:12 +03:00
ef87651b3a Fixed Bug 55254 - Client.Files. Fixed the change of the cursor to the "palm" 2022-02-10 11:25:00 +03:00
caa4db9790 add new lines (Files-Home) 2022-02-10 11:10:35 +03:00
8220d23a10 Files: fixed response 2022-02-09 17:34:09 +03:00
b81b34fc99 Web: Files: FilesStore: Fixed folder check for selector 2022-02-09 16:47:57 +03:00
804c9c9547 Web: Locales: EN: Added translation for menu categories 2022-02-09 16:46:28 +03:00
5e47e0c184 Web: Files: HOC: Added model for context menu. Added multilevel menu for desktop view. 2022-02-09 16:45:09 +03:00
e66cb3d716 Fixed Bug 55412 - Client.Files. ‘Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'slice')’ when converting a file. 2022-02-09 16:25:26 +03:00
be6602b22a Fixed Bug 55242 - Mobile.Tablet.Client.Files. ‘Something went wrong’ when switching thumbnail view to normal view. Fixed table re-render 2022-02-09 15:46:38 +03:00
d54d3a938e Web: e2e-tests: Update tests screenshots 2022-02-08 19:41:50 +03:00
dc4ea0c6f8 Files: fixed put sharedlink method 2022-02-07 22:57:23 +03:00
b2079ccace fixed warnings 2022-02-07 20:19:58 +03:00
37c88dad50 Analyzers: fix 2022-02-07 18:10:27 +03:00
812241a69a Analyzers: fix 2022-02-07 17:53:58 +03:00
33c0e49705 add new file (Home) (de, es, fr, it, zh-CN, ro), update ja UploadPanel 2022-02-07 16:44:59 +03:00
7b33fab99f Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-07 16:24:08 +03:00
8250b774cd add new lines (UploadPanel), add new file (Home) (de, es, fr, it, zh-CN, ro) 2022-02-07 16:23:43 +03:00
0103dd1a3e Web: Files: fixed socketHelper connection after marge 2022-02-07 16:41:24 +05:00
b2e779d7d8 Merge branch 'feature/backend-refactor' into feature/asc-common-refactor 2022-02-04 23:27:29 +03:00
8a90ccc30b
Merge pull request #504 from ONLYOFFICE/feature/refactoring
Feature/refactoring
2022-02-04 22:42:16 +03:00
689723b6f2 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-04 21:02:31 +05:00
3e1a620f80 Web: Files: section optimization 2022-02-04 20:57:21 +05:00
Vashchuk Nikita
5aa99ec811 Merge branch 'develop' into feature/async
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/services/ASC.AuditTrail/AuditEventsRepository.cs
#	common/services/ASC.AuditTrail/LoginEventsRepository.cs
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
2022-02-04 16:04:52 +03:00
731cbc649b
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
2022-02-03 20:58:18 +03:00
973624c30b Merge branch 'feature/refactoring' into feature/asc-common-refactor 2022-02-03 17:30:13 +03:00
ce07a2f800 Merge branch 'feature/socket-io' of https://github.com/ONLYOFFICE/AppServer into feature/socket-io
# Conflicts:
#	products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
2022-02-03 15:10:40 +03:00
655ae73a65 Web: Files: Fix refresh last page on delete all items (+ socket refactoring) 2022-02-03 14:57:23 +03:00
Vashchuk Nikita
f4f7a406b1 fix 2022-02-03 14:52:14 +03:00
34dab043e0 Merge branch 'develop' into feature/analizators
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
2022-02-03 12:55:33 +03:00
668df4f5fe Files: fix 2022-02-03 12:44:27 +03:00
0dcdaf7f0e Files: fix 2022-02-03 12:41:30 +03:00
567e8495cb Files: fix 2022-02-03 12:32:37 +03:00
14a06f6150 Files: fix 2022-02-03 12:30:30 +03:00
d91e433ba4 Socket: methods "getroomname" moved to SocketManager.
Newtonsoft replaced with System.Text.Json
2022-02-03 12:26:39 +03:00
43e4f142d0 Revert "Web: files: Fixed last page operations."
This reverts commit fe1b57fb2c.
2022-02-03 11:02:45 +03:00
9c37c3a171 Merge branch 'feature/socket-io' of https://github.com/ONLYOFFICE/AppServer into feature/socket-io 2022-02-03 10:44:11 +03:00
0d478e43d0 Web: Files: Rewrite socket.io upload files process to client side 2022-02-03 10:44:03 +03:00
4661ee96d0 Packages updated 2022-02-02 19:54:23 +03:00
fe1b57fb2c Web: files: Fixed last page operations. 2022-02-02 15:17:03 +03:00
Artem Tarasov
6562e36a13
Merge pull request #502 from ONLYOFFICE/bugfix/fix-display-images-in-media-viewer
Bugfix/fix display images in media viewer
2022-02-02 14:55:38 +03:00
9e35b797ba Web:Files:Added removal of the isFirstUrl key from localStorage. 2022-02-02 14:20:29 +03:00
bb28679fdf analizators: bugfix 2022-02-02 14:05:06 +03:00
61b0b012ff Web: Files: removed min-width for Tile 2022-02-02 13:27:35 +03:00
f6620e34ae Merge branch 'develop' into feature/refactoring 2022-02-02 13:09:25 +03:00
6d6d0ef6d6 Files: fix StartConversion method 2022-02-01 21:12:56 +03:00
94dc14c7a1 Merge branch 'feature/socket-io' of https://github.com/ONLYOFFICE/AppServer into feature/socket-io 2022-02-01 18:07:31 +03:00
98ca84b1dc Web: Socket: Removed support of "create/delete folders" operations (too many issues on client side) 2022-02-01 18:07:23 +03:00
353eb82d88 Merge branch 'feature/socket-io' of github.com:ONLYOFFICE/AppServer into feature/socket-io 2022-02-01 17:57:33 +03:00
e05a95f06d Web: Files: fixed isEditing for dialogs 2022-02-01 17:57:16 +03:00
23eaa4be39 Common: private properties replaced with fields, used single line expressions, cosmetic 2022-02-01 17:51:29 +03:00
b4ac2c4e9f Merge branch 'feature/socket-io' of https://github.com/ONLYOFFICE/AppServer into feature/socket-io 2022-02-01 16:48:43 +03:00
bf01ee98d9 Web: Socket: Fixed adding a file to the same folder when moving/copying a file (when overwriting a file with the same name). 2022-02-01 15:29:24 +03:00
4bca2a87d2 Web: Files: Fixed page crash when copying. 2022-02-01 15:23:24 +03:00
f2c0f3ec77 Common: ICahcheNotify is reduced to IEventBus 2022-02-01 14:38:03 +03:00
bc63d972d1 Merge branch 'feature/socket-io' of https://github.com/ONLYOFFICE/AppServer into feature/socket-io 2022-02-01 10:43:03 +03:00
29930f244d Web:Files:Added setToPreviewFile to MediaViewer. Changed setToPreviewFile in MediaViewerDataStore. 2022-01-31 18:58:26 +03:00
2584fc4042 refactoring: remove waste 2022-01-31 18:15:43 +03:00
Vashchuk Nikita
2901d837a1 async methods for httpClient in ASC.Web 2022-01-31 17:35:36 +03:00
7ab885b2e2 refactoring: bugfix 2022-01-31 16:56:30 +03:00
f5653810eb add lo (ConvertPasswordDialog) 2022-01-31 16:52:38 +03:00
4aa2211af6 Web: Files: removed unused socketStore, fixed mobx warning 2022-01-31 16:37:39 +03:00
0874bd6157 Web: Files: Commented logs 2022-01-31 16:27:45 +03:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
a11d24db47 Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
2022-01-31 13:09:11 +03:00
b2de188cdc Web: Files: Added missing calls of socket 2022-01-31 12:57:14 +03:00
55612b6558 Web: Files: Added move folder by socket 2022-01-31 11:35:32 +03:00
b91348695e Web:Common:Changed props previewFile to isPreviewFile. Changed propTypes to boolean for isPreviewFile. Web:Files:Added onButtonBackHandler function. 2022-01-30 21:46:39 +03:00
73dcc81db4 refactoring: add globalusings: files.service 2022-01-30 00:37:07 +03:00
01b515cf84 Files: Refactoring of GetSocketRoom 2022-01-28 17:47:24 +03:00
101bd05ec7 fix bug 2022-01-28 17:42:11 +03:00
8add87820c Web:Files:Added isFirstUrl data to localStorage. Changed the condition for changing the url. 2022-01-28 16:34:15 +03:00
413b5373a2 Web: Files: Fix delete folder by socket 2022-01-28 16:28:40 +03:00
58aec95942 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-01-28 16:14:32 +03:00
22b4f9555b Fixed Bug 55056 - Client.Files. Added selection reset after drag and drop 2022-01-28 16:14:26 +03:00
155c5f20f2 Fixed Bug 55165 - Client.Files. The logic of saving changes in user actions has been changed. 2022-01-28 15:37:27 +03:00
57da2c739b Fixed Bug 55065 - Client.Files.Removed "Full access" rights for a file requiring conversion. 2022-01-28 13:45:22 +03:00
d81b941c36 Fixed Bug 55097 - Client.Files. Remove element of filter "Folders/Not subfolders" in Trash folder. 2022-01-28 11:16:29 +03:00
d01ae8b347 Web:Files:Added onChangeUrl function to MediaViewer. Added onpopstate event to add id to store MediaViewerData. 2022-01-27 18:48:52 +03:00
395b1a2e0b Web: Files: Added hide unpin article when select settings module. 2022-01-27 15:59:06 +03:00
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00
29f83f9cb7
Merge pull request #497 from ONLYOFFICE/bugfix/remove-loader-after-switch-modules
Removed loader after switch modules
2022-01-27 15:19:42 +03:00
672f456342 refactoring: add globalUsings: files.core 2022-01-27 14:28:54 +03:00
45313ba07f Web: Files: Fixed the length of the row separators according to the layout. 2022-01-27 13:54:33 +03:00
3f1b9c7a7a Merge branch 'hotfix/v1.1.1' into bugfix/remove-loader-after-switch-modules
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
2022-01-27 13:16:21 +03:00
bbef3fd2d0 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-01-27 12:43:00 +03:00
482c2270f2 Fixed Bug 55133 - Client.Files. ‘Uncaught (in promise) ReferenceError: deselectActiveFiles is not defined’. 2022-01-27 12:42:53 +03:00
d7cdb39ef7
Merge pull request #499 from ONLYOFFICE/bugfix/table-view-header
Bugfix/table view header
2022-01-27 12:35:39 +03:00
67cfb9bd9a Web: Files: Deleted useless code. 2022-01-27 12:24:41 +03:00
133bd65938 Web: Files: Removed state of begin scrolling. 2022-01-27 12:18:59 +03:00
36b4b64f3a Web: Socket: Added new methods CreateFolder, DeleteFolder 2022-01-27 11:42:57 +03:00
49b4da0269 Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-01-27 11:33:54 +03:00
cc6e7ec80a add translations for ConvertPasswordDialog (de, fr, it, es, ja, zh-CN) 2022-01-27 11:33:20 +03:00
a9bbbbabdc Fixed Bug53161 - Client.Files.Fixed table view header length. 2022-01-27 10:35:36 +03:00
4c6d130ea9 Web:Files:Added MediaViewer closing handling when the Close button is clicked. 2022-01-26 20:56:01 +03:00
6c62d3427e refactoring: add globalUsings: files 2022-01-26 16:04:06 +03:00
Dmitry Kulak
23fc1a7b46 Web: Files: Badges: Renamed VersionBadgeWrapper to BadgeWrapper 2022-01-26 15:16:45 +03:00
Dmitry Kulak
b25e0c75b0 Web: Files: Tiles: Added border on hover for ok/cancel buttons while renaming 2022-01-26 14:42:01 +03:00
Dmitry Kulak
926f0c6a2e Web: Files: Changed "shared" icon 2022-01-26 14:09:43 +03:00
0518fa7636 Fixed Bug 55056 - Client.Files. Added selection reset after dialog close. 2022-01-26 11:30:20 +03:00
2bfc182d1e Web: Files: fixed error notification 2022-01-26 11:28:40 +03:00
de1a88247a Web: Files: Removed loader when switch from settings module to files module. 2022-01-26 10:43:00 +03:00
ef6682ab32 Web:Files:Added check for open MediaViewer. Added checkURLchange function to MediaViewer. 2022-01-25 18:20:59 +03:00
07cbae407d Fixed Bug 55057 - Client.Files.Clouds. Fixed display provider dialog when drag’n’drop thirdparty files. 2022-01-25 17:19:42 +03:00
0a3d7a0dc4 Fixed Bug 55056 - Client.Files. Added reset selections. 2022-01-25 15:56:24 +03:00
6d17e0a37d Web: Files: Added opportunity to react on move/delete file on socket.io 2022-01-25 15:45:01 +03:00
Dmitry Kulak
0e6c866ca6 Web: Files: Badges: Extracted common Badge props to object 2022-01-25 14:24:27 +03:00
b03ac6d58f Fixed Bug 55062 - Client.Files. Renamed operation panel button. 2022-01-25 14:16:17 +03:00
Dmitry Kulak
a46ea93d32
Merge branch 'develop' into feature/redesign-tiles 2022-01-25 13:37:04 +03:00
509332fb23 Web: restored classNames for autotest after merge 2022-01-25 12:31:18 +03:00
Vashchuk Nikita
3e03f820bb async IDataStore 2022-01-25 12:29:11 +03:00
403704c9c1 Web: Files: Socket: Added new data parameter for "s:modify-folder" 2022-01-25 12:03:15 +03:00
7f31d3f19f
Merge pull request #494 from ONLYOFFICE/feature/refactoring-one-dbcontext-in-dao
used one dbcontext per service (per DAO). fixed error: System.Invalid…
2022-01-25 11:14:23 +03:00
Dmitry Kulak
67a749c7b3
Merge branch 'develop' into feature/redesign-tiles 2022-01-25 10:14:13 +03:00
445f03097d Fix content-type header 2022-01-24 22:44:18 +03:00
Dmitry Kulak
eb6573bea0 Web: Files: Badges: Renamed handleClick to onClick 2022-01-24 21:04:46 +03:00
eb75b0b32a Web: Files: Added opportunity to react on modify-folder with socket 2022-01-24 20:43:24 +03:00
Dmitry Kulak
8b6936265c Web: Files: Tiles: removed background while renaming 2022-01-24 17:17:58 +03:00
Dmitry Kulak
c70e17459b Web: Files: Tiles: Added wrapper for version and "New" badges, refactoring 2022-01-24 16:49:27 +03:00
cfb5705f60 edit Convert (fr, es, it, ro) 2022-01-24 16:45:11 +03:00
7bc5511cf7 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-01-24 16:19:01 +03:00
0cc9ce3f19 Web: Files: Deleted useless translation. 2022-01-24 16:18:25 +03:00
c29abf9119 Fixed Bug 54870 - Client.Files.Clouds.Drag’n’drop. Fixed 'itemOperationToFolder is not defined' error 2022-01-24 15:58:44 +03:00
b25f339c3e Merge branch 'hotfix/v1.1.1' into feature/socket-io 2022-01-24 15:43:04 +03:00
e6f92c3142
Merge pull request #493 from ONLYOFFICE/feature/convert-password
Feature/convert password
2022-01-24 15:03:55 +03:00
e865ee0c46 Fixed Bug 55056 - Client.Files. Removed the possibility of simultaneous operations with files. 2022-01-24 14:17:14 +03:00
83e7b1193b Web: Files: Fixed translation. 2022-01-24 14:03:29 +03:00
fce8d26cef analizators/ca1507 2022-01-24 13:49:00 +03:00
226dd96d0c Web: Files: Fixed translation. 2022-01-24 13:15:46 +03:00
d865a9602b Web: Files: Fixed floating button deletion if the floating button was displayed with a warning and the user tried to convert this file again. 2022-01-24 13:01:27 +03:00
fb3a61d0d2 analizators/s3442 2022-01-24 12:57:01 +03:00
7f707428f2 Web: Files: Added auto-focus when entering a password with an error. 2022-01-24 12:09:26 +03:00
Dmitry Kulak
dc7e3d78d0 Web: Files: Tiles: Changed font size for file and folder names 2022-01-24 10:54:29 +03:00
a36b5642e2 Web: Files: Added KeyDown support in the convert dialog with password. 2022-01-24 10:20:53 +03:00
9137620740 Web: Files: Added KeyDown support in the upload panel, added auto-focused property to the input. 2022-01-24 10:06:08 +03:00
ee2fd6bb0f Web:Files:Added a check for the absence of other pictures in the playlist for moving through the picture via a direct link in MediaViewer. 2022-01-21 19:21:29 +03:00
8d0324ee2a analizators/s2326 2022-01-21 16:59:17 +03:00
2abdb3fc21 Web: Files: Fixed button color, the button is disabled if the user has not entered a character. 2022-01-21 16:52:40 +03:00
Dmitry Kulak
83fd179e0a Web: Files: Tiles: Fix after merge 2022-01-21 16:51:59 +03:00
Dmitry Kulak
b740a4d00a Merge branch 'develop' into feature/redesign-tiles
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Server/DocStore
2022-01-21 16:47:39 +03:00
667697f933 analizators/s2259 2022-01-21 16:46:30 +03:00
4be25479fd used one dbcontext per service (per DAO). fixed error: System.InvalidOperationException: 'Cannot use multiple context instances within a single query execution. Ensure the query uses a single context instance.' 2022-01-21 16:45:50 +03:00
510bd4d731 analizators/s2219 2022-01-21 16:42:02 +03:00