|
|
d41b12cdc8
|
DbTenant: fix
|
2020-10-14 12:59:37 +03:00 |
|
|
|
18aad95bf0
|
Merge pull request #97 from ONLYOFFICE/feature/remove-FileOperationsManagerHelper
remove-FileOperationsManagerHelper: first version
|
2020-10-13 18:06:59 +03:00 |
|
|
|
5c42b9d04e
|
Merge branch 'master' into feature/remove-FileOperationsManagerHelper
|
2020-10-13 15:50:51 +03:00 |
|
|
|
788bddeb4f
|
Studio: fix
|
2020-10-13 15:26:54 +03:00 |
|
|
|
ca8c5625e2
|
Merge pull request #96 from ONLYOFFICE/feature/fix_API_return
fix_API_return: first version
|
2020-10-13 14:06:48 +03:00 |
|
|
|
9968873305
|
Merge branch 'master' into feature/fix_API_return
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2020-10-13 13:33:24 +03:00 |
|
|
|
9a2fde062d
|
Merge pull request #86 from ONLYOFFICE/feature/fix-messages
Feature/fix messages
|
2020-10-13 11:28:46 +03:00 |
|
|
|
a1bcf2eb3e
|
Merge branch 'master' into feature/fix-messages
|
2020-10-13 11:28:19 +03:00 |
|
|
|
b1d50e5702
|
Core: fix DI
|
2020-10-13 11:26:17 +03:00 |
|
|
|
65fd5ee2f3
|
Api: fix DI
|
2020-10-13 11:13:24 +03:00 |
|
|
|
fb5a6b9926
|
Api: fix DI
|
2020-10-13 11:11:03 +03:00 |
|
|
|
bead971061
|
Api: fix DI
|
2020-10-13 11:09:22 +03:00 |
|
|
|
b4a0a302e6
|
Files: fix di
|
2020-10-13 10:28:13 +03:00 |
|
|
|
cefc64422e
|
Files: fix di
|
2020-10-13 10:23:53 +03:00 |
|
|
|
ae8fd12b35
|
Files: fix di
|
2020-10-13 10:21:02 +03:00 |
|
|
|
c622be89a3
|
revert discard
|
2020-10-12 22:39:23 +03:00 |
|
|
|
5e11f96a0c
|
fix
|
2020-10-12 22:15:27 +03:00 |
|
|
|
a8b838b4ce
|
fix
|
2020-10-12 22:12:03 +03:00 |
|
|
|
beeeaf3c3d
|
fix
|
2020-10-12 20:43:31 +03:00 |
|
|
|
f6f65f5968
|
fix
|
2020-10-12 20:40:14 +03:00 |
|
|
|
5e14bbb8cc
|
fix
|
2020-10-12 20:20:19 +03:00 |
|
|
|
43b9c33979
|
fix formating
|
2020-10-12 19:23:15 +03:00 |
|
|
|
383478d3bd
|
fix
|
2020-10-12 19:13:51 +03:00 |
|
|
|
26bb1567f7
|
ProductSecurityFilter: fix
|
2020-10-12 19:00:04 +03:00 |
|
|
|
b120d801aa
|
Confirm: fix
|
2020-10-12 18:58:38 +03:00 |
|
|
|
6f23d92ee8
|
editorconfig
|
2020-10-12 18:50:36 +03:00 |
|
|
|
36034bf97a
|
fix warnings
|
2020-10-12 16:52:31 +03:00 |
|
|
|
a3f36c2796
|
Nginx: fix
|
2020-10-12 12:22:23 +03:00 |
|
|
|
344acefa9b
|
Files: fix filter
|
2020-10-12 11:26:15 +03:00 |
|
SuhorukovAnton
|
5e6ad050ab
|
Merge branch 'master' into feature/fix-messages
|
2020-10-12 10:43:19 +03:00 |
|
SuhorukovAnton
|
917493f397
|
fix-messages: IDE0058
|
2020-10-10 14:35:05 +03:00 |
|
SuhorukovAnton
|
f4c0515340
|
fix-messages: IDE0022
|
2020-10-10 13:01:09 +03:00 |
|
|
|
bd822fedd0
|
ds-vpath rewrite
|
2020-10-09 22:40:06 +03:00 |
|
|
|
9c7e979494
|
Config: internal path
|
2020-10-09 20:59:56 +03:00 |
|
|
|
26ac508aef
|
Config: internal path
|
2020-10-09 20:41:26 +03:00 |
|
|
|
4759f8c90b
|
Config: internal path
|
2020-10-09 20:26:25 +03:00 |
|
|
|
49a7e215d2
|
added editorconfig
|
2020-10-09 18:52:17 +03:00 |
|
SuhorukovAnton
|
72fbf6b81e
|
remove-FileOperationsManagerHelper: first version
|
2020-10-09 17:13:44 +03:00 |
|
|
|
e01ee037f2
|
Merge branch 'master' into feature/fix-messages
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Core.Common/EF/Context/CoreDbContext.cs
# common/ASC.Core.Common/EF/Context/DbContext.cs
# common/ASC.Core.Common/EF/Context/DbContextManager.cs
# common/ASC.Core.Common/EF/Context/FeedDbContext.cs
# common/ASC.Core.Common/EF/Context/FilesDbContext.cs
# common/ASC.Core.Common/EF/Context/MessagesContext.cs
# common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
# common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# common/ASC.Core.Common/EF/Model/AccountLinks.cs
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
# common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
# common/ASC.Core.Common/EF/Model/Core/Subscription.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
# common/ASC.Core.Common/EF/Model/TelegramUser.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
# common/ASC.Core.Common/EF/Model/User/UserGroup.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.VoipService/Dao/CachedVoipDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
# products/ASC.Files/Core/Core/EF/DbFile.cs
# products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
# products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
# products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
# products/ASC.Files/Core/Core/EF/DbFolderTree.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Startup.cs
# web/ASC.Web.Studio/Startup.cs
|
2020-10-09 15:40:44 +03:00 |
|
SuhorukovAnton
|
370400e4c0
|
fix_API_return: first version
|
2020-10-09 13:05:48 +03:00 |
|
|
|
43a085eb18
|
Merge pull request #88 from ONLYOFFICE/feature/schema
Feature/schema
|
2020-10-08 13:51:06 +03:00 |
|
|
|
42e723ea49
|
Kafka: fix
|
2020-10-08 12:15:16 +03:00 |
|
|
|
bc1438ba92
|
EF: rename
|
2020-10-08 12:07:05 +03:00 |
|
|
|
b9e74c0e4d
|
DbContextManager: fix
|
2020-10-08 11:56:46 +03:00 |
|
|
|
573dc8922b
|
Merge branch 'master' into feature/schema
# Conflicts:
# common/ASC.Common/DIHelper.cs
|
2020-10-08 11:42:57 +03:00 |
|
|
|
e8061d10bd
|
DI: refactoring
|
2020-10-08 11:36:47 +03:00 |
|
|
|
41eaf5d885
|
Files: api. AddToRecent
|
2020-10-07 17:31:17 +03:00 |
|
|
|
37d36ce86c
|
Supervisor: fix backup
|
2020-10-07 16:10:20 +03:00 |
|
Diana
|
2ceb82b458
|
flag to turn on/off migrations
|
2020-10-07 15:20:06 +03:00 |
|
|
|
08590b6b58
|
Fix confirm
|
2020-10-07 13:45:53 +03:00 |
|
