|
433c684d09
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 12:08:50 +03:00 |
|
|
95959317a2
|
fix
|
2022-04-11 10:38:00 +03:00 |
|
|
6b8630f16f
|
Files: added docspace config parameter
|
2022-04-10 14:34:22 +03:00 |
|
|
b29cf754e1
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-07 16:20:18 +03:00 |
|
|
16d4e1565a
|
fix
|
2022-04-07 14:53:40 +03:00 |
|
|
1b8be6f95c
|
fix
|
2022-04-07 14:41:37 +03:00 |
|
|
f9da8e4026
|
iprestrictions
fix Verify
add check enable
add api method
|
2022-04-07 13:19:30 +03:00 |
|
|
a502c4ee52
|
IPRestrictionsRepository: fixed saving data
|
2022-04-07 08:41:58 +03:00 |
|
|
7d1ccbdc15
|
remove distributed_task_cache.proto from projects
|
2022-04-05 13:14:44 +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 |
|
|
c6008751b1
|
removed FactoryProgressItem
|
2022-04-02 15:34:23 +03:00 |
|
|
ba4984496c
|
remove unused proto file
|
2022-04-02 14:59:42 +03:00 |
|
|
e4fa21fb83
|
refactoring using
|
2022-04-01 23:07:21 +03:00 |
|
|
33eac101fc
|
fixed usings
|
2022-04-01 22:49:12 +03:00 |
|
|
b41682efaa
|
refactoring
|
2022-04-01 19:17:21 +03:00 |
|
|
2f06b0a013
|
EventBus: refactoring
|
2022-04-01 19:12:53 +03:00 |
|
|
abce571695
|
backup: refactoring
|
2022-04-01 17:37:21 +03:00 |
|
|
e04867b315
|
fix
|
2022-04-01 17:20:00 +03:00 |
|
|
e524ca03d1
|
Notify: removed scope class
|
2022-04-01 17:17:24 +03:00 |
|
|
d0c36facbb
|
DistributedTaskQueue: removed CancelTask method. Add delete orphan cache items feature
|
2022-04-01 16:54:21 +03:00 |
|
|
1e13f42c9c
|
Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider
# Conflicts:
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Server/Api/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
|
2022-04-01 15:17:46 +03:00 |
|
|
2370f7bad5
|
refactoring DistributedTask. replace return value from string to dynamic for indexer
|
2022-04-01 10:10:15 +03:00 |
|
|
49efbc9780
|
refactoring: remove IServiceProvider
|
2022-03-31 20:32:46 +03:00 |
|
|
90623263e9
|
merge from feature/backend-refactor
|
2022-03-29 23:29:03 +03:00 |
|
|
d4a8f10891
|
added comment
|
2022-03-29 16:52:08 +03:00 |
|
|
df8b7182b6
|
merge feature/backend-refactor
|
2022-03-29 16:12:36 +03:00 |
|
|
4fe34215c9
|
Merge pull request #580 from ONLYOFFICE/feature/files-mapping
Feature/files mapping
|
2022-03-29 16:59:43 +04:00 |
|
|
03efcf7f00
|
Notify: remove serviceProvider
|
2022-03-29 13:53:05 +03:00 |
|
|
cfad6e7ee7
|
removed IServiceProvider
|
2022-03-28 19:51:16 +03:00 |
|
|
f55a6cb6b2
|
Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider
# Conflicts:
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-03-28 17:45:42 +03:00 |
|
|
e7e0f5327a
|
Merge branch 'feature/backend-refactor' into feature/log-refactor
# Conflicts:
# common/ASC.Api.Core/GlobalUsings.cs
|
2022-03-28 14:29:36 +03:00 |
|
|
50a882a2b4
|
merge
|
2022-03-28 12:54:01 +03:00 |
|
|
e5229f12f5
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
# common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/EF/BackupsContext.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
# common/ASC.Data.Storage/Configuration/StorageSettings.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# products/ASC.Files/Core/Core/ResponseStream.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
|
2022-03-28 12:53:15 +03:00 |
|
|
81f3a1fb09
|
DistributedTaskQueue refactoring. set MaxThreadsCount to 1
|
2022-03-26 16:31:13 +03:00 |
|
|
067fb96060
|
DistributedTaskQueue: refactoring
|
2022-03-25 21:00:43 +03:00 |
|
|
abae61f2db
|
IDE1006
|
2022-03-25 19:26:06 +03:00 |
|
|
cd1d3058ff
|
DistributedTaskQueue refactoring
|
2022-03-25 19:15:28 +03:00 |
|
|
100e581f1c
|
IDE1006
|
2022-03-25 17:54:34 +03:00 |
|
|
6fe2178e3e
|
Notify: refactoring
|
2022-03-25 17:51:03 +03:00 |
|
|
e94c4b5679
|
Storage: remove IServiceProvider
|
2022-03-25 12:23:28 +03:00 |
|
|
1922da4ab9
|
merge
|
2022-03-24 20:56:51 +03:00 |
|
|
c7712fd7dc
|
Merge branch 'feature/backend-refactor' into feature/warnings
|
2022-03-24 18:01:09 +03:00 |
|
|
1ee814a2ef
|
Merge branch 'feature/backend-refactor' into feature/files-controller-refactoring
# Conflicts:
# common/ASC.Api.Core/GlobalUsings.cs
# products/ASC.Files/Server/GlobalUsings.cs
|
2022-03-24 17:11:33 +03:00 |
|
|
959cac6243
|
added missed service
|
2022-03-24 16:00:28 +03:00 |
|
|
b8380c1353
|
refactoring
|
2022-03-24 14:57:39 +03:00 |
|
|
66ccce8eb5
|
Settings: refactoring
|
2022-03-24 12:35:00 +03:00 |
|
|
cb4d39e427
|
refactor
|
2022-03-23 19:23:25 +03:00 |
|
|
c85f5385f9
|
Api.Core: added hostbuilder extension method
|
2022-03-23 19:23:12 +03:00 |
|
|
9c5844fb0d
|
Api.Core: removed unnecessary
|
2022-03-23 19:22:44 +03:00 |
|
|
49d3094dca
|
Api.Core: removed unnecessary
|
2022-03-23 19:22:25 +03:00 |
|
|
a857089ee6
|
renamed
|
2022-03-23 17:33:43 +03:00 |
|
|
079618e4e2
|
refactor
|
2022-03-23 16:08:27 +03:00 |
|
|
85eca545b6
|
Api.Core: added builder methods
|
2022-03-23 16:07:26 +03:00 |
|
|
63e12f49ab
|
merge from feature/backend-refactor
|
2022-03-23 14:56:18 +03:00 |
|
|
0c72f8bcb3
|
AmiPublicDnsSyncService, StorageSettings: remove IServiceProvider
|
2022-03-23 14:28:52 +03:00 |
|
|
22c6c1d156
|
Api: remove service locator
|
2022-03-22 18:44:10 +03:00 |
|
|
244e345ac6
|
Merge 'feature/backend-refactor' into feature/builder-extensions
|
2022-03-22 15:57:46 +03:00 |
|
|
f4c75f91f4
|
refactor
|
2022-03-22 15:46:13 +03:00 |
|
|
4e78af53f9
|
refactoring DistributedTaskQueue
|
2022-03-22 15:10:05 +03:00 |
|
|
65b6bf9141
|
removed base extenshion
|
2022-03-22 13:48:50 +03:00 |
|
|
bca173a91c
|
Files: added license header
|
2022-03-22 13:36:38 +03:00 |
|
|
62fbab1185
|
Merge branch 'feature/backend-refactor' into feature/warnings
|
2022-03-22 13:20:43 +03:00 |
|
|
82c96d160f
|
Merge branch 'feature/backend-refactor' into feature/files-mapping
|
2022-03-22 12:09:41 +03:00 |
|
|
9bea7b362b
|
Merge branch 'develop' into feature/backup
|
2022-03-22 09:59:55 +03:00 |
|
|
172eaa8985
|
Merge pull request #589 from ONLYOFFICE/feature/update-packages
Feature/update packages
|
2022-03-21 22:24:11 +04:00 |
|
|
b4c44d1b09
|
Merge branch 'feature/backend-refactor' into feature/files-controller-refactor
|
2022-03-21 19:03:57 +03:00 |
|
|
cf8c1ba3ff
|
Merge branch 'feature/backend-refactor' into feature/files-mapping
|
2022-03-21 18:52:09 +03:00 |
|
|
ae490c3290
|
System.Linq.Async package moved to share ASC.Core.Common
|
2022-03-21 18:32:04 +03:00 |
|
|
7f81a77556
|
Redis.Newtonsoft, Redis.AspNetCore moved to shared ASC.Api.Core
|
2022-03-21 17:53:23 +03:00 |
|
|
e9671701cb
|
Autofact.Extensions.DependencyInjection package moved to ASC.Api.Core
|
2022-03-21 17:39:01 +03:00 |
|
|
8381b3e9c6
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-21 17:15:55 +03:00 |
|
|
010697ec97
|
Merge pull request #592 from ONLYOFFICE/bugfix/refactoring-fix
Bugfix/refactoring fix
|
2022-03-21 17:54:54 +04:00 |
|
|
6e4761b8c2
|
Systemd package moved to shared ASC.Api.Core
|
2022-03-21 16:40:09 +03:00 |
|
|
a3f85f8e0b
|
Merge branch 'feature/backend-refactor' into feature/update-packages
|
2022-03-21 14:44:30 +03:00 |
|
|
5bcc792132
|
Merge branch 'feature/license-refactor' of github.com:ONLYOFFICE/AppServer into feature/license-refactor
|
2022-03-21 10:37:02 +03:00 |
|
|
da31770f18
|
added deleted license headers
|
2022-03-21 10:36:07 +03:00 |
|
|
eec0545987
|
fixed build.
|
2022-03-20 18:24:26 +03:00 |
|
|
679aecbc76
|
Merge branch 'feature/backend-refactor' into feature/license-refactor
# Conflicts:
# common/services/ASC.Webhooks.Service/WebhookSender.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
|
2022-03-20 16:47:31 +03:00 |
|
|
07c618b23d
|
update packages
|
2022-03-20 16:44:49 +03:00 |
|
|
868492b562
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Core.Common/Billing/BillingClient.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Notify/Context.cs
# common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs
# common/ASC.FederatedLogin/Helpers/RequestHelper.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/FacebookLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/LinkedInLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/WordpressLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/WebhookSender.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Helpers/DocuSignHelper.cs
# products/ASC.Files/Core/Helpers/EasyBibHelper.cs
# products/ASC.Files/Core/Helpers/WordpressHelper.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
|
2022-03-19 22:16:03 +03:00 |
|
|
61f4f33990
|
fixed DistributedTask
|
2022-03-19 18:48:51 +03:00 |
|
|
1c74b5702b
|
Files:fix notify
|
2022-03-19 18:05:26 +03:00 |
|
|
21a8c0e0fc
|
removed httpclient ctor
|
2022-03-18 22:34:01 +03:00 |
|
|
5cfe7e08ec
|
added registration mapping converters
|
2022-03-18 13:31:02 +03:00 |
|
|
ff79769307
|
Files: improvements for automapping
|
2022-03-18 11:51:33 +03:00 |
|
|
88e2f01913
|
merge from feature/backend-refactor
|
2022-03-18 11:12:16 +03:00 |
|
|
645607aae5
|
default IOptionsMonitor<ILog> => ILog
|
2022-03-18 11:04:29 +03:00 |
|
|
389bb3024f
|
added support ILog<T> interface
|
2022-03-17 23:09:45 +03:00 |
|
|
568f427957
|
IDE1006
|
2022-03-17 19:57:02 +03:00 |
|
|
6b3f9a71ad
|
IDE0065
|
2022-03-17 18:23:19 +03:00 |
|
|
11004ab61c
|
IDE0161
|
2022-03-17 18:13:38 +03:00 |
|
|
6a09cf47e9
|
IDE0044
|
2022-03-17 18:07:17 +03:00 |
|
|
80eb1c8257
|
IDE0011
|
2022-03-17 18:01:39 +03:00 |
|
|
69950c9d8c
|
IDE0007
|
2022-03-17 17:55:19 +03:00 |
|
|
717456d71d
|
CA1805
|
2022-03-17 17:33:16 +03:00 |
|
|
89beecde71
|
replaced IOptionsMonitor<ILog> => ILog
|
2022-03-17 13:13:52 +03:00 |
|
|
38d685c4ce
|
Merge branch 'develop' into feature/backup
|
2022-03-17 11:03:09 +03:00 |
|
|
21f85e7260
|
logger refactoring. added resolver ILog/IOptionsMonitor<ILog>
|
2022-03-17 09:55:08 +03:00 |
|
|
fb675dd307
|
updated packages
|
2022-03-16 16:37:56 +03:00 |
|
|
dbb49a2ce3
|
ElasticSearch: updated packages
|
2022-03-16 15:23:50 +03:00 |
|
|
fef9f76ad6
|
WebhooksCore: updated packages
|
2022-03-16 15:15:56 +03:00 |
|
|
6ca867f7aa
|
VoipService: updated packages
|
2022-03-16 15:08:06 +03:00 |
|
|
dc238d96f3
|
IPSecurity: updated packages
|
2022-03-16 14:56:32 +03:00 |
|
|
701d6a7a03
|
FederatedLogin: update packages
|
2022-03-16 14:45:28 +03:00 |
|
|
2fe617f811
|
Storage: updated packages
|
2022-03-16 14:29:24 +03:00 |
|
|
427c7ea2d5
|
BackupCore: updated packeges
|
2022-03-16 14:16:55 +03:00 |
|
|
e6595fdcf5
|
CoreCommon: updated packages
|
2022-03-16 14:14:25 +03:00 |
|
|
8c9db226ac
|
Common: updated packages
|
2022-03-16 13:44:47 +03:00 |
|
|
8b07acbd03
|
AuditTrail: fix
|
2022-03-16 13:04:13 +03:00 |
|
|
8759710552
|
AuditTrail: updated packages
|
2022-03-16 13:04:04 +03:00 |
|
|
cb6b77e216
|
ApiCore: updated packages
|
2022-03-16 12:59:04 +03:00 |
|
|
c62bd4a6d1
|
fix
|
2022-03-15 22:05:54 +03:00 |
|
|
65db98f65c
|
added new license headers
|
2022-03-15 21:00:53 +03:00 |
|
|
3d50d7977b
|
removed past license headers
|
2022-03-15 19:59:24 +03:00 |
|
|
0c61081921
|
Merge branch 'feature/backend-refactor' into feature/builder-extension
|
2022-03-15 18:33:58 +03:00 |
|
|
e0df6dfa12
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-03-15 15:23:59 +03:00 |
|
|
82daaf4029
|
rename model to inDto
|
2022-03-15 13:56:22 +03:00 |
|
|
5c820fdcd5
|
Index: create index only in service
|
2022-03-14 21:47:34 +03:00 |
|
|
43af2f68c3
|
implement InitiateChunkedUploadAsync in discDataStore
|
2022-03-14 17:59:00 +03:00 |
|
|
cb67836684
|
backup: fix restore from third-party storage
|
2022-03-14 14:48:56 +03:00 |
|
|
882507496d
|
added new routing mechanism
|
2022-03-14 13:57:59 +03:00 |
|
|
af772531ad
|
added extension method for services
|
2022-03-14 12:07:37 +03:00 |
|
|
2f62247d3b
|
bug fixed
|
2022-03-11 14:09:15 +03:00 |
|
|
5e2f575483
|
added builders extensions
|
2022-03-10 20:30:29 +03:00 |
|
|
d45373619d
|
update StackExchange.Redis.*.dll
|
2022-03-10 15:56:30 +03:00 |
|
|
696ffd7df1
|
Web: Translations: Tests: Extended DuplicatesFilesByMD5HashTest test method with external md5-excludes.json file
|
2022-03-10 15:11:04 +03:00 |
|
|
d63c7cd888
|
Common: removed using
|
2022-03-10 14:19:53 +03:00 |
|
|
ad68b7dc60
|
Merge branch 'feature/backend-refactor' into feature/files-mapping
|
2022-03-10 14:15:49 +03:00 |
|
|
26066ccb7f
|
Merge branch 'feature/backend-refactor' into feature/files-mapping
|
2022-03-10 12:19:18 +03:00 |
|
|
64dfd61858
|
Merge branch 'develop' into feature/backup
|
2022-03-10 12:15:26 +03:00 |
|
|
d930c91fb1
|
Merge branch 'feature/backend-refactor' into feature/winsw
# Conflicts:
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.UrlShortener.Svc/ASC.UrlShortener.Svc.csproj
# common/services/ASC.UrlShortener.Svc/GlobalUsings.cs
|
2022-03-09 21:08:00 +03:00 |
|
|
b9719755be
|
Added ThrowIfNull
|
2022-03-09 20:15:51 +03:00 |
|
|
6b262e915a
|
socket.io:delete redis in config
|
2022-03-09 16:53:36 +03:00 |
|
|
263aa1e8ce
|
check isAbsolute path for appsettings and logs
|
2022-03-09 15:49:16 +03:00 |
|
|
bc174e2227
|
refactoring
|
2022-03-09 12:16:35 +03:00 |
|
|
207cb5ba2f
|
bug fix
|
2022-03-09 12:10:49 +03:00 |
|
|
2585c22b3b
|
merge from feature/backend-refactor
|
2022-03-09 12:10:30 +03:00 |
|
|
47d43831ea
|
eventbus: added support ProtobufSerializer
|
2022-03-05 19:46:20 +03:00 |
|
|
78fafb08ab
|
Microsoft.NET.Sdk.Worker
|
2022-03-05 18:38:42 +03:00 |
|
|
1cd153eabe
|
SocketIO: fix hosts
|
2022-03-05 16:41:18 +03:00 |
|
|
475269ee84
|
Merge branch 'feature/backend-refactor' into feature/people-refactor
# Conflicts:
# products/ASC.Files/Core/Model/FileEntryWrapper.cs
# products/ASC.Files/Core/Model/FileShareWrapper.cs
# products/ASC.Files/Core/Model/FileWrapper.cs
# products/ASC.Files/Core/Model/FolderWrapper.cs
# products/ASC.People/Server/GlobalUsings.cs
|
2022-03-05 11:27:58 +03:00 |
|
|
99378a027e
|
Csproj: ImplicitUsings
|
2022-03-05 11:20:05 +03:00 |
|
|
fb83a54871
|
Merge branch 'feature/backend-refactor' into feature/refactoring-VoipService
|
2022-03-05 10:44:39 +03:00 |
|
|
b6be156a75
|
Common: fix
|
2022-03-05 10:27:52 +03:00 |
|
|
4a61f9fce5
|
VoipService: refactor mapping
|
2022-03-04 19:35:12 +03:00 |
|
|
a29cefb574
|
bug fixed
|
2022-03-04 18:12:48 +03:00 |
|
|
da73ff523c
|
Files: resolve names for mapping, add mapping
|
2022-03-04 16:40:28 +03:00 |
|
|
51cd7232a3
|
Merge pull request #544 from ONLYOFFICE/feature/refactoring-Textile
refactoring: texttile
|
2022-03-04 16:28:57 +03:00 |
|
|
4c92e6f0d3
|
Common: fix mapper for generic types
|
2022-03-04 13:57:43 +03:00 |
|
|
51fee69f44
|
fixed running concurrent BackgroundTasks
|
2022-03-03 16:07:28 +03:00 |
|
|
418ca246c8
|
Merge branch 'feature/backend-refactor' into feature/people-refactor
# Conflicts:
# products/ASC.People/Server/Startup.cs
|
2022-03-03 14:35:22 +03:00 |
|
|
1b352c76f6
|
Added using AddControllers method
|
2022-03-03 14:04:17 +03:00 |
|
|
5f68d00182
|
Merge branch 'feature/backend-refactor' into feature/people-refactor
|
2022-03-03 11:22:16 +03:00 |
|
|
7403540435
|
DI: fixed path issue. Added faster method for registering controllers
|
2022-03-03 11:04:21 +03:00 |
|
|
a976b69fc8
|
backup: refacroting. added new Integration event.
|
2022-03-02 18:25:28 +03:00 |
|
|
2978adcdf3
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-03-02 18:18:05 +03:00 |
|
|
511592ddb7
|
Merge branch 'develop' into feature/login-redesign
|
2022-03-02 12:08:11 +03:00 |
|
|
6a8b5a8ed5
|
Merge branch 'feature/backend-refactor' into feature/refactoring-studio.notify
|
2022-03-01 19:46:13 +03:00 |
|
|
708d2f3ecc
|
Feed: fix mapping
|
2022-03-01 19:45:27 +03:00 |
|
|
4e30cda54e
|
Studio.Notify: fixed start
|
2022-03-01 19:43:43 +03:00 |
|
|
6070a93f1d
|
Merge branch 'feature/backend-refactor' into feature/refactoring-studio.notify
# Conflicts:
# common/services/ASC.Studio.Notify/Program.cs
|
2022-03-01 19:26:56 +03:00 |
|
|
609427bf20
|
merge from feature/backend-refactor
|
2022-03-01 15:57:49 +03:00 |
|
|
61a127413c
|
delete svc projects
|
2022-03-01 15:54:23 +03:00 |
|
|
bfded42b52
|
Merge branch 'feature/backend-refactor' into feature/winsw
|
2022-03-01 15:31:33 +03:00 |
|
|
b48bd37ea6
|
Merge branch 'feature/backend-refactor' into feature/people-refactor
|
2022-03-01 15:27:07 +03:00 |
|
|
2eb2150e95
|
bug fixed
|
2022-03-01 14:58:23 +03:00 |
|
|
f3afd79a3f
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/components/AdvancedSelector/AdvancedSelector.js
# packages/asc-web-common/components/AdvancedSelector/sub-components/Selector.js
# packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
# packages/asc-web-common/components/PageLayout/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/context-menu/styled-context-menu.js
# packages/asc-web-components/drop-down/index.js
# packages/asc-web-components/link-with-dropdown/index.js
# packages/asc-web-components/row/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/themes/dark.js
# products/ASC.Files/Client/public/images/files.menu.svg
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/QuickButtons.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/ModalView.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.People/Client/public/images/people.menu.svg
# products/ASC.People/Client/src/components/GroupSelector/index.js
# products/ASC.People/Client/src/components/PeopleSelector/index.js
# products/ASC.People/Client/src/pages/Home/Section/Body/RowView/userContent.js
# products/ASC.People/Client/src/pages/Home/index.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-item.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/profile-menu.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
|
2022-03-01 13:50:26 +03:00 |
|
|
f77b210524
|
fix warning
|
2022-03-01 13:37:36 +03:00 |
|
|
fe77e0a331
|
fix build
|
2022-03-01 13:36:34 +03:00 |
|
|
e8b673eb29
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common
|
2022-03-01 11:17:12 +03:00 |
|
|
6d3a0e2d82
|
Merge branch 'feature/backend-refactor' into feature/refactoring-telegram-service
|
2022-03-01 10:56:21 +03:00 |
|
|
8474cb8d37
|
refactor
|
2022-02-28 23:25:25 +03:00 |
|
|
c887362ea3
|
People: separated people controller
|
2022-02-28 22:23:39 +03:00 |
|
|
1665fe7bf6
|
People: refactor
|
2022-02-28 21:54:08 +03:00 |
|
|
d0b7bd63b6
|
textile: delete prefix "s" and ImplicitUsings
|
2022-02-28 18:12:10 +03:00 |
|
|
9ca71764ef
|
EventBus: added ASC.EventBus.MemoryCache for testing. Refactoring.
|
2022-02-28 17:48:55 +03:00 |
|
|
9aff975cd4
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-02-28 16:17:48 +03:00 |
|
|
f34e89cce8
|
telegram: CancellationToken to StartReceiving()
|
2022-02-28 16:11:54 +03:00 |
|
mushka
|
ce73a703a4
|
added drag-scrolling, working on auto-offset
|
2022-02-28 16:08:11 +03:00 |
|
|
34a9067aec
|
refactoring: remove whitespace
|
2022-02-28 15:45:01 +03:00 |
|
|
d7d7d18ec8
|
voipService: add autoMapper and fix method "GetCallsQuery"
|
2022-02-28 15:43:20 +03:00 |
|
|
fe15811c8f
|
Core: refactor
|
2022-02-28 12:06:06 +03:00 |
|
|
37b6a61462
|
Merge branch 'feature/backend-refactor' into feature/refactoring-VoipService
|
2022-02-28 11:40:58 +03:00 |
|
|
3e8164e146
|
refactoring: telegram service
|
2022-02-28 11:35:59 +03:00 |
|
|
e6f111f651
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor
|
2022-02-25 20:16:00 +03:00 |
|
|
eae8b7c0bb
|
Web: Socket: Added "restore-backup" event listeners
|
2022-02-25 19:08:02 +03:00 |
|
|
0635eea567
|
Merge pull request #549 from ONLYOFFICE/feature/asc-notify-textile-refactor
Feature/asc notify textile refactor
|
2022-02-25 18:19:22 +03:00 |
|
|
bdb7672aaf
|
Merge pull request #558 from ONLYOFFICE/feature/asc-notify-refactor
Feature/asc notify refactor
|
2022-02-25 18:19:06 +03:00 |
|
|
5a19f21902
|
Merge pull request #559 from ONLYOFFICE/feautre/asc-messaging-system-refactor
Feautre/asc messaging system refactor
|
2022-02-25 17:53:44 +03:00 |
|
|
80ce5d980f
|
Notiyf: renamed to services, reorganization, added implicit usings
|
2022-02-25 16:50:31 +03:00 |
|
|
6495da0d0b
|
Merge branch 'feature/backend-refactor' into feature/asc-messaging-system-refactor
|
2022-02-25 16:34:15 +03:00 |
|
|
b4eecac091
|
Merge branch 'feature/backend-refactor' into feature/asc-notify-textile-refactor
|
2022-02-25 16:29:34 +03:00 |
|
|
b1e5a6e28b
|
Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor
|
2022-02-25 16:16:56 +03:00 |
|
|
f07aa0a183
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# config/nginx/onlyoffice.conf
# packages/asc-web-common/constants/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
|
2022-02-25 16:05:43 +03:00 |
|
|
c693e92e13
|
Merge branch 'feature/backend-refactor' into feature/refactoring-VoipService
|
2022-02-25 15:50:16 +03:00 |
|
|
bc78804ac6
|
refactoring: voipService
|
2022-02-25 15:50:00 +03:00 |
|
|
4b55c185f4
|
bugfix: socket.io
|
2022-02-25 11:46:47 +03:00 |
|
|
88c7f5ba72
|
Merge branch 'feature/backend-refactor' into feature/winsw
|
2022-02-25 11:18:26 +03:00 |
|
|
b5b8b1edf0
|
added support scheduler backup request handling
|
2022-02-24 19:53:49 +03:00 |
|
|
3513342087
|
refactoring
|
2022-02-24 18:01:32 +03:00 |
|
|
7e67e9a41c
|
merge from develop
|
2022-02-24 17:33:02 +03:00 |
|
|
e84345c7f3
|
refactoring
|
2022-02-24 17:15:39 +03:00 |
|
|
63d163cba6
|
winsw: socket.io
|
2022-02-24 16:50:02 +03:00 |
|
|
49f7ecf5f8
|
refactoring and bugfix
|
2022-02-24 16:49:34 +03:00 |
|
|
6b7fe6461f
|
fix socketio
|
2022-02-24 14:57:21 +03:00 |
|
|
d7566d0743
|
Merge branch 'develop' into feature/backend-refactor
|
2022-02-24 14:55:31 +03:00 |
|
|
7f70d0be04
|
Merge branch 'feature/backend-refactor' into feature/winsw
|
2022-02-24 14:50:18 +03:00 |
|
|
707739813c
|
winsw: SsoAuth
|
2022-02-24 14:46:55 +03:00 |
|
|
a3ba7e2ecc
|
bugfix and refactoring urlShortener
|
2022-02-24 14:45:52 +03:00 |
|
|
d4e48004bc
|
added socketio
|
2022-02-24 13:47:18 +03:00 |
|
|
16d16b0dca
|
update urlShortener
|
2022-02-24 11:37:41 +03:00 |
|
|
6925a83060
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Common/Caching/ICacheNotify.cs
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Common/Caching/MemoryCacheNotify.cs
# common/ASC.Common/Threading/DistributedTaskProgress.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.Data.Storage/BaseStorage.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSessionHolder.cs
# common/ASC.Data.Storage/CrossModuleTransferUtility.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
# common/ASC.Data.Storage/Extensions.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/IDataStore.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Data.Storage/S3/S3UploadGuard.cs
# common/ASC.Data.Storage/StaticUploader.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.Data.Storage/StorageUploader.cs
# common/ASC.Data.Storage/WebPath.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# common/services/ASC.AuditTrail/AuditEventsRepository.cs
# common/services/ASC.AuditTrail/AuditReportCreator.cs
# common/services/ASC.AuditTrail/LoginEventsRepository.cs
# products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/ILinkDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IProviderInfo.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/ITagDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/Entries/ChunkedUploadSession.cs
# products/ASC.Files/Core/Core/Entries/EncryptionKeyPair.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/FilesIntegration.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Security/IFileSecurity.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.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/Dropbox/DropboxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.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.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Core/Thirdparty/RegexDaoSelectorBase.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxProviderInfo.cs
# products/ASC.Files/Core/Helpers/DocuSignHelper.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Helpers/PathProvider.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/SearchHandler.cs
# products/ASC.Files/Core/Model/FileEntryWrapper.cs
# products/ASC.Files/Core/Model/FileOperationWraper.cs
# products/ASC.Files/Core/Model/FileWrapper.cs
# products/ASC.Files/Core/Model/FolderContentWrapper.cs
# products/ASC.Files/Core/Model/FolderWrapper.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.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/Utils/ChunkedUploadSessionHolder.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileShareLink.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/MailMergeTask.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/AuthenticationController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/BuildVersion.cs
# web/ASC.Web.Core/Files/DocumentService.cs
# web/ASC.Web.Core/Files/DocumentServiceLicense.cs
# web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
# web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
# web/ASC.Web.Core/Recaptcha.cs
# web/ASC.Web.Core/Sms/SmsManager.cs
# web/ASC.Web.Core/Sms/SmsProvider.cs
# web/ASC.Web.Core/Sms/SmsSender.cs
# web/ASC.Web.Core/SpaceUsageStatManager.cs
# web/ASC.Web.Core/Utility/UrlShortener.cs
|
2022-02-23 22:42:34 +03:00 |
|
|
8563fbc373
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Middleware/CommonApiResponse.cs
# common/ASC.Api.Core/Middleware/ResponseWrapper.cs
# common/ASC.Core.Common/Context/Impl/SubscriptionManager.cs
# products/ASC.Files/Core/Configuration/FilesSettings.cs
# products/ASC.Files/Core/Core/FileStorageService.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/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
|
2022-02-23 17:37:34 +03:00 |
|
|
3cfb10d4d2
|
Socketio: fix
|
2022-02-23 17:08:00 +03:00 |
|
|
3d4e000778
|
Merge branch 'develop' into feature/async
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.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/FileConverter.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
|
2022-02-23 16:01:55 +03:00 |
|
|
5d767e842f
|
support reject message from queue in EventBusRabbitMQ. BackupSchedulerService, BackupCleanerService as active/passice IHostedService
|
2022-02-23 15:33:42 +03:00 |
|
|
03fcdf82ee
|
support active/passive kind of IHostedService
|
2022-02-23 15:30:08 +03:00 |
|
|
1379800971
|
Files: fix async
|
2022-02-23 13:42:14 +03:00 |
|
|
2094fa112a
|
refactoring: update urlShortener
|
2022-02-22 16:45:14 +03:00 |
|
|
6f1ab3515f
|
delete urlShortener.svc
|
2022-02-22 15:54:44 +03:00 |
|
|
ac0e314f60
|
winsw: refactoring
update bats
relocate xml and exe
|
2022-02-22 15:45:21 +03:00 |
|
|
32868de412
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# public/locales/de/Common.json
|
2022-02-22 13:53:00 +03:00 |
|
|
348e4cd1e0
|
winsw: bugfix urlShortener
|
2022-02-22 13:31:10 +03:00 |
|
|
b8b23d266d
|
winsw: update bats
|
2022-02-22 13:15:02 +03:00 |
|
|
a797b3490e
|
Files: async fixes
|
2022-02-22 12:22:15 +03:00 |
|
|
3aeac42444
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# common/services/ASC.ElasticSearch/Service/Settings.cs
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/public/locales/az/Home.json
# products/ASC.Files/Client/public/locales/bg/Home.json
# products/ASC.Files/Client/public/locales/bg/Translations.json
# products/ASC.Files/Client/public/locales/cs/Home.json
# products/ASC.Files/Client/public/locales/de/ConvertDialog.json
# products/ASC.Files/Client/public/locales/de/Home.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/de/UploadPanel.json
# products/ASC.Files/Client/public/locales/el/ConvertDialog.json
# products/ASC.Files/Client/public/locales/el/Home.json
# products/ASC.Files/Client/public/locales/en/ConvertDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/en/UploadPanel.json
# products/ASC.Files/Client/public/locales/es/ConvertDialog.json
# products/ASC.Files/Client/public/locales/es/Home.json
# products/ASC.Files/Client/public/locales/es/UploadPanel.json
# products/ASC.Files/Client/public/locales/fi/Home.json
# products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
# products/ASC.Files/Client/public/locales/fr/Home.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/ConvertDialog.json
# products/ASC.Files/Client/public/locales/it/Home.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/it/UploadPanel.json
# products/ASC.Files/Client/public/locales/ja/Home.json
# products/ASC.Files/Client/public/locales/ja/UploadPanel.json
# products/ASC.Files/Client/public/locales/lv/Home.json
# products/ASC.Files/Client/public/locales/nl/Home.json
# products/ASC.Files/Client/public/locales/nl/Translations.json
# products/ASC.Files/Client/public/locales/pl/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
# products/ASC.Files/Client/public/locales/pt-BR/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Home.json
# products/ASC.Files/Client/public/locales/ro/UploadPanel.json
# products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/ru/UploadPanel.json
# products/ASC.Files/Client/public/locales/sk/Home.json
# products/ASC.Files/Client/public/locales/tr/Home.json
# products/ASC.Files/Client/public/locales/uk/Home.json
# products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
# products/ASC.Files/Client/public/locales/vi/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
# products/ASC.Files/Client/src/HOCs/withBadges.js
# products/ASC.Files/Client/src/HOCs/withContent.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# public/locales/de/Common.json
|
2022-02-21 22:22:38 +03:00 |
|
|
780a1cf608
|
Merge branch 'feature/backend-refactor' into feature/refactoring-webhooks.core
|
2022-02-21 21:20:35 +03:00 |
|
|
5c7e46b9ab
|
winsw: add winsw
add urlShortener.xml
update bats
add winsw.exe
|
2022-02-21 20:46:23 +03:00 |
|
|
a4fb62546a
|
winsw: update urlShortener
get settings in appsettings.json
|
2022-02-21 20:45:39 +03:00 |
|
|
8640d03a5f
|
MessagingSystem: refactor
|
2022-02-21 18:50:53 +03:00 |
|
|
e66375760d
|
MessagingSystem: refactor
|
2022-02-21 18:48:48 +03:00 |
|
|
c707004d15
|
MessaginSystem: used file-scoped namespaces
|
2022-02-21 18:40:38 +03:00 |
|
|
9fe4971055
|
add mapping, project reorganization
|
2022-02-21 18:35:57 +03:00 |
|
|
d15fd84881
|
Notify: added services
|
2022-02-21 15:29:25 +03:00 |
|
|
a021ef2cd8
|
Notify: reworked to IHostedService
|
2022-02-21 15:29:16 +03:00 |
|
|
deb18a37f8
|
Notify: reworked to background service
|
2022-02-21 15:28:52 +03:00 |
|
|
a57882df01
|
Notify: removed unnecessary laucnher
|
2022-02-21 15:28:09 +03:00 |
|
|
66203b100c
|
Notify: add using
|
2022-02-21 15:27:26 +03:00 |
|
|
9f13cb5e17
|
Merge branch 'feature/backend-refactor' into feautre/asc-messaging-system-refactor
|
2022-02-21 13:07:50 +03:00 |
|
|
0221db9fbf
|
Core: removed unnecessary
|
2022-02-21 13:01:21 +03:00 |
|
|
7ad1462b81
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor
|
2022-02-21 12:51:45 +03:00 |
|
|
f09673bfe7
|
Core: refactor
|
2022-02-21 12:25:30 +03:00 |
|
|
998471f868
|
Core: removed empty lines
|
2022-02-21 12:17:17 +03:00 |
|
|
485fecd98a
|
Merge pull request #538 from ONLYOFFICE/feature/asc-ipsecurity-refactor
Feature/asc ipsecurity refactor
|
2022-02-18 20:31:55 +03:00 |
|
|
5b5ed4a4e3
|
Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor
|
2022-02-18 18:55:59 +03:00 |
|
|
880d81af83
|
Fedd: used file-scoped namespaces
|
2022-02-18 18:32:42 +03:00 |
|
|
9c08a5c52e
|
Feed: moved feed migrations to ASC.Feed, resolved usings
|
2022-02-18 18:30:53 +03:00 |
|
|
f079f77ab9
|
reorganize
|
2022-02-18 18:11:53 +03:00 |
|
|
dfb8fdab46
|
Merge branch 'feature/backend-refactor' into feature/asc-notify-textile-refactor
|
2022-02-18 17:41:15 +03:00 |
|
|
b420c36d46
|
Notify: fix
|
2022-02-18 17:38:15 +03:00 |
|