Commit Graph

40 Commits

Author SHA1 Message Date
7d233d9a2d Files: Fix s:stop-edit-file wrong file data (rootFolderType always SHARE) 2022-04-13 11:53:01 +03:00
3cfb10d4d2 Socketio: fix 2022-02-23 17:08:00 +03:00
3aeac42444 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
#	common/services/ASC.ElasticSearch/Service/Settings.cs
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
#	common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
#	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
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	packages/asc-web-components/table-container/TableRow.js
#	products/ASC.Files/Client/public/locales/az/Home.json
#	products/ASC.Files/Client/public/locales/bg/Home.json
#	products/ASC.Files/Client/public/locales/bg/Translations.json
#	products/ASC.Files/Client/public/locales/cs/Home.json
#	products/ASC.Files/Client/public/locales/de/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/de/Home.json
#	products/ASC.Files/Client/public/locales/de/Translations.json
#	products/ASC.Files/Client/public/locales/de/UploadPanel.json
#	products/ASC.Files/Client/public/locales/el/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/el/Home.json
#	products/ASC.Files/Client/public/locales/en/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/en/Home.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/en/UploadPanel.json
#	products/ASC.Files/Client/public/locales/es/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/es/Home.json
#	products/ASC.Files/Client/public/locales/es/UploadPanel.json
#	products/ASC.Files/Client/public/locales/fi/Home.json
#	products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/fr/Home.json
#	products/ASC.Files/Client/public/locales/fr/Translations.json
#	products/ASC.Files/Client/public/locales/it/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/it/Home.json
#	products/ASC.Files/Client/public/locales/it/Translations.json
#	products/ASC.Files/Client/public/locales/it/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ja/Home.json
#	products/ASC.Files/Client/public/locales/ja/UploadPanel.json
#	products/ASC.Files/Client/public/locales/lv/Home.json
#	products/ASC.Files/Client/public/locales/nl/Home.json
#	products/ASC.Files/Client/public/locales/nl/Translations.json
#	products/ASC.Files/Client/public/locales/pl/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/pt-BR/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/Translations.json
#	products/ASC.Files/Client/public/locales/ro/Home.json
#	products/ASC.Files/Client/public/locales/ro/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/ru/Home.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/public/locales/ru/UploadPanel.json
#	products/ASC.Files/Client/public/locales/sk/Home.json
#	products/ASC.Files/Client/public/locales/tr/Home.json
#	products/ASC.Files/Client/public/locales/uk/Home.json
#	products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/vi/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
#	products/ASC.Files/Client/src/HOCs/withBadges.js
#	products/ASC.Files/Client/src/HOCs/withContent.js
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/EditingWrapperComponent.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	public/locales/de/Common.json
2022-02-21 22:22:38 +03:00
fecb7d5e37 Fix Bug 49777 - Docs. The version icon does not appear next to the file name after it has been created and edited. 2022-02-10 19:49:44 +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
36b4b64f3a Web: Socket: Added new methods CreateFolder, DeleteFolder 2022-01-27 11:42:57 +03:00
403704c9c1 Web: Files: Socket: Added new data parameter for "s:modify-folder" 2022-01-25 12:03:15 +03:00
eb75b0b32a Web: Files: Added opportunity to react on modify-folder with socket 2022-01-24 20:43:24 +03:00
728c1b896e analizators/s1104 2022-01-21 12:19:57 +03:00
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
4155f911c0 analizators/U2U1025 2022-01-13 14:19:39 +03:00
66cf28ba29 analizators/U2U1100 2022-01-12 18:42:03 +03:00
f8035967b5 Web: Socket: Changed room settings 2021-12-30 15:54:23 +03:00
a40b06648a analizators/s3963 2021-12-28 19:01:12 +03:00
657961c334 Web: Socket: Implemented "stop editing" + refactoring 2021-12-24 20:58:38 +03:00
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
735a9b60cf net6: warning CA1416
also remove unnecessary usings
2021-10-13 11:07:03 +03:00
ae9a3187bc net6: warning SYSLIB0014 2021-10-12 13:14:33 +03:00
51f1f92307 Scope: refactoring. 2020-10-28 15:26:27 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
89df700fb1 Files: fix 2020-09-25 13:47:21 +03:00
dd80e300d0 Common, Core.Common moved from release/11 4414f77b 2020-09-15 16:11:05 +03:00
f837b3aa24 Merge branch 'master' into feature/socket.io
# Conflicts:
#	ASC.Web.sln
2020-08-19 19:53:13 +03:00
SuhorukovAnton
645b07b511 socket: bagfix 2020-08-14 13:56:15 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
785cc4c5a3 Files: DI 2020-02-13 18:12:27 +03:00
3c23e2f4a7 Files: DI 2020-02-07 13:29:16 +03:00
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00
75285dfc69 DI: configuration 2019-10-10 13:59:22 +03:00
dec4bb266e DI: configuration 2019-09-24 13:32:12 +03:00
4e2c04c9f7 DI: TenantManager 2019-09-17 15:42:32 +03:00
9e32ad4b6c IDE0063 2019-08-15 18:08:40 +03:00
f8f2c94962 IDE0034 2019-08-15 16:00:20 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
5c0943f2dd Added custom ConfigurationManager instead of system 2019-05-17 18:27:52 +03:00
92ed33906c init commit 2019-05-15 17:56:09 +03:00