Commit Graph

8779 Commits

Author SHA1 Message Date
77ecf6f988 Files: fix 2022-06-14 18:12:37 +03:00
7194fec848 Files: fix 2022-06-14 13:30:12 +03:00
a98eb791e8 Files: refactor 2022-06-14 01:33:37 +03:00
de36de1870 Files: fix 2022-06-14 00:04:45 +03:00
269cdd9825 Files: refactor 2022-06-13 21:50:49 +03:00
f68585bf9d Files: fix 2022-06-13 21:04:51 +03:00
3e2483a016 Files: added rooms folder cache clearing 2022-06-13 17:41:13 +03:00
5be6e7cbee Files: fix 2022-06-13 17:40:34 +03:00
2336dc9762 Files: refactor 2022-06-13 17:40:25 +03:00
239d1803c7 FIles: refactor 2022-06-13 17:32:24 +03:00
e618f7f450 Files: fix filter, added clearing rooms cache 2022-06-10 22:32:21 +03:00
d370c797bb Files: added virtual rooms default share 2022-06-10 22:31:24 +03:00
2811e694c6 Files: fix System.NullReferenceException 2022-06-10 22:30:49 +03:00
7fdf89ecae Files: added thirdparty rooms tags query 2022-06-10 22:30:28 +03:00
1b6d96400c Files: changed filtering rooms by types 2022-06-09 20:11:12 +03:00
16b5a4cac8 Files: refactor 2022-06-09 13:24:54 +03:00
ef4b0a17f2 Files: added room presets 2022-06-09 11:38:34 +03:00
8ad71434c1 Files: added room presets 2022-06-09 11:33:31 +03:00
8f8fc7323d Files: refactor 2022-06-09 11:33:14 +03:00
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