IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,764 Commits 38 Branches 22 Tags 359 MiB
f75a56f594
Commit Graph

15764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vashchuk Nikita
f75a56f594 Merge branch 'feature/async' of github.com:ONLYOFFICE/AppServer into feature/async 2022-01-12 22:09:32 +03:00
Vashchuk Nikita
c74da79ba2 Merge branch 'develop' into feature/async 
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
 2022-01-12 22:07:21 +03:00
Vashchuk Nikita
c778bb6db3 fix 2022-01-12 17:13:56 +03:00
Ilya Oleshko
60c45e8c5e Web: Client: Wizard: Fixed issue with default portal language inside selector 2022-01-12 11:08:51 +03:00
Vashchuk Nikita
e6f3c19b6e added async to ISecurityDao 2022-01-11 16:15:18 +03:00
pavelbannov
5630e0b6bf Files: fix 2021-12-28 20:21:22 +03:00
pavelbannov
9d43cb07ba Files: fix after merge 2021-12-28 18:40:42 +03:00
AlexeySafronov
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
Vashchuk Nikita
0876c22f6f spreading async in Files 2021-12-28 18:15:29 +03:00
Vashchuk Nikita
6e4eff9ce3 added async to FileSecurity 2021-12-27 20:52:40 +03:00
Vashchuk Nikita
46a3630aa8 Merge branch 'feature/async' of github.com:ONLYOFFICE/AppServer into feature/async 
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Model/FolderContentWrapper.cs
 2021-12-27 20:41:10 +03:00
Alexey Safronov
14783ee105
Merge pull request #485 from ONLYOFFICE/release/v1.1.0 
Release/v1.1.0
 2021-12-27 20:39:18 +03:00
Vashchuk Nikita
9a86fe1062 async IFileSecurity 2021-12-24 14:46:27 +03:00
pavelbannov
7946cdfb21 Files: optimization 2021-12-24 13:43:19 +03:00
pavelbannov
5e088d3ba8 Jenkins: fix build 2021-12-23 21:54:42 +03:00
pavelbannov
44b227ba98 NLog: maxArchiveDays 2021-12-23 21:49:02 +03:00
AlexeySafronov
dc3c7b5e30 Fix Bug 54679 - Client.Profile. Failed to execute 'toDataURL' on 'HTMLCanvasElement': Tainted canvases may not be exported 2021-12-23 16:48:54 +03:00
Ilya Oleshko
dc7b2675f3 Web: Files: Store: Fixed bug with displaying "Save as oform" at Favorite/Recent folders 2021-12-23 16:29:21 +03:00
Ilya Oleshko
2ff6a871a3
Merge pull request #484 from ONLYOFFICE/feature/translate-1.1.0 
Feature/translate 1.1.0
 2021-12-23 15:52:21 +03:00
Vashchuk Nikita
c85bd19cf7 removed sync methods from Dao 2021-12-23 14:46:21 +03:00
AlexeySafronov
57d1d50f57 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-23 14:02:16 +03:00
AlexeySafronov
440811e931 Web: Added convertLanguage for compatibility 2021-12-23 14:01:08 +03:00
AlexeySafronov
31f03a430b Config: Restored old languages 2021-12-23 14:00:08 +03:00
AlexeySafronov
c899f4db3a Web: People: Fix selectedLanguage == undefined 2021-12-23 13:10:35 +03:00
AlexeySafronov
3bf412166d Web: Settings: Commented old redux actions 2021-12-23 13:09:38 +03:00
AlexeySafronov
33026385e2 Web: Tests: Added new excludes to spellcheck-excludes.json 2021-12-23 11:36:59 +03:00
AlexeySafronov
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
Maria-Sukhova
3c26c6cdfd edit az, vi, uk 2021-12-23 11:24:00 +03:00
Maria-Sukhova
ab931e40ef edit bg, az 2021-12-23 11:23:25 +03:00
Maria-Sukhova
9e24c182c9 edit ko 2021-12-23 11:22:48 +03:00
AlexeySafronov
cd56b02c8e Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-22 19:10:45 +03:00
TimofeyBoyko
e28744d69a Web:Tests: fix culture change before test start 2021-12-23 00:09:49 +08:00
AlexeySafronov
a785eb2692 Web: Tests: Added spellcheck-excludes.json and opportunity to skip some spell check issues 2021-12-22 18:17:22 +03:00
AlexeySafronov
48aa091786 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-22 18:12:12 +03:00
AlexeySafronov
86e965d779 Web: Fix translations 2021-12-22 18:12:04 +03:00
TimofeyBoyko
4688fcce41 Merge branch 'feature/translate-1.1.0' of github.com:ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-22 18:48:41 +08:00
TimofeyBoyko
b63d7d02f4 Web:Tests: close process when tests done 2021-12-22 18:45:53 +08:00
TimofeyBoyko
868332bb83 Web:Tests: add ability to ignore different cultures 2021-12-22 16:46:45 +08:00
TimofeyBoyko
b9d7141862 Web: rename e2e.test.bat to run.e2e.test.bat and translation.test.bat to run.e2e.translations.tests.bat 2021-12-22 16:42:37 +08:00
AlexeySafronov
1d49c9dc51 Web: Client: Fixed spelling errors 2021-12-21 20:25:59 +03:00
AlexeySafronov
05f5358fb9 Web: Tests: Fix some false alarms on SpellCheckTest 2021-12-21 20:18:37 +03:00
AlexeySafronov
33f9485230 Web: Tests: Skip some hashes for DublicatesFilesByMD5HashTest 2021-12-21 17:05:24 +03:00
AlexeySafronov
4274e3a581 Web: Tests: 
+ Added new SpellCheckTest() and submodule (common/Tests/Frontend.Translations.Tests/dictionaries)
+ Split tests on categories FastRunning|LongRunning
+ Added new build/run.translations.spellcheck.test.bat
 2021-12-21 16:59:04 +03:00
AlexeySafronov
649e1b420a Web: Tests: Added Md5Hash property 2021-12-21 16:12:37 +03:00
TimofeyBoyko
15f412e1a8 Web:Files:Tests: update codecept config 2021-12-21 18:24:28 +08:00
TimofeyBoyko
ff7b6fc432 Web: init e2e tests 2021-12-21 15:59:11 +08:00
pavelbannov
5091576d04 Files: IAsyncEnumerable 2021-12-20 14:13:31 +03:00
pavelbannov
7b0707ba16 Merge branch 'develop' into feature/async 
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
 2021-12-17 10:48:44 +03:00
Maria-Sukhova
656fa2df89 edit translations 2021-12-17 10:14:40 +03:00
Pavel Bannov
8fc08b8e61
Merge pull request #482 from ONLYOFFICE/feature/optimization 
Feature/optimization
 2021-12-16 18:34:00 +03:00