|
|
7000cd55f6
|
Merge branch 'develop' into refactoring/client
|
2022-08-01 15:59:18 +03:00 |
|
|
|
07e8e49579
|
Web: Fix Frontend.Translations.Tests run
|
2022-08-01 15:55:39 +03:00 |
|
|
|
fe5c8b0b13
|
fixed tests and tools
|
2022-07-29 20:23:19 +03:00 |
|
|
|
61ec4a18da
|
migrations moved to external projects
|
2022-07-24 16:02:00 +03:00 |
|
|
|
7af929fee8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# products/ASC.People/Server/Models/MemberModel.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-07-07 17:41:41 +03:00 |
|
|
|
0f901bf6e3
|
added hy-AM
|
2022-07-04 11:38:57 +03:00 |
|
|
|
630250b439
|
fix tests
|
2022-06-30 12:07:30 +03:00 |
|
|
|
e2cee2c2fc
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.FederatedLogin/OAuth20Token.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/ASC.Resource.Manager/Program.cs
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# config/appsettings.json
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/ThumbnailSettings.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/Model/SessionModel.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/DocStore
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Server/ASC.People.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-06-19 22:44:48 +03:00 |
|
|
|
b62ba1d729
|
fix tests
|
2022-06-17 10:17:17 +03:00 |
|
|
|
6624a7e7f6
|
Web: Translations: Added new excludes for DublicatesFilesByMD5HashTest
|
2022-06-10 12:33:17 +03:00 |
|
|
|
cd4540eaee
|
update spellcheck-excludes.json
|
2022-06-03 16:32:35 +03:00 |
|
|
|
9bc7e84eab
|
update spellcheck-excludes.json
|
2022-06-02 18:41:24 +03:00 |
|
|
|
a8f8ebdd48
|
update spellcheck-excludes.json
|
2022-06-02 13:20:53 +03:00 |
|
|
|
460d9e4ad5
|
update spellcheck-excludes.json
|
2022-05-31 18:36:08 +03:00 |
|
|
|
30b89d1ae0
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-30 17:18:53 +03:00 |
|
|
|
df35cef4a6
|
update spellcheck-excludes.json
|
2022-05-30 17:17:38 +03:00 |
|
|
|
bfdae07b28
|
Web: Translations: SpellCheck: Added support of additional dictionaries: lo_LA
|
2022-05-30 16:44:41 +03:00 |
|
|
|
d7967854d9
|
Web: Translations: SpellCheck: Added support of additional dictionaries: fi_FI
|
2022-05-30 15:45:31 +03:00 |
|
|
|
883391eff0
|
update spellcheck-excludes.json
|
2022-05-27 17:25:53 +03:00 |
|
|
|
0208f8f39d
|
update spellcheck-excludes.json
|
2022-05-27 16:13:35 +03:00 |
|
|
|
b0e8fd14dc
|
update spellcheck-excludes.json
|
2022-05-27 14:07:53 +03:00 |
|
|
|
918449e650
|
update spellcheck-excludes.json
|
2022-05-26 19:21:10 +03:00 |
|
|
|
2b076f1c50
|
update spellcheck-excludes.json
|
2022-05-26 14:59:22 +03:00 |
|
|
|
4946e04390
|
update spellcheck-excludes.json
|
2022-05-26 13:23:43 +03:00 |
|
|
|
9342b4e651
|
update spellcheck-excludes.json
|
2022-05-26 13:16:12 +03:00 |
|
|
|
6ad9a334ac
|
update spellcheck-excludes.json
|
2022-05-25 18:39:04 +03:00 |
|
|
|
83e6b48501
|
update spellcheck-excludes.json
|
2022-05-25 17:51:13 +03:00 |
|
|
|
1936498713
|
update spellcheck-excludes.json
|
2022-05-24 18:40:49 +03:00 |
|
|
|
a84cf572e4
|
update spellcheck-excludes.json
|
2022-05-24 18:27:49 +03:00 |
|
|
|
344d46ddae
|
update spellcheck-excludes.json
|
2022-05-24 16:01:12 +03:00 |
|
|
|
6e401cb7f9
|
update spellcheck-excludes.json
|
2022-05-24 14:59:50 +03:00 |
|
|
|
4adc4ce5b6
|
Web: Translations: Added new SingleKeyFilesTest
|
2022-05-23 21:34:14 +03:00 |
|
|
|
dade86cb3e
|
Web: Translations: Commented annoying TranslationsEncodingTest (too many false alarms)
|
2022-05-23 21:33:05 +03:00 |
|
|
|
5510a18e58
|
update spellcheck-excludes.json
|
2022-05-23 18:19:26 +03:00 |
|
|
|
78423fc7ca
|
update spellcheck-excludes.json
|
2022-05-23 18:09:47 +03:00 |
|
|
|
df001101d3
|
Web: Translations: Add exception for windows-1250
|
2022-05-13 19:40:01 +03:00 |
|
|
|
95891a21dd
|
Web: Translations: Add exception for FormGallery.json
|
2022-05-13 19:37:52 +03:00 |
|
|
|
f4727b411e
|
Test: fix
|
2022-05-13 18:08:30 +03:00 |
|
|
|
fdcdefc0ea
|
Web: Translations: Fix TranslationsEncodingTest issues (iso-8859-13)
|
2022-05-13 14:49:08 +03:00 |
|
|
|
14f25c2da7
|
Test: fix
|
2022-05-13 14:48:51 +03:00 |
|
|
|
2a5aa715e4
|
fix tests
|
2022-04-25 11:09:51 +03:00 |
|
|
|
88b59b1c30
|
refactoring
|
2022-04-22 16:24:54 +03:00 |
|
|
|
9eba173a44
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Model/CreateFileModel.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-04-21 22:36:29 +03:00 |
|
|
|
45d2a31d03
|
Merge branch 'feature/virtual-rooms-1.2' into feature/add-units
# Conflicts:
# public/locales/de/Common.json
|
2022-04-04 19:34:51 +03:00 |
|
|
|
696ffd7df1
|
Web: Translations: Tests: Extended DuplicatesFilesByMD5HashTest test method with external md5-excludes.json file
|
2022-03-10 15:11:04 +03:00 |
|
|
|
fe77e0a331
|
fix build
|
2022-03-01 13:36:34 +03:00 |
|
Timofey
|
154fdb4a81
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-02-14 18:54:34 +08:00 |
|
|
|
77e14da218
|
fixed tests
|
2022-02-10 16:24:55 +03:00 |
|
Timofey
|
f6e4cc4d71
|
Merge branch 'develop' into feature/new-filter-input
|
2022-02-09 19:54:11 +08: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 |
|
