34232bc735
Files: removed oformservice
2022-08-23 16:34:54 +03:00
2e85702127
Settings: version. CommunityServer replaced with DocSpace
2022-08-19 16:34:39 +03:00
5b8374daa0
refactoring
2022-08-18 19:00:22 +03:00
f2da6fc55c
Merge pull request #693 from ONLYOFFICE/feature/docspace
...
Feature/docspace
2022-06-22 11:55:36 +04:00
b78feb8ae9
refactoring
2022-06-21 12:57:20 +03:00
e68ac70005
Merge branch 'develop' into feature/docspace
2022-06-20 12:15:08 +03:00
9f45f8994b
fix config
2022-06-20 11:31:32 +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
56ece27e1b
moved from ddf515b8
2022-06-16 17:16:46 +03:00
3e133836c6
Fix Bug 57535 - Client.OformsGallery. 404 error on not 'en' language
2022-06-16 15:43:46 +03:00
f3f3ed96ae
moved from ddf515b8
2022-06-15 12:46:21 +03:00
02635e0e2e
fix bug 57535
2022-06-14 11:33:12 +03:00
b693779ea1
Merge branch 'develop' into feature/docspace-pin
2022-06-08 16:38:16 +03:00
832a341306
fix Bug 57478
2022-06-08 13:48:28 +03:00
a66c03aa86
Merge branch 'develop' into feature/logger-refactoring
...
# Conflicts:
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/GlobalUsings.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Storage/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
# common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
# common/services/ASC.Notify/GlobalUsings.cs
# common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
# common/services/ASC.Notify/Services/NotifySenderService.cs
# common/services/ASC.TelegramService/GlobalUsings.cs
# common/services/ASC.TelegramService/TelegramHandler.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
2022-05-24 23:13:57 +03:00
75da995099
Merge branch 'develop' into feature/logger-refactoring
2022-05-20 17:01:51 +03:00
f2ede4c62c
Web: Files: Applied changes of new thumbnail sizes
2022-05-19 15:19:51 +03:00
9886081a2e
Thumbnailы: added sizes config
2022-05-18 17:23:17 +03:00
fbdef62782
fix audit
2022-05-15 23:19:11 +03:00
fc7f066af6
config: Turned on new languages az,cs,el,es,ja,lo,nl,pt,ro,sk,tr,vi,bg,fi,ko,lv,pl,sl,uk,zh-CN
2022-05-05 16:47:34 +03:00
07909736c3
Merge branch 'develop' into feature/docspace
2022-04-29 16:49:18 +03:00
cf0e9c322d
ElasticSearch: fix
2022-04-29 16:17:52 +03:00
503672e6b2
Merge branch 'develop' into feature/docspace
2022-04-28 15:45:09 +03:00
b6fe254379
Files: docspace default enabled
2022-04-28 12:40:17 +03:00
89059cf32e
Structured Logging
2022-04-28 12:15:33 +03:00
7770cba4f6
Files: set default value for DocSpace
2022-04-20 11:26:52 +03:00
3380e87811
Files: oforms gallery manager
2022-04-20 10:34:33 +03:00
8292795d8c
Files: added root folders filter
2022-04-10 15:30:46 +03:00
6b8630f16f
Files: added docspace config parameter
2022-04-10 14:34:22 +03:00
406c07d8af
Config: Restored formatting
2022-04-06 21:25:10 +03:00
22181e08d7
Web: Files: Restore thumbnail-image cover and increased thumbnaillHeight and thumbnaillWidth for Info Panel
2022-04-06 21:08:08 +03:00
mushka
5a5237d927
fixed ad bar sizing with InfoPanel open & redesigned thumbnail scaling
2022-04-04 17:40:45 +03:00
75bd270037
Web: Files: Fix thumbnails: increased size and replaced 'resize' to real size
2022-03-29 22:03:11 +03:00
e810605a4d
Web: Socket: Fix proxy ws by web:hub:url (appsettings.json)
2022-01-25 12:54:21 +03:00
31f03a430b
Config: Restored old languages
2021-12-23 14:00:08 +03:00
8538b55dfc
Web: Turned on all languages
2021-12-09 21:45:10 +03:00
dec07c931c
moved from d50a38db
2021-11-29 18:40:22 +03:00
1a282c2073
Config: Extra comma removed
2021-11-17 16:35:22 +03:00
cc35174d16
moved from 043e301
2021-11-16 20:40:15 +03:00
5d3d8f4d45
Web: Changed opportunity to show/hide DebugInfo to appsettings.json param "debug-info:enabled" and 'api/2.0/settings.json'
2021-10-05 11:13:38 +03:00
bd9492b533
fixed version number
2021-09-24 11:06:57 +03:00
7e249a170e
removed socketio config
2021-08-12 15:58:56 +03:00
5d840f65b1
DB: fix connection string
2021-08-10 11:03:11 +03:00
e81c3df0be
Added displaying version from appsettings.json (api/2.0/settings.json)
2021-07-14 17:31:06 +03:00
2950f72bb8
Config: Restored appsettings config
2021-07-09 19:23:56 +03:00
b4c4625f3f
Moved getting firebase config to API method /api/2.0/settings.json
2021-07-09 18:28:08 +03:00
e43445cb2d
Config: Enabled personal mode in appsettings.json
2021-06-02 16:17:23 +03:00
d3e30eeb6c
Config: Setup cultures
2021-06-01 20:11:01 +03:00
7ae9b19412
Web: Turn on new languages >= 78%
...
1. Language 'de' translated by '90%'
2. Language 'fr' translated by '54%'
3. Language 'it' translated by '78%'
4. Language 'lo' translated by '78%'
5. Language 'pt-BR' translated by '78%'
6. Language 'ro' translated by '78%'
7. Language 'ru' translated by '99%'
8. Language 'sk' translated by '19%'
9. Language 'en' translated by '100%'
2021-06-01 13:25:41 +03:00
85bd971735
Merge branch 'develop' into feature/translations
2021-05-14 12:07:48 +03:00
