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

1418 Commits

Author SHA1 Message Date
pavelbannov
59c88e2006 up to 6.0.0 2021-11-23 17:56:27 +03:00
pavelbannov
8ca88e4620 Merge branch 'develop' into feature/net6 
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/ASC.Common.csproj
#	products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
 2021-11-23 16:40:50 +03:00
pavelbannov
6ccda4d68d UserManager: revert cache 2021-11-23 15:25:34 +03:00
pavelbannov
197ce829b4 Merge branch 'develop' into feature/reworked-user-service 2021-11-23 15:01:23 +03:00
AlexeySafronov
51d6f72862 Web: Files: Fix translation 2021-11-22 14:58:06 +03:00
AlexeySafronov
5e9ad53f6f Web: Tests: Fix key 'ns' issues 2021-11-22 11:19:52 +03:00
AlexeySafronov
f675415228 Merge branch 'master' into release/v1.1.0 
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/public/locales/en/SelectFile.json
#	products/ASC.Files/Client/public/locales/en/SelectFolder.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/public/locales/en/Translations.json
#	products/ASC.People/Client/public/locales/ru/Translations.json
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
 2021-11-21 14:26:20 +03:00
AlexeySafronov
d31ea87211 Merge branch 'master' into develop 
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
 2021-11-21 13:57:55 +03:00
pavelbannov
cc35174d16 moved from 043e301 2021-11-16 20:40:15 +03:00
AlexeySafronov
c7c7267a9a Test: Added new WrongTranslationVariablesTest and fix it's issues 2021-11-13 19:03:10 +03:00
pavelbannov
0192c3265b Billing: fix 2021-11-12 15:33:03 +03:00
AlexeySafronov
bf80a38df0 Tests: Fix NotFoundKeysTest for "Home:EmptyFolderHeader" and "Home:ContainsSpecCharacter" 2021-11-08 15:52:16 +03:00
AlexeySafronov
90199126c7 Tests: Skip Banner.js (translations from firebase) from NotFoundKeysTest 2021-11-08 15:46:15 +03:00
pavelbannov
1bc93172d3 OAuth: fix 2021-11-02 20:39:30 +03:00
Ilya Oleshko
aa79ef2c9d Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-02 14:03:26 +03:00
pavelbannov
49c820b779 Merge branch 'develop' into feature/reworked-user-service 2021-11-02 13:07:07 +03:00
AlexeySafronov
8cc08045b7 Merge branch 'master' into develop 
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
 2021-11-01 13:54:40 +03:00
pavelbannov
3b7f02339b Webhooks: fix 2021-10-29 20:02:45 +03:00
pavelbannov
1882f9db43 Fixed settings issue 2021-10-29 17:21:51 +03:00
pavelbannov
b15bc7b5cf WebHook: fix service 2021-10-29 13:23:37 +03:00
pavelbannov
26511d9fb7 Merge branch 'develop' into feature/webhooks 
# Conflicts:
#	ASC.Tests.sln
 2021-10-29 13:18:57 +03:00
Alexey Bannov
8c7815d9a5
Merge pull request #427 from ONLYOFFICE/feature/sc 
Feature/sc
 2021-10-28 18:49:01 +03:00
pavelbannov
40dc6a8e86 fix loading products 2021-10-28 16:07:14 +03:00
pavelbannov
3acecdc9ad Migration: fix warnings 2021-10-28 16:04:36 +03:00
pavelbannov
a69df29e7d Services: fix httpContextAccessor 2021-10-28 13:23:26 +03:00
Alexey Bannov
08205c2780 setup Kestrel for ApiSystem 2021-10-27 20:03:59 +03:00
Alexey Bannov
0215599566 merge from develop 2021-10-27 19:37:12 +03:00
pavelbannov
627642e838 fix warning 2021-10-27 12:33:39 +03:00
pavelbannov
399377ff43 Merge branch 'develop' into feature/dbcontextmanager-optimization 2021-10-26 22:05:41 +03:00
Alexey Bannov
957aa8bd81 fixed started services 2021-10-26 20:09:19 +03:00
pavelbannov
cb8bc701ec fix migrations 2021-10-26 16:14:40 +03:00
pavelbannov
b1134d239c Merge branch 'develop' into feature/auto-migrations 
# Conflicts:
#	common/ASC.Core.Common/EF/Context/UserDbContext.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/MySqlAccountLinkContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/MySqlDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/MySqlFeedDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/MySqlMailDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20210803212546_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/MySqlMessagesContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/MySqlNotifyDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/MySqlResourceDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/MySqlTelegramDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/MySqlTenantDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210309095256_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210803213502_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/MySqlWebstudioDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
 2021-10-25 20:52:13 +03:00
pavelbannov
403388fbf1 Added solution filter 
Removed unused services
replaced sh with bat
start service from source
 2021-10-25 14:29:36 +03:00
MaksimChegulov
4b2f7242fc Tools: refactor 2021-10-22 20:05:40 +03:00
MaksimChegulov
b4069a7281 Tools: remove 2021-10-22 20:05:28 +03:00
MaksimChegulov
55a28d2d83 Tools: add references 2021-10-22 20:05:11 +03:00
MaksimChegulov
61068e6110 Tools: refactor 2021-10-22 20:04:26 +03:00
MaksimChegulov
54803deaed Tools: add project info model 2021-10-22 20:03:59 +03:00
MaksimChegulov
5592db68ed Tools: add search for several projects 2021-10-22 20:03:32 +03:00
MaksimChegulov
cbc07325ca Tools: refactor 2021-10-22 20:02:47 +03:00
MaksimChegulov
c8055f879e Tools: replace constant assembly name with mutable 2021-10-22 20:02:19 +03:00
MaksimChegulov
5334e97313 add solution parser 2021-10-22 19:57:33 +03:00
MaksimChegulov
c02e5867d7 Storage: fix conflict namespace 2021-10-22 19:51:51 +03:00
SuhorukovAnton
30277d4fb3 net6: bugfix 2021-10-22 17:20:40 +03:00
SuhorukovAnton
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
MaksimChegulov
018c1939ab replace type name with type 2021-10-22 13:08:09 +03:00
pavelbannov
5eab8516f8 EF: removed unused class 2021-10-22 12:30:06 +03:00
pavelbannov
36db823276 removed unused class 2021-10-22 11:54:45 +03:00
pavelbannov
dd8f77f827 Merge branch 'develop' into feature/wizard/migration 2021-10-22 11:44:21 +03:00
SuhorukovAnton
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
SuhorukovAnton
f6f317ec42 net6: refactoring and bugfix 2021-10-21 16:23:26 +03:00
pavelbannov
ed8487e99f Webhook: format 2021-10-19 19:53:28 +03:00
pavelbannov
5a5e299d98 Merge branch 'develop' into feature/webhooks 
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
 2021-10-19 18:30:59 +03:00
pavelbannov
9f12c95828 Merge branch 'feature/webhooks' of github.com:ONLYOFFICE/AppServer into feature/webhooks 2021-10-19 15:25:53 +03:00
Ilya Oleshko
4bd4954ad4 Merge branch 'release/1.0.0' into feature/desktop-login 2021-10-19 13:10:47 +03:00
Ilya Oleshko
9dd28a144d Web: Fixed callback pages, added login callback for desktop client 2021-10-19 10:31:34 +03:00
pavelbannov
fb7922f579 Thirdparty: login. Desktop 2021-10-15 11:34:34 +03:00
Alexey Bannov
803a8f3baa fixed bug 53156: removed constructor without HttpContextAccessor parameter. 2021-10-14 18:36:31 +03:00
Alexey Bannov
a324b8b9b9 fixed bug 52923 for s3 storage 2021-10-13 16:23:54 +03:00
SuhorukovAnton
735a9b60cf net6: warning CA1416 
also remove unnecessary usings
 2021-10-13 11:07:03 +03:00
pavelbannov
66d126410c Login: added desktop param 2021-10-13 10:25:19 +03:00
MaksimChegulov
f5a25b80be update migrations 2021-10-12 17:54:11 +03:00
MaksimChegulov
0fb10454ca refactor 2021-10-12 17:51:36 +03:00
MaksimChegulov
24f658754f refactor 2021-10-12 17:51:13 +03:00
MaksimChegulov
4c972a48c2 changed last migration searching logic 2021-10-12 17:50:42 +03:00
MaksimChegulov
9db8371344 add contexts search for all providers 2021-10-12 17:48:33 +03:00
MaksimChegulov
1a7021d6c4 move to directories 2021-10-12 17:45:12 +03:00
MaksimChegulov
a19dfef1ab update postgresql migrations 2021-10-12 13:25:56 +03:00
MaksimChegulov
55da5e7c54 add postgresql model configuring 2021-10-12 13:24:19 +03:00
MaksimChegulov
1ddbb41052 rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
SuhorukovAnton
ae9a3187bc net6: warning SYSLIB0014 2021-10-12 13:14:33 +03:00
MaksimChegulov
b483025437 add provider name property 2021-10-12 12:43:49 +03:00
MaksimChegulov
9541b9e6b4 optimization migration 2021-10-12 12:04:24 +03:00
MaksimChegulov
94c81d11d1 add generation migration name logic 2021-10-11 17:34:11 +03:00
MaksimChegulov
494a201a0b cosmetic changes 2021-10-11 17:25:25 +03:00
MaksimChegulov
243a2cb55f update migration 2021-10-11 17:24:15 +03:00
MaksimChegulov
8b4d793d78 remove unnecessary HasData 2021-10-11 17:23:39 +03:00
MaksimChegulov
0066585554 replace DateTime.Now to fixed DateTime 2021-10-11 17:23:02 +03:00
MaksimChegulov
73624e0aed add auto migration creator 2021-10-07 12:52:35 +03:00
MaksimChegulov
8ced3a052a change access modificator 2021-10-07 12:51:29 +03:00
MaksimChegulov
040f3065c5 fix 2021-10-07 12:51:10 +03:00
MaksimChegulov
6cc771bb87 fix 2021-10-07 12:50:57 +03:00
MaksimChegulov
814fe65535 fix 2021-10-07 12:49:55 +03:00
SuhorukovAnton
05b2c63543 net6: warning SYSLIB0013 2021-10-07 12:05:32 +03:00
SuhorukovAnton
1ac44d3c92 net6: warning SYSLIB0021 2021-10-07 12:03:13 +03:00
SuhorukovAnton
7a380542aa net6: warning SYSLIB0023 2021-10-07 12:00:26 +03:00
pavelbannov
498a896322 fix Bug 50254 2021-10-05 22:28:07 +03:00
SuhorukovAnton
8409b10705 net6: warning SYSLIB0022 2021-10-01 13:34:47 +03:00
SuhorukovAnton
0f833ae1de net6: warning SYSLIB0020 2021-10-01 13:26:36 +03:00
pavelbannov
24224a7437 Files: fix rename folders. fix favorites 2021-09-30 21:26:01 +03:00
pavelbannov
1bc64ce5ae Files: check state before get stream 2021-09-30 09:51:38 +03:00
MaksimChegulov
6c5d0d8940 add GetUserGroupRef 2021-09-28 20:32:22 +03:00
MaksimChegulov
1c4d1efa83 fix 2021-09-28 20:30:02 +03:00
MaksimChegulov
82cb6ddb6a add scoped caching, remove unnecessary 2021-09-28 20:29:25 +03:00
MaksimChegulov
2bd3a5764d add method GetUserGroupRef, change return type 2021-09-28 20:26:16 +03:00
pavelbannov
d27160cf98 Fix mobile app requests 2021-09-28 14:41:35 +03:00
MaksimChegulov
511cea560b add scoped caching 2021-09-27 19:59:09 +03:00
MaksimChegulov
a0e39d0112 add ScopeCache 2021-09-27 19:54:01 +03:00
pavelbannov
e755d2eda8 renamed providers to lowercase 2021-09-24 17:36:46 +03:00
pavelbannov
90bb2ef44a fixed bearer 2021-09-24 12:08:10 +03:00
pavelbannov
315665e87a BuildAndDeploy 2021-09-23 20:58:39 +03:00
pavelbannov
f4feb48d2c fix dependencies 2021-09-22 19:51:06 +03:00
pavelbannov
d32f555706 ResManager: fix 2021-09-17 16:46:24 +03:00
diana-vahomskaya
a5e1609dac two methods 2021-09-16 11:25:17 +03:00
pavelbannov
ea4fa97838 Merge branch 'develop' into feature/wizard/migration 
# Conflicts:
#	ASC.Tests.sln
#	common/ASC.Core.Common/EF/Model/Tenant/DbQuota.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/Tests/ASC.Common.Tests/ASC.Common.Tests.csproj
#	common/Tests/ASC.Core.Common.Tests/ASC.Core.Common.Tests.csproj
#	common/Tests/ASC.Notify.Textile.Tests/ASC.Notify.Textile.Tests.csproj
 2021-09-15 15:52:13 +03:00
pavelbannov
ec66a65d38 User: fix request 2021-09-10 17:00:26 +03:00
pavelbannov
2e20b4958d fix CookieAuthHandler 2021-09-08 13:16:58 +03:00
pavelbannov
51d905abc6 Cookie: logout after failed auth 2021-09-07 22:58:01 +03:00
pavelbannov
5a5bb8fb25 Merge branch 'develop' into release/1.0.0 2021-09-05 22:59:31 +03:00
pavelbannov
1e77063d32 fix Bug 51866 2021-09-05 22:59:14 +03:00
pavelbannov
d099326e7f Merge branch 'develop' into feature/backup.core 
# Conflicts:
#	common/services/ASC.Data.Backup/Program.cs
 2021-09-05 12:50:05 +03:00
pavelbannov
ec7fcd34b3 Merge branch 'develop' into release/1.0.0 2021-09-03 18:07:09 +03:00
pavelbannov
9cb01be544 Elastic: removed unused isInit 2021-09-03 18:05:05 +03:00
pavelbannov
d78195aa5a Added notify 2021-09-03 18:04:06 +03:00
Vashchuk Nikita
3b4cb1dfc6 Added GlobalFilter, fix 2021-09-03 17:02:52 +03:00
pavelbannov
0970b1b420 Merge branch 'develop' into release/1.0.0 2021-09-02 23:50:18 +03:00
pavelbannov
211224ca1a Storage: fix S3 2021-09-02 23:49:59 +03:00
SuhorukovAnton
c5b135afbe backup.core: remove waste 2021-09-02 16:11:41 +03:00
SuhorukovAnton
8171563965 backup.core: move backup.core 2021-09-02 15:41:54 +03:00
Ilya Oleshko
fa204303f5 Merge branch 'develop' into release/1.0.0 2021-09-01 16:08:41 +03:00
SuhorukovAnton
d8654444c6 backup.core: fix 2021-08-31 16:59:32 +03:00
SuhorukovAnton
115d752582 backup.core: fix 2021-08-31 15:43:40 +03:00
SuhorukovAnton
a812971c07 Merge branch 'develop' into feature/backup.core 2021-08-31 13:55:47 +03:00
SuhorukovAnton
4b3cb1b4fb backup.core: first version 2021-08-31 12:40:28 +03:00
pavelbannov
f62209d88e Merge branch 'develop' into feature/webhooks 2021-08-30 19:18:18 +03:00
pavelbannov
a84bddad3c fix 2021-08-30 19:17:57 +03:00
pavelbannov
2addb81adf Quota: Price2 removed 2021-08-30 18:19:20 +03:00
Vashchuk Nikita
5e6bd9ee5f fix 2021-08-27 18:33:21 +03:00
Vashchuk Nikita
0521d8af09 fix 2021-08-27 17:50:49 +03:00
Vashchuk Nikita
d66600b6c7 fix 2021-08-27 10:50:52 +03:00
Vashchuk Nikita
e5b40b3d0c fix ASC.Webhooks.Tests 2021-08-27 00:15:47 +03:00
Vashchuk Nikita
45d221a109 Split webhooks into service and core 2021-08-26 21:43:41 +03:00
pavelbannov
dd9e5e9b5d Merge branch 'develop' into feature/webhooks 2021-08-26 15:17:53 +03:00
pavelbannov
14e8c59b17 Merge branch 'develop' into release/1.0.0 2021-08-25 21:17:41 +03:00
pavelbannov
b791586252 net6 2021-08-25 18:26:13 +03:00
Vashchuk Nikita
c41361bdd8 fix 2021-08-24 11:08:58 +03:00
pavelbannov
a0f5c4231f fixed run via vs 2021-08-23 15:55:19 +03:00
Vashchuk Nikita
c851641b6c Merge remote-tracking branch 'remotes/origin/feature/webhooks' into feature/webhooks 2021-08-23 13:01:48 +03:00
Vashchuk Nikita
9f0e41b880 Merge branch 'develop' into feature/webhooks 2021-08-23 12:36:01 +03:00
pavelbannov
a471a19dfd Merge branch 'develop' into release/1.0.0 2021-08-23 11:50:35 +03:00
pavelbannov
610e31ec3b fixed equals 2021-08-20 19:04:55 +03:00
pavelbannov
e5faa90adb removed nuget warnings 2021-08-20 16:53:27 +03:00
pavelbannov
9207238d8d Merge branch 'develop' into release/1.0.0 2021-08-20 16:12:40 +03:00
pavelbannov
9f83801f88 Nlog: optimization 2021-08-20 15:42:43 +03:00
pavelbannov
91fd7615b3 Optimization 2021-08-20 10:52:52 +03:00
Vashchuk Nikita
3dc5ca5afc Merge branch 'develop' into feature/webhooks 2021-08-19 15:58:57 +03:00
pavelbannov
0745110a44 Test: fix 2021-08-19 15:58:25 +03:00
Vashchuk Nikita
66be58c759 fix 2021-08-19 15:56:14 +03:00
Vashchuk Nikita
e1c648e06a Merge branch 'develop' into feature/webhooks 2021-08-19 13:49:16 +03:00
Vashchuk Nikita
5e72bcc224 fix 2021-08-19 13:17:54 +03:00