IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,250 Commits 40 Branches 22 Tags 420 MiB
67902f2072
Commit Graph

395 Commits

Author SHA1 Message Date
SuhorukovAnton
d04484a2eb backup: add api "enablerestore" 2021-06-30 16:33:49 +03:00
TatianaLopaeva
db7954ee31 Merge branch 'develop' into feature/backup 2021-06-30 15:54:45 +03:00
pavelbannov
d59f9a2aa2 fixed urls 2021-06-23 20:12:50 +03:00
pavelbannov
0e6078f9e2 Merge branch 'develop' into feature/ClearEvents 
# Conflicts:
#	ASC.Web.sln
 2021-06-23 17:15:56 +03:00
Alexey Bannov
20d1f9a738 merge from develop 2021-06-23 16:10:46 +03:00
pavelbannov
c18adc50dc ClearEvents: fixed log and launch 2021-06-23 15:25:17 +03:00
pavelbannov
d8abde6d88 SSoAuth: fix buid and run 2021-06-22 19:44:09 +03:00
pavelbannov
912501a2f4 Healthcheck: fix apisystem 2021-06-22 19:09:24 +03:00
TatianaLopaeva
f340924612 Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2021-06-18 20:19:56 +03:00
TatianaLopaeva
ae17671043 Merge branch 'develop' into feature/backup 
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/store/SettingsSetupStore.js
 2021-06-18 18:08:38 +03:00
SuhorukovAnton
00cc15fbf5 Merge branch 'develop' into feature/ClearEvents 2021-06-18 12:21:54 +03:00
SuhorukovAnton
b6b88b2506 bug fix: exception when call "getbackuphistory" 2021-06-17 16:48:20 +03:00
pavelbannov
01639a56cc RazorCompileOnBuild:false< 
GenerateMvcApplicationPartsAssemblyAttributes:false
 2021-06-16 20:08:26 +03:00
pavelbannov
53ee0ef484 fixed warnings 2021-06-16 18:00:27 +03:00
Alexey Bannov
5fcbdbd7dd added health checks 2021-06-16 16:54:36 +03:00
pavelbannov
fc9d626bcc UrlShortenerService: fix log 2021-06-11 11:44:10 +03:00
TatianaLopaeva
0663ed7f16 Merge branch 'develop' into feature/backup 
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
 2021-06-10 11:56:32 +03:00
pavelbannov
8d80955686 Thumbnail: fix 2021-06-09 15:04:29 +03:00
TatianaLopaeva
6db87a3907 Backup: Fixed after merge. 2021-06-08 15:32:28 +03:00
TatianaLopaeva
3ef16948fc Merge branch 'develop' into feature/backup 
# Conflicts:
#	common/services/ASC.Data.Backup/Core/NotifyHelper.cs
#	products/ASC.Files/Client/public/locales/en/OperationsPanel.json
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
 2021-06-08 15:03:49 +03:00
SuhorukovAnton
c5fe4a9989 Merge branch 'develop' into feature/ClearEvents 2021-06-08 12:17:36 +03:00
SuhorukovAnton
860b682594 replace "DeleteOldEvents" in new service 2021-06-04 14:10:37 +03:00
pavelbannov
944966b67b WebSocker: repair service 2021-06-03 16:13:22 +03:00
pavelbannov
43de25b62a Merge branch 'develop' into feature/remove-unused-dep 
# Conflicts:
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
 2021-06-03 12:52:21 +03:00
Pavel Bannov
ceb19659f3
Merge pull request #264 from ONLYOFFICE/feature/thirdparty_for_two_frameworks 
Feature/thirdparty for two frameworks
 2021-06-03 12:19:27 +03:00
pavelbannov
3635905167 Backup: fixed link 2021-06-02 17:02:19 +03:00
pavelbannov
d741e91e96 Backup: fixed notify 2021-06-02 15:00:36 +03:00
pavelbannov
36bc5a4172 Backup: fix 2021-06-02 12:58:46 +03:00
pavelbannov
e9c5ca41ae fix 2021-06-02 11:26:58 +03:00
SuhorukovAnton
7fd550dfe8 Merge branch 'develop' into feature/thirdparty_for_two_frameworks 2021-06-01 17:49:10 +03:00
pavelbannov
76d8ebb459 Tests moved to separate projects. 
Removed unused dependepcies
 2021-06-01 12:21:51 +03:00
pavelbannov
d3fb9f8384 fix 2021-05-31 14:08:13 +03:00
pavelbannov
570ede7bba Merge branch 'develop' into feature/11.5.2 
# Conflicts:
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2021-05-31 13:32:51 +03:00
pavelbannov
0be4e07865 SsoAuth: 2e37dcd0 2021-05-31 11:35:42 +03:00
pavelbannov
527a650601 WebStudio: resources 2021-05-27 21:30:15 +03:00
pavelbannov
bda786f844 WebStudio: moved from 08a01422 2021-05-27 20:13:24 +03:00
pavelbannov
f6fbe33814 Web.Core: moved from 08a01422 2021-05-24 20:41:31 +03:00
pavelbannov
90c67cac13 ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422 2021-05-24 13:26:13 +03:00
pavelbannov
1b730233c9 ElasticSearch: moved from 08a01422 2021-05-23 19:11:25 +03:00
pavelbannov
c1b7ea5a9a Storage: moved from 08a01422 2021-05-21 16:26:42 +03:00
SuhorukovAnton
02da2a15d1 websocket for only net standart 2021-05-21 13:31:28 +03:00
pavelbannov
5d94113e23 Backup: fix 2021-05-19 11:31:50 +03:00
pavelbannov
8a3db93d0d Backup: moved from 08a01422 2021-05-17 21:27:39 +03:00
pavelbannov
a5c6ba5dcc Common, db: moved from 08a01422 2021-05-17 14:35:00 +03:00
pavelbannov
d01db1eed6 Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq 
# Conflicts:
#	common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
#	common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs
#	common/ASC.Data.Storage/Encryption/EncryptionWorker.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/services/ASC.Data.Backup/BackupAjaxHandler.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2021-05-13 11:57:40 +03:00
pavelbannov
6867ded281 Merge branch 'develop' into feature/remove-wq 
# Conflicts:
#	common/ASC.Common/DIHelper.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Common/Threading/Progress/ProgressQueue.cs
#	common/ASC.Common/Threading/Workers/WorkerQueue.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
 2021-05-13 11:23:44 +03:00
pavelbannov
0c7cbb6c99 removed unused newtonsoft.json 2021-05-06 12:20:37 +03:00
Alexey Bannov
0dbadc6394 from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects 2021-04-30 18:42:10 +03:00
Alexey Bannov
2d8b085d02 add support WindowsService/systemd for IHostBuilder 
listen unix socket if it setup for Kestrel Web Server
 2021-04-23 16:54:39 +03:00
Alexey Bannov
5f2998af87 refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00