Commit Graph

1611 Commits

Author SHA1 Message Date
e1116276eb backup: fix GetTasks 2022-02-10 14:12:28 +03:00
73f82b1f2a backup: bugfix: link = null 2022-02-10 13:05:36 +03:00
920d999052 backup: add "completed" in end restore and transfer 2022-02-10 11:02:28 +03:00
1acf512f87 backup: add in startup backupFileUpload.ashx 2022-02-10 11:01:51 +03:00
6f9d9e4617 backup: bugfix 2022-02-09 18:39:44 +03:00
540dcacbb2 People: fix model 2022-02-09 17:51:01 +03:00
6510927b20 backup: add api method enableAutoBackup 2022-02-09 17:39:02 +03:00
Timofey
f6e4cc4d71 Merge branch 'develop' into feature/new-filter-input 2022-02-09 19:54:11 +08:00
dd05be386b People: fixed simple wrapper 2022-02-09 14:08:00 +03:00
d27a33f08f People: added simple wrapper for getbyid method
fixed invite link
2022-02-09 14:05:21 +03:00
f354775332 Merge branch 'develop' into feature/backup 2022-02-09 13:42:11 +03:00
147377ab65 bugfix: crash when string == null 2022-02-09 13:32:01 +03:00
d429bcc731 Merge branch 'develop' into feature/backup 2022-02-09 12:40:16 +03:00
c62d42de80 Socket.IO: Move pingInterval and reconnectAttempts to config 2022-02-09 12:11:39 +03:00
9131e0c5d5 Socket.IO: Downgrade axios version (issue: Provided config url is not valid) 2022-02-09 11:08:57 +03:00
5528159f13 SocketIO: Added axios 2022-02-08 17:19:06 +03:00
b2079ccace fixed warnings 2022-02-07 20:19:58 +03:00
9f5a1f3ba7 Merge branch 'develop' into feature/analizators 2022-02-07 19:28:23 +03:00
812241a69a Analyzers: fix 2022-02-07 17:53:58 +03:00
fd7528879d backup: bugfix 2022-02-07 13:57:00 +03:00
40d56075f1 Merge branch 'develop' into feature/backup
# Conflicts:
#	common/ASC.Data.Backup.Core/EF/BackupsContext.cs
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Controllers/BackupController.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	products/ASC.Files/Client/public/locales/en/OperationsPanel.json
#	products/ASC.Files/Client/public/locales/en/Settings.json
#	products/ASC.Files/Client/public/locales/ru/Settings.json
#	products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/webpack.config.js
2022-02-07 12:40:50 +03:00
e16d75839a Merge branch 'develop' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into develop 2022-02-04 21:00:05 +03:00
eed733b83c fixed user photo thumbnail generator 2022-02-04 20:59:58 +03: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
014e344bb6 Socket.svc: Restored kill process on node died 2022-02-03 19:12:29 +03:00
00bb2821bc Socket.svc: Restored logPath Environment 2022-02-03 18:57:26 +03:00
655ae73a65 Web: Files: Fix refresh last page on delete all items (+ socket refactoring) 2022-02-03 14:57:23 +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
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
98ca84b1dc Web: Socket: Removed support of "create/delete folders" operations (too many issues on client side) 2022-02-01 18:07:23 +03:00
Vashchuk Nikita
2901d837a1 async methods for httpClient in ASC.Web 2022-01-31 17:35:36 +03:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
b7f0ffc9d2 cache: fixed memory cache notify 2022-01-27 15:35:11 +03:00
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00
36b4b64f3a Web: Socket: Added new methods CreateFolder, DeleteFolder 2022-01-27 11:42:57 +03:00
b4334b8947 analizators/Add HttpClient service 2022-01-25 13:47:36 +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
445f03097d Fix content-type header 2022-01-24 22:44:18 +03:00
eb75b0b32a Web: Files: Added opportunity to react on modify-folder with socket 2022-01-24 20:43:24 +03:00
b25f339c3e Merge branch 'hotfix/v1.1.1' into feature/socket-io 2022-01-24 15:43:04 +03:00
fce8d26cef analizators/ca1507 2022-01-24 13:49:00 +03:00
339614f1ee kafka: used only legal chars in topic name 2022-01-24 13:34:44 +03:00
0fcac47686 analizators/s3604 2022-01-24 13:01:19 +03:00
fb3a61d0d2 analizators/s3442 2022-01-24 12:57:01 +03:00
9292ba4eee analizators/s2589 2022-01-24 12:28:00 +03:00
9ad899e72a analizators/s1264 2022-01-24 12:27:43 +03:00
f3cc581047 analizators/bugfix 2022-01-24 11:41:44 +03:00
8d0324ee2a analizators/s2326 2022-01-21 16:59:17 +03:00
d86085d9f5 analizators/s2292 2022-01-21 16:57:22 +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
afb1f56641 backup: fixed startup backup as WindowsService https://github.com/dotnet/AspNetCore.Docs/issues/23387 2022-01-21 16:40:55 +03:00
cc53cd53e8 Analizators/s1939 2022-01-21 16:40:08 +03:00
f3d8b8d17a analizators/s1854 2022-01-21 16:36:36 +03:00
ca658e4b02 analizators/s1905 2022-01-21 16:23:25 +03:00
143f0a5dda Analizators/s1854 2022-01-21 16:22:56 +03:00
c05d9fe6bc analizators/s1450 2022-01-21 16:15:29 +03:00
fb65d3a09d analizators/1481 2022-01-21 16:15:15 +03:00
7c60d02bb4 analizators/s1643 2022-01-21 16:12:53 +03:00
3d635a4824 analizators/1643 2022-01-21 16:12:05 +03:00
2029c34f9c analizators/s1121 2022-01-21 14:02:17 +03:00
cd12b41cc6 analizators/s1125 2022-01-21 14:01:52 +03:00
df6fdd76cf
Merge branch 'develop' into component-tooltips 2022-01-21 13:57:21 +03:00
8863e41487 Elastic: fix ping 2022-01-21 13:56:23 +03:00
a0a1a1c50c Elastic: fix ping 2022-01-21 13:54:09 +03:00
473259657e analizators/s1118 2022-01-21 13:47:56 +03:00
775f05b32c
Merge branch 'develop' into component-tooltips 2022-01-21 12:56:08 +03:00
32c398c044 Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS 2022-01-21 12:53:29 +03:00
ae53ed0d62 analizators/s1117 2022-01-21 12:27:39 +03:00
728c1b896e analizators/s1104 2022-01-21 12:19:57 +03:00
34441d6335 Web: Moved some translations from Files to COMMON for asc-web-components 2022-01-21 11:49:16 +03:00
dd2c54ed86 Elastic: fix ping 2022-01-21 11:42:48 +03:00
fa10791720 Elastic: fix ping 2022-01-21 11:40:59 +03:00
0630a43b58 Elastic: fix ping 2022-01-21 11:26:25 +03:00
bf3b0395a5 analizators/s1116 2022-01-21 11:04:08 +03:00
7e919c9f83 Web: Tests: Fix translations test issues 2022-01-20 22:06:33 +03:00
4fdbef8781 Web: Tests: Fix UselessTranslationKeysTest issues on asc-web-components js-files 2022-01-20 18:22:20 +03:00
5f78b37e25 analizators/U2U1000 2022-01-20 12:28:48 +03:00
f956ad22fa analizators/s2223 2022-01-20 11:53:38 +03:00
bd8c47ff5d Web: Socket.IO: Update SocketIOClient 2022-01-20 10:44:20 +03:00
7e13b3a031 backup: refactoring 2022-01-19 19:25:10 +03:00
edd627ee23 analizators/s2696 2022-01-19 18:33:27 +03:00
f0dbdded9f analizators/s2692 2022-01-19 18:29:04 +03:00
f2e33fa4aa analizators/s2365 2022-01-19 18:16:59 +03:00
cbab9c4524 analizators/s2178 2022-01-19 17:16:34 +03:00
25050cb5fd analizators/s2223 2022-01-19 17:16:15 +03:00
547b78b72f analizators/2178 2022-01-19 16:36:03 +03:00
e046f6f8df analizators/s1006 2022-01-19 16:14:51 +03:00
85f1660b39 analizators/U2U1203 2022-01-19 13:46:21 +03:00
20b60958a8 analizators/U2U1022 2022-01-19 13:24:11 +03:00
a30b276711 analizators/U2U1015 2022-01-19 13:00:16 +03:00
fbb50e676e analizators/U2U1202 2022-01-19 12:51:30 +03:00
4b211c0b80 analizators/U2U1203 2022-01-19 12:14:50 +03:00
1403afbc16 analizators/U2U1209 2022-01-19 11:59:14 +03:00
Vashchuk Nikita
5b9668c14f ILinkDao, fix 2022-01-18 19:50:31 +03:00
07ebea5db8 backup: refactoring 2022-01-18 19:04:35 +03:00