|
|
2cba76f838
|
backup: add "backupFileUpload.ashx"
|
2021-11-19 12:43:54 +03:00 |
|
|
|
01879779cd
|
Merge branch 'develop' into feature/backup
|
2021-10-04 15:21:45 +03:00 |
|
|
|
1bc64ce5ae
|
Files: check state before get stream
|
2021-09-30 09:51:38 +03:00 |
|
|
|
aa6c02b190
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# packages/asc-web-common/api/settings/index.js
# packages/asc-web-common/components/PrivateRoute/index.js
# packages/asc-web-common/store/SettingsStore.js
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/ru/SelectFile.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.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.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/Shell.jsx
|
2021-09-20 16:26:34 +03:00 |
|
|
|
d099326e7f
|
Merge branch 'develop' into feature/backup.core
# Conflicts:
# common/services/ASC.Data.Backup/Program.cs
|
2021-09-05 12:50:05 +03:00 |
|
|
|
9cb01be544
|
Elastic: removed unused isInit
|
2021-09-03 18:05:05 +03:00 |
|
|
|
d78195aa5a
|
Added notify
|
2021-09-03 18:04:06 +03:00 |
|
|
|
c5b135afbe
|
backup.core: remove waste
|
2021-09-02 16:11:41 +03:00 |
|
|
|
8171563965
|
backup.core: move backup.core
|
2021-09-02 15:41:54 +03:00 |
|
|
|
d8654444c6
|
backup.core: fix
|
2021-08-31 16:59:32 +03:00 |
|
|
|
115d752582
|
backup.core: fix
|
2021-08-31 15:43:40 +03:00 |
|
|
|
a812971c07
|
Merge branch 'develop' into feature/backup.core
|
2021-08-31 13:55:47 +03:00 |
|
|
|
4b3cb1b4fb
|
backup.core: first version
|
2021-08-31 12:40:28 +03:00 |
|
|
|
a84bddad3c
|
fix
|
2021-08-30 19:17:57 +03:00 |
|
|
|
e5faa90adb
|
removed nuget warnings
|
2021-08-20 16:53:27 +03:00 |
|
|
|
cf87addaa3
|
Security: added new method
|
2021-08-18 17:04:16 +03:00 |
|
|
|
9aafaa21ea
|
Merge pull request #319 from ONLYOFFICE/feature/log
Feature/log
|
2021-08-12 15:00:53 +03:00 |
|
|
|
87b7e171de
|
ApiSystem: fix
|
2021-08-11 21:32:43 +03:00 |
|
|
|
643b7b66dc
|
Optimization: removed autofac ILifetimeScope
|
2021-08-10 17:56:38 +03:00 |
|
|
|
39f77c5352
|
Backup: fix
|
2021-08-10 11:36:07 +03:00 |
|
|
|
546c1872a3
|
Added asp logging
|
2021-08-08 16:19:54 +03:00 |
|
|
|
672de09a90
|
NLog: up to 4.7.10
|
2021-08-08 15:55:27 +03:00 |
|
|
|
44847c1e8f
|
backend: change TargetFramework from netstandard2.1 to net5.0
|
2021-08-06 18:37:22 +03:00 |
|
|
|
e86124cbdd
|
Elastic: fixed search by content
|
2021-08-04 13:08:12 +03:00 |
|
|
|
6fbdaf0d31
|
Calendar: post-merge fixes
|
2021-07-27 16:09:30 +03:00 |
|
|
|
f1668a3b43
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
|
2021-07-27 12:43:01 +03:00 |
|
|
|
913c67a818
|
Elastic: fixed create scope
|
2021-07-22 12:11:39 +03:00 |
|
|
|
8c78fa4a17
|
Feed: fix TenantManager
|
2021-07-22 11:56:52 +03:00 |
|
|
|
2d75554b0d
|
DbContext: optimization
|
2021-07-15 13:07:47 +03:00 |
|
|
|
b184ad7898
|
Log: fix configuring
|
2021-07-14 11:00:59 +03:00 |
|
|
|
ad57feecd8
|
Log: fix configuring
|
2021-07-13 21:17:18 +03:00 |
|
|
|
d04484a2eb
|
backup: add api "enablerestore"
|
2021-06-30 16:33:49 +03:00 |
|
|
|
db7954ee31
|
Merge branch 'develop' into feature/backup
|
2021-06-30 15:54:45 +03:00 |
|
|
|
d59f9a2aa2
|
fixed urls
|
2021-06-23 20:12:50 +03:00 |
|
|
|
0e6078f9e2
|
Merge branch 'develop' into feature/ClearEvents
# Conflicts:
# ASC.Web.sln
|
2021-06-23 17:15:56 +03:00 |
|
|
|
20d1f9a738
|
merge from develop
|
2021-06-23 16:10:46 +03:00 |
|
|
|
c18adc50dc
|
ClearEvents: fixed log and launch
|
2021-06-23 15:25:17 +03:00 |
|
|
|
d8abde6d88
|
SSoAuth: fix buid and run
|
2021-06-22 19:44:09 +03:00 |
|
|
|
912501a2f4
|
Healthcheck: fix apisystem
|
2021-06-22 19:09:24 +03:00 |
|
|
|
f340924612
|
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
|
2021-06-18 20:19:56 +03:00 |
|
|
|
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 |
|
|
|
00cc15fbf5
|
Merge branch 'develop' into feature/ClearEvents
|
2021-06-18 12:21:54 +03:00 |
|
|
|
b6b88b2506
|
bug fix: exception when call "getbackuphistory"
|
2021-06-17 16:48:20 +03:00 |
|
|
|
01639a56cc
|
RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
|
2021-06-16 20:08:26 +03:00 |
|
|
|
53ee0ef484
|
fixed warnings
|
2021-06-16 18:00:27 +03:00 |
|
|
|
5fcbdbd7dd
|
added health checks
|
2021-06-16 16:54:36 +03:00 |
|
|
|
fc9d626bcc
|
UrlShortenerService: fix log
|
2021-06-11 11:44:10 +03:00 |
|
|
|
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 |
|
|
|
8d80955686
|
Thumbnail: fix
|
2021-06-09 15:04:29 +03:00 |
|
|
|
6db87a3907
|
Backup: Fixed after merge.
|
2021-06-08 15:32:28 +03:00 |
|
