Commit Graph

16371 Commits

Author SHA1 Message Date
f354775332 Merge branch 'develop' into feature/backup 2022-02-09 13:42:11 +03:00
b6d98a8227
Merge pull request #516 from ONLYOFFICE/bugfix/U2U1100
Bugfix/u2u1100
2022-02-09 13:35:54 +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
0dbf561def Web: Files: AutoBackup: changed schedule styles. 2022-02-08 11:11:08 +03:00
0c73b7f366 Web: Files: AutoBackup: Changed styles. 2022-02-08 11:06:53 +03:00
7d4069a559 WEb: files: ManualBackup: Changed styles. 2022-02-08 10:52:00 +03:00
aac83608a2 Web: Files: SelectFolderDialog: Added missing prop. 2022-02-08 10:32:51 +03:00
d2dfac2ed3 Web: RestoreBackup: Changed styles. 2022-02-08 10:32:20 +03:00
b1be9953ad fixed solution build 2022-02-07 22:15:32 +03:00
08c6040787
Merge pull request #503 from ONLYOFFICE/feature/analizators
Feature/analizators
2022-02-07 20:27:17 +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
37c88dad50 Analyzers: fix 2022-02-07 18:10:27 +03:00
812241a69a Analyzers: fix 2022-02-07 17:53:58 +03:00
87b0931f54 Web: Files: RestoreBackup: Refactoring. 2022-02-07 17:27:07 +03:00
0f714ebd15 WEb: Files: RestoreBackup: Added logic for third party storage. 2022-02-07 16:37:05 +03:00
fd7528879d backup: bugfix 2022-02-07 13:57:00 +03:00
b47e1f0215 Web: files: Fixed upload method. 2022-02-07 13:22:19 +03:00
a3ffeadafe Web: Files: Added upload method. 2022-02-07 13:02:35 +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
6b89f94fbb Web: files: ManualBackup: Refactoring. 2022-02-06 20:15:27 +03:00
80dafc0815 Web: files: RestoreBackup: Refactoring. 2022-02-06 19:42:40 +03:00
988248fbfb Web: Files: AutoBackup: Refactoring modules. 2022-02-06 17:09:08 +03:00
f12949409c Web: files: AutoBackup: fixed radio button. 2022-02-06 17:08:29 +03:00
2f0677a532 Web: files: AutoBackup: Refactoring. 2022-02-06 16:36:45 +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
6ca6233125 Web: Files: AutoBackup: Deleted unnecessary request. 2022-02-04 13:40:22 +03:00
914c4d18af Web: files: AutoBackup: Moved reset module settings to separate function. 2022-02-04 13:38:15 +03:00
1fdb2b5d59 WEb: files: AutoBackup: Fix initial hour. 2022-02-04 13:32:02 +03:00
99ab37608d Web: Files: Fixed incorrect saving of the day of the week, refactoring. 2022-02-04 12:50:16 +03:00
077e81227e Web: files: AutoBackup: Refactoring, reset period settings moved to a separate function. 2022-02-04 11:55:13 +03:00
bd8d980f6c Web: Files: Fixed manual backup. 2022-02-03 16:12:12 +03:00
92ee0db2f3 Web: Files: Refactoring manual backup. 2022-02-03 15:21:12 +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
4661ee96d0 Packages updated 2022-02-02 19:54:23 +03:00
bb28679fdf analizators: bugfix 2022-02-02 14:05:06 +03:00
17cb4a647b analizators: bugfix 2022-01-31 14:35:59 +03:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
8428ef730c
Merge pull request #498 from ONLYOFFICE/feature/accessRightSelect
Feature/access right select
2022-01-28 13:00:47 +03:00
Yaroslavna Gaivoronyuk
fdec7246ec Merge branch 'feature/accessRightSelect' of github.com:ONLYOFFICE/AppServer into feature/accessRightSelect 2022-01-27 17:29:56 +03:00
Yaroslavna Gaivoronyuk
e068a183d1 update README.md 2022-01-27 17:29:39 +03:00
0c2085a168
Merge branch 'develop' into feature/accessRightSelect 2022-01-27 16:52:54 +03:00
Yaroslavna Gaivoronyuk
73c6bcb4f8 upd 2022-01-27 16:45:02 +03:00
Yaroslavna Gaivoronyuk
bb6c826b74 Merge branch 'feature/accessRightSelect' of github.com:ONLYOFFICE/AppServer into feature/accessRightSelect 2022-01-27 15:59:32 +03:00
Yaroslavna Gaivoronyuk
ee375307fb change props, upd story 2022-01-27 15:58:56 +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
4355430ccd
Merge branch 'develop' into feature/accessRightSelect 2022-01-27 12:09:53 +03:00