IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,029 Commits 38 Branches 22 Tags 359 MiB
f907244431
Commit Graph

465 Commits

Author SHA1 Message Date
pavelbannov
31752e64b4 fixed warnings 2021-05-14 15:26:18 +03:00
pavelbannov
c93813c7d3 Pomelo up to 5.0.0 2021-05-06 12:31:55 +03:00
pavelbannov
4b756843ca Tfa: validate confirm link 2021-04-16 21:54:53 +03:00
pavelbannov
50d01a646d Core: fixed creating group 2021-04-06 21:04:15 +03:00
pavelbannov
ee6ffd3ace Updated packages 2021-04-06 20:16:24 +03:00
pavelbannov
a0570554dd Fixed migrations 2021-03-26 12:26:57 +03:00
pavelbannov
65e1c72c01 Sln: fixed packages 2021-03-26 12:26:12 +03:00
pavelbannov
18a2c0a53d Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
#	common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
#	common/ASC.Core.Common/EF/Model/DbipLocation.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
#	common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
#	common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResData.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
#	common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
#	common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTag.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
 2021-03-25 21:50:09 +03:00
Diana
976b955137 fix data in table core_settings 2021-03-17 14:30:25 +03:00
pavelbannov
91105e8cd0 EF: removed old column tariff_key 2021-03-17 12:09:49 +03:00
Diana
73731f23b7 fix 2021-03-16 12:53:06 +03:00
Diana
4e62f6a204 update migrations ef tools v.5.0.3 2021-03-09 20:56:57 +03:00
pavelbannov
dccbe81002 DataAnnotations: fix 2021-02-25 21:18:27 +03:00
Diana
5c3f2975e8 fix NotMapped 2021-02-25 13:23:26 +03:00
pavelbannov
b25dd2d6e2 .net 5 2021-02-25 12:02:28 +03:00
Diana
f1091f409a fix dataannotations 2021-02-25 12:00:53 +03:00
Diana
4ddd2cebec delete dataannotations 2021-02-20 22:02:12 +03:00
pavelbannov
d823516aa3 fixed profile removed resource 2021-02-03 14:07:18 +03:00
pavelbannov
e11a880956 Core: fix migrations 2021-01-25 15:31:28 +03:00
pavelbannov
036ddc87c3 5.0.2 2021-01-22 16:49:38 +03:00
pavelbannov
f222f4be0c .net 5 2021-01-22 16:42:26 +03:00
pavelbannov
f8be896241 Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
 2021-01-22 16:34:40 +03:00
pavelbannov
ae69a9559e Files: removed temp 2021-01-13 12:41:29 +03:00
pavelbannov
f6ca373137 MemoryCache -> IMemoryCache 2021-01-12 20:51:14 +03:00
pavelbannov
53c422c2b2 revert 2020-12-30 18:03:21 +03:00
pavelbannov
fa7c2bf9f1 Merge branch 'develop' into feature/asc-files-tests 2020-12-29 18:37:28 +03:00
pavelbannov
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
pavelbannov
62cd0a6af0 Test: fix test migrate, drop test db 2020-12-25 13:48:04 +03:00
Diana
aa667a02ef fix 2020-12-24 03:21:29 +03:00
Diana
e20b87447e Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2020-12-24 03:18:47 +03:00
AlexeySafronov
76d7ed6c73 Merge branch 'master' into develop 
# Conflicts:
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/src/components/drop-down/index.js
 2020-12-23 21:42:44 +03:00
pavelbannov
1891813132 fix save tenant 2020-12-23 18:36:05 +03:00
pavelbannov
d4b736103a Users: fixed queries 2020-12-23 13:12:07 +03:00
Diana
9b338e0f78 Merge branch 'feature/asc-files-tests' of https://github.com/ONLYOFFICE/AppServer into develop 2020-12-22 15:37:10 +03:00
Diana
589c17ac95 fix 2020-12-22 02:27:10 +03:00
pavelbannov
b0dd9c1400 Files: optimization 2020-12-15 13:29:53 +03:00
pavelbannov
c764812d3a Common: refactoring 2020-12-04 16:48:54 +03:00
pavelbannov
1675896294 Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs
 2020-12-04 11:59:10 +03:00
pavelbannov
b487adb9fc Refactoting & optimization 2020-11-24 13:15:11 +03:00
pavelbannov
eb6b54482e fix warnings 2020-11-17 13:47:17 +03:00
pavelbannov
1623241d8a Code cleanup 2020-11-17 13:00:01 +03:00
pavelbannov
d2a0d318f7 dotnet 5 2020-11-17 12:59:15 +03:00
pavelbannov
1490332568 Merge branch 'develop' into refactoring/scope 
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Helpers/WordpressHelper.cs
#	products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
#	products/ASC.Files/Server/Startup.cs
 2020-11-10 11:42:50 +03:00
pavelbannov
3b2bebddf2 TenantManager: fix currentTenant 2020-11-09 14:51:21 +03:00
pavelbannov
79ea471098 Merge branch 'develop' into refactoring/scope 
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Core.Common/BaseCommonLinkUtility.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Migration/Program.cs
#	common/services/ASC.Notify/NotifyServiceLauncher.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Socket.IO.Svc/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Thumbnails.Svc/Program.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
 2020-11-04 15:22:43 +03:00
pavelbannov
c9a32c05dc Merge branch 'develop' into feature/connect-controlPanel 
# Conflicts:
#	web/ASC.Web.Api/Controllers/PortalController.cs
 2020-11-02 13:56:52 +03:00
pavelbannov
1278b2abb5 Notify: fix 2020-10-30 20:51:01 +03:00
pavelbannov
4056ea888a Notify: fix urls 2020-10-30 17:57:31 +03:00
pavelbannov
43beaf6f6b Refactoring: scope 2020-10-29 17:30:08 +03:00
pavelbannov
3256a3dbc7 DI: fix 2020-10-28 23:02:03 +03:00