|
|
e2ba706d71
|
Fix after merge
|
2022-06-08 16:38:34 +03:00 |
|
|
|
b693779ea1
|
Merge branch 'develop' into feature/docspace-pin
|
2022-06-08 16:38:16 +03:00 |
|
|
|
397cde0a3b
|
Files: added pin/unpin, fix tags
|
2022-06-07 19:07:55 +03:00 |
|
|
|
cc7c29c8cf
|
Files: fix
|
2022-06-03 13:26:16 +03:00 |
|
|
|
57df81aa76
|
Files: added logo audit, fix
|
2022-06-03 01:27:56 +03:00 |
|
|
|
848751220c
|
Files: added logos for rooms
|
2022-06-02 21:41:16 +03:00 |
|
|
|
3757174d08
|
fix test
|
2022-06-01 20:25:03 +03:00 |
|
|
|
3ebd67f444
|
merge from develop
|
2022-06-01 14:44:30 +03:00 |
|
|
|
8b92df64e4
|
crm: fix logs
|
2022-05-31 18:34:04 +03:00 |
|
|
|
ee7dddac5d
|
crm: fix crm api
|
2022-05-31 17:01:58 +03:00 |
|
|
|
b81d3ff507
|
Files: fix routing
|
2022-05-31 16:49:54 +03:00 |
|
|
|
9902b536d9
|
Files: added thirdparty rooms filter
|
2022-05-31 16:49:39 +03:00 |
|
|
|
9584e8ba74
|
Files: fix
|
2022-05-31 16:47:59 +03:00 |
|
|
|
eda86591a1
|
Files: fix "MySql connection already in use"
|
2022-05-31 16:47:37 +03:00 |
|
|
|
73364c1fba
|
Files: refactor
|
2022-05-30 14:32:00 +03:00 |
|
|
|
2a7853bf5b
|
Files: added creating thirdparty rooms
|
2022-05-30 14:31:30 +03:00 |
|
|
|
1edb778115
|
Files: added thirdparty rooms
|
2022-05-30 14:30:08 +03:00 |
|
|
|
e704983452
|
Filex: fix controller
|
2022-05-29 22:36:28 +03:00 |
|
|
|
8bf6cdda9f
|
Files: fix, added thirdparty archiving, deleting
|
2022-05-29 22:36:15 +03:00 |
|
|
|
9b779be2f4
|
Files: added thirdparty rooms
|
2022-05-27 19:02:47 +03:00 |
|
|
|
5f9c5c54e7
|
Files: added db entity fields
|
2022-05-26 17:34:04 +03:00 |
|
|
|
e2e8f3fce9
|
Merge branch 'feature/docspace-tags' into feature/docspace-thirdparty
|
2022-05-26 16:39:19 +03:00 |
|
|
|
3123bbd187
|
Files: added tags filtering
|
2022-05-26 16:37:31 +03:00 |
|
|
|
518fe17d14
|
refactor
|
2022-05-26 14:43:56 +03:00 |
|
|
|
03eaaf4b19
|
Files: added thirdparty rooms connection
|
2022-05-26 13:13:25 +03:00 |
|
|
|
e7886aff2c
|
Log: refactoring
|
2022-05-26 12:01:54 +03:00 |
|
|
|
e01858d2e8
|
merge from develop
|
2022-05-25 16:58:31 +03:00 |
|
|
|
e6d7979e92
|
dbcontext: EnableRetryOnFailure for MySQL provider
|
2022-05-25 16:55:38 +03:00 |
|
|
|
664e718fa0
|
Files: added custom tags audit
|
2022-05-25 15:34:38 +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 |
|
|
|
b525696b03
|
fix usings
|
2022-05-24 18:41:28 +03:00 |
|
|
|
02570e12cf
|
Merge branch 'develop' into feature/cluster-services
|
2022-05-24 17:24:25 +03:00 |
|
|
|
5599fc9809
|
Merge branch 'develop' into feature/remove-application/x-www-form-urlencoded
|
2022-05-24 17:09:33 +03:00 |
|
|
|
13ad4381f7
|
Api: removed CustomHttpMethodAttribute
added AllowNotPaymentAttribute
|
2022-05-23 18:48:23 +03:00 |
|
|
|
dcc23ebbe5
|
Files: fix
|
2022-05-23 13:13:24 +03:00 |
|
|
|
5fa9c839e6
|
Files: fix
|
2022-05-23 12:29:14 +03:00 |
|
|
|
c9357da3b0
|
Files: added deleting tags, fix
|
2022-05-23 12:25:33 +03:00 |
|
|
|
6cb3ea538e
|
fix crm
|
2022-05-23 11:02:52 +03:00 |
|
|
|
7b6abe81a2
|
Files: added custom tags
|
2022-05-20 19:26:13 +03:00 |
|
|
|
91c4e454c5
|
add loggers
|
2022-05-20 18:24:41 +03:00 |
|
|
|
75da995099
|
Merge branch 'develop' into feature/logger-refactoring
|
2022-05-20 17:01:51 +03:00 |
|
|
|
19d219ba84
|
Merge pull request #650 from ONLYOFFICE/feature/logger-Files.Core
Feature/logger files.core
|
2022-05-20 16:22:16 +03:00 |
|
|
|
be9c7ffd12
|
fix
|
2022-05-20 16:15:13 +03:00 |
|
|
|
52cdf0758e
|
fix crm
|
2022-05-19 18:47:59 +03:00 |
|
|
|
b0b7b19874
|
Merge pull request #656 from ONLYOFFICE/feature/logger-People
logger-People
|
2022-05-19 17:06:12 +03:00 |
|
|
|
f812c8e052
|
Merge pull request #652 from ONLYOFFICE/feature/logger-Files
Feature/logger files
|
2022-05-19 16:14:47 +03:00 |
|
|
|
36855d656f
|
remove application/x-www-form-urlencoded
|
2022-05-17 12:29:24 +03:00 |
|
|
|
2e33540486
|
Merge branch 'feature/docspace' into feature/docspace-links
|
2022-05-17 11:53:37 +03:00 |
|
|
|
6c45bb0632
|
Merge branch 'develop' into feature/docspace
|
2022-05-17 11:50:56 +03:00 |
|
|
|
1c4dacf66b
|
added data for validation
|
2022-05-16 20:19:24 +03:00 |
|
