Commit Graph

8016 Commits

Author SHA1 Message Date
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
d2dfac2ed3 Web: RestoreBackup: Changed styles. 2022-02-08 10:32:20 +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
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
4661ee96d0 Packages updated 2022-02-02 19:54:23 +03:00
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00
445f03097d Fix content-type header 2022-01-24 22:44:18 +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
48897308d7 refactoring 2022-01-13 22:17:56 +03:00
6b883bcd60 Merge branch 'develop' into feature/support-elasticache 2022-01-13 18:16:43 +03:00
60c45e8c5e Web: Client: Wizard: Fixed issue with default portal language inside selector 2022-01-12 11:08:51 +03:00
efb51c613f refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
a7dc8c7dfd sync CommunityServer and AppServer cache via redis 2021-12-30 18:09:20 +03:00
9d43cb07ba Files: fix after merge 2021-12-28 18:40:42 +03:00
bedfad1ec5 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
eb02c96697 microsoft recomended store the System.Guid type as string type in protobuf format 2021-12-23 18:29:35 +03:00
6d250efffa add *.dll for support redis + update Grpc.* dll 2021-12-23 16:17:31 +03:00
440811e931 Web: Added convertLanguage for compatibility 2021-12-23 14:01:08 +03:00
3bf412166d Web: Settings: Commented old redux actions 2021-12-23 13:09:38 +03:00
919092e6c6 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-23 11:28:50 +03:00
9e24c182c9 edit ko 2021-12-23 11:22:48 +03:00
86e965d779 Web: Fix translations 2021-12-22 18:12:04 +03:00
1d49c9dc51 Web: Client: Fixed spelling errors 2021-12-21 20:25:59 +03:00
ff7b6fc432 Web: init e2e tests 2021-12-21 15:59:11 +08:00
156fbada6d edit translations bg 2021-12-16 17:13:44 +03:00
93cbab055c edit lo 2021-12-16 15:59:02 +03:00
6d84bd5f04 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-15 17:22:17 +03:00
e09f079052 Web: Editor: Fixed checking key`s existing inside config 2021-12-15 15:40:37 +03:00
0244c3b924 Web: Editor: Restored config as param 2021-12-15 15:07:25 +03:00
b5eeac9a47 edit translations 2021-12-14 12:43:10 +03:00
031af716e6 Tfa: fix 2021-12-10 21:25:03 +03:00
055c200b60 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-12-10 16:31:29 +03:00