a5268d3d8f
ElasticSearch: reordered methods according to access modifier, cosmetic changes
2022-02-10 16:14:03 +03:00
946fea8098
Merge pull request #507 from ONLYOFFICE/feature/asc-api-core-refactor
...
Feature/asc api core refactor
2022-02-10 15:52:35 +03:00
45d7c1d44e
ElasticSearch: removed 's' prefix
2022-02-10 15:42:49 +03:00
359d5efe8d
Storage: removed 's' prefix
2022-02-10 15:34:26 +03:00
d1b9e56c5d
BackupCore: removed 's' prefix
2022-02-10 15:29:49 +03:00
79532ea198
Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1
2022-02-10 15:23:37 +03:00
a06903129e
Common: removed 's' prefix
2022-02-10 15:14:50 +03:00
599b5b9a73
ApiCore: removed 's' prefix
2022-02-10 15:10:27 +03:00
402dedb49b
ElasticSearch: private properties replaced by private fileds, used keyword readonly
2022-02-10 14:56:13 +03:00
d3d2f85c3b
Fix: removed empty space from people product id
2022-02-10 14:30:30 +03:00
eea871d58e
Fix: removed empty space from people product id
2022-02-10 14:29:18 +03:00
4fa4411bf5
Reassings: IServiceProvider replaced by IServiceScopeFactory
2022-02-10 14:28:03 +03:00
cc8b1ca7c5
Storage: used file-scoped namespaces
2022-02-10 14:24:16 +03:00
41832fbd73
Storage: IServiceProvider replaced by IServiceScopeFactory
2022-02-10 14:19:51 +03:00
9156b40eb0
Storage: private properties replaced by private fields
2022-02-10 14:08:44 +03:00
7a12c6cb13
Storage: add braces
2022-02-10 14:06:37 +03:00
fca62cfa28
Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor
2022-02-10 14:01:51 +03:00
c20a470508
People: fix
2022-02-10 14:00:53 +03:00
5022501e58
Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor
...
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# common/ASC.Api.Core/Auth/CookieAuthHandler.cs
# common/ASC.Api.Core/Core/ApiContext.cs
# common/ASC.Api.Core/Core/ApiDateTime.cs
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Api.Core/Core/CustomHealthCheck.cs
# common/ASC.Api.Core/Middleware/ProductSecurityFilter.cs
# common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Api.Core/Routing/FormatRoute.cs
2022-02-10 13:56:54 +03:00
460d054156
Storage: reordered methods according to access modifier, cosmetic changes
2022-02-10 13:43:28 +03:00
320a1f2250
Merge branch 'develop' into feature/backend-refactor
...
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/Data/StreamExtension.cs
# common/ASC.Common/Utils/RandomString.cs
# common/ASC.Core.Common/Billing/CouponManager.cs
# common/ASC.Core.Common/Billing/License/LicenseReader.cs
# common/ASC.Core.Common/Core/UserGroupRef.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Notify/Jabber/JabberServiceClientWcf.cs
# common/ASC.Core.Common/Notify/Telegram/Dao/CachedTelegramDao.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
# common/ASC.Data.Storage/BaseStorage.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Notify.Textile/JabberStyler.cs
# common/ASC.Textile/Blocks/GlyphBlockModifier.cs
# common/ASC.Textile/States/TableRowFormatterState.cs
# common/services/ASC.ApiSystem/Classes/CommonMethods.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# common/services/ASC.ClearEvents/Program.cs
# common/services/ASC.TelegramService/Startup.cs
# common/services/ASC.UrlShortener.Svc/Program.cs
# products/ASC.Files/Core/Core/Entries/File.cs
# products/ASC.Files/Core/Core/Entries/FileEntry.cs
# products/ASC.Files/Core/Core/Entries/FileHelper.cs
# products/ASC.Files/Core/Core/Entries/Folder.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Helpers/ThirdpartyConfiguration.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# 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/FileDataProvider.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/Files/DocumentService.cs
# web/ASC.Web.Core/Files/DocumentServiceLicense.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Sms/SmsKeyStorage.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# web/ASC.Web.HealthChecks.UI/Program.cs
# web/ASC.Web.Studio/Startup.cs
2022-02-10 13:16:33 +03:00
feb147590f
Storage: privare properties replaced by private fields, used keyword readonly
2022-02-10 12:36:42 +03:00
8866ec8496
Reassigns: cosmetic changes
2022-02-10 11:44:59 +03:00
48ca316b56
Reassigns: add braces
2022-02-10 11:42:03 +03:00
dfce1fea42
Reassigns: private property replaced by private fields, used readoonly keyword
2022-02-10 11:38:35 +03:00
50137b8c12
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
2022-02-10 11:25:12 +03:00
ef87651b3a
Fixed Bug 55254 - Client.Files. Fixed the change of the cursor to the "palm"
2022-02-10 11:25:00 +03:00
c9042a4417
Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1
2022-02-10 11:11:24 +03:00
caa4db9790
add new lines (Files-Home)
2022-02-10 11:10:35 +03:00
fe80ccb0a4
BackupCore: removed unused fields
2022-02-10 10:49:04 +03:00
5c9336d50b
Bugfix/update OneClickInstall ( #505 )
...
* Add document server image configuration
* Modify docker document server run config (#476 )
* Changing the files installation
* Add an update to Docker-1click
* Minor changes
* Fix mysql installation
* Change the kafka installation
* Update kafka version
* Download sql scripts
2022-02-10 10:37:09 +03:00
85f9055eb2
BackupCore: used file-scoped namespaces
2022-02-09 21:49:52 +03:00
0fc1f2f67b
BackupCore: IServiceProvider replaced by IServiceScopeFactory
2022-02-09 21:43:11 +03:00
bfbebf9733
BackupCore: cosmetic changes
2022-02-09 21:33:50 +03:00
dfce143db0
BackupCore: add braces
2022-02-09 19:46:09 +03:00
b3acf9ac9a
BackupCore: private properties replaced by with private fields, used keyword readonly
2022-02-09 19:29:19 +03:00
dd51f8ac36
BackupCore: removed empty lines
2022-02-09 18:27:14 +03:00
d2e4ecff45
Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1
2022-02-09 17:57:08 +03:00
8220d23a10
Files: fixed response
2022-02-09 17:34:09 +03:00
b81b34fc99
Web: Files: FilesStore: Fixed folder check for selector
2022-02-09 16:47:57 +03:00
804c9c9547
Web: Locales: EN: Added translation for menu categories
2022-02-09 16:46:28 +03:00
5e47e0c184
Web: Files: HOC: Added model for context menu. Added multilevel menu for desktop view.
2022-02-09 16:45:09 +03:00
e66cb3d716
Fixed Bug 55412 - Client.Files. ‘Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'slice')’ when converting a file.
2022-02-09 16:25:26 +03:00
be6602b22a
Fixed Bug 55242 - Mobile.Tablet.Client.Files. ‘Something went wrong’ when switching thumbnail view to normal view. Fixed table re-render
2022-02-09 15:46:38 +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
ba9cbf811b
Web: SW: Fix unregister on undefined
2022-02-09 12:33:09 +03:00
c62d42de80
Socket.IO: Move pingInterval and reconnectAttempts to config
2022-02-09 12:11:39 +03:00
caff06ab95
Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1
2022-02-09 11:11:26 +03:00
9131e0c5d5
Socket.IO: Downgrade axios version (issue: Provided config url is not valid)
2022-02-09 11:08:57 +03:00