|
c622be89a3
|
revert discard
|
2020-10-12 22:39:23 +03:00 |
|
|
36034bf97a
|
fix warnings
|
2020-10-12 16:52:31 +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 |
|
|
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 |
|
|
1ba65b9c01
|
EF: new Migration scheme
|
2020-10-06 10:06:18 +03:00 |
|
SuhorukovAnton
|
edbc0f247c
|
fix-messages: IDE0022
|
2020-09-30 17:47:42 +03:00 |
|
SuhorukovAnton
|
f618f8799b
|
fix-messages: IDE0062
|
2020-09-30 15:46:16 +03:00 |
|
SuhorukovAnton
|
ba1ed22345
|
fix-messages: IDE0058
|
2020-09-30 14:50:39 +03:00 |
|
|
b56df84bce
|
Settings: added password settings
|
2020-09-29 18:08:54 +03:00 |
|
SuhorukovAnton
|
29ec562a78
|
fix-messages: IDE0038
|
2020-09-28 18:21:29 +03:00 |
|
|
dd80e300d0
|
Common, Core.Common moved from release/11 4414f77b
|
2020-09-15 16:11:05 +03:00 |
|
|
82dd4a8828
|
Settings: fix timeZones for unix
|
2020-09-03 18:30:14 +03:00 |
|
maksim
|
8282f3f658
|
fix
|
2020-08-27 17:01:37 +03:00 |
|
SuhorukovAnton
|
6a005af895
|
private: bugfix
|
2020-08-12 14:11:41 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
|
f9dc19526c
|
Added sendjoininvite, sendadmmail
|
2020-07-24 17:01:20 +03:00 |
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
|
ff41b28a64
|
DI: files fix
|
2020-07-16 12:08:20 +03:00 |
|
|
47e597d3b0
|
Autofac: fix
|
2020-07-15 14:18:47 +03:00 |
|
|
baa71247d8
|
Merge branch 'master' into feature/general-startup
|
2020-07-15 13:06:32 +03:00 |
|
|
dfd8bbfdb8
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-07-13 15:28:11 +03:00 |
|
|
cd3240a7f6
|
Removed LimitedConcurrencyLevelTaskScheduler
|
2020-07-13 14:11:36 +03:00 |
|
|
5988855b61
|
Fix License
|
2020-07-08 18:30:23 +03:00 |
|
SuhorukovAnton
|
8b5ab8c9a4
|
api-defaultvalue: delete DataContracts
|
2020-07-08 13:10:09 +03:00 |
|
SuhorukovAnton
|
9d069de30a
|
general-startup: transform GeneralStartup to BaseStartup
|
2020-07-07 23:00:39 +03:00 |
|
|
57454bae0c
|
References updated
|
2020-06-28 16:55:21 +03:00 |
|
|
d53b11967a
|
Merge branch 'master' into feature/backup
|
2020-06-25 15:37:53 +03:00 |
|
|
d14313c6c1
|
References updated
|
2020-06-25 14:38:34 +03:00 |
|
|
725955e851
|
ProgressQueue: fix
|
2020-06-08 12:44:01 +03:00 |
|
|
f59be0f44b
|
Merge branch 'master' into feature/backup
|
2020-06-04 17:12:34 +03:00 |
|
|
fed4d206f7
|
Revert logger
|
2020-06-04 16:46:58 +03:00 |
|
|
794486f335
|
Notify: temp log
|
2020-06-04 16:04:17 +03:00 |
|
|
4ea72a0e65
|
Merge branch 'master' into feature/backup
# Conflicts:
# ASC.Web.sln
|
2020-06-04 14:39:40 +03:00 |
|
|
1c25d16fc2
|
Products: added absolute path support
|
2020-06-04 14:01:25 +03:00 |
|
SuhorukovAnton
|
89368aed8b
|
Backup: refactoring
|
2020-06-03 12:15:05 +03:00 |
|
|
a1778b5cdf
|
Packages updated
|
2020-06-01 14:36:23 +03:00 |
|
|
3fadf8db6c
|
fix log, added UrlShortenerService config
|
2020-05-21 11:03:35 +03:00 |
|
SuhorukovAnton
|
6acb0d4208
|
creating
|
2020-05-20 18:14:44 +03:00 |
|
|
550b0dd20e
|
Sln: packages updated
|
2020-05-18 10:27:22 +03:00 |
|
|
78442cd9eb
|
Files: Service fix
|
2020-05-15 14:02:05 +03:00 |
|
|
02b33bc07b
|
Merge branch 'master' into feature/files-index
# Conflicts:
# products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
|
2020-05-06 11:54:26 +03:00 |
|
|
1526d8e502
|
Common: removed StreamCopyTo
|
2020-05-06 11:41:27 +03:00 |
|
|
af7fb87e73
|
Elastic: settings
|
2020-05-03 18:50:40 +03:00 |
|
|
37b126e5cd
|
Files: search
|
2020-04-29 17:11:31 +03:00 |
|
|
623a6609cc
|
JWT: fix
|
2020-04-24 13:28:06 +03:00 |
|
|
4f025d9931
|
Files: fixed download
|
2020-04-23 14:50:34 +03:00 |
|
|
44f84c8056
|
Files: Service. first version
|
2020-04-23 12:38:50 +03:00 |
|
|
1b0784e3cf
|
Files: updated JWT
|
2020-04-16 16:07:30 +03:00 |
|
|
e986f73293
|
Files: fixed ComposeFileOperation
|
2020-03-20 11:11:38 +03:00 |
|