9395c23081
Merge branch 'develop' into feature/cluster-services-backup
2022-02-04 21:00:27 +03:00
f3b3b08af1
add support rabbitmq. split ASC.Data.Backup service on two services
2022-02-04 20:44:03 +03:00
7fddbbcd93
ApiCore: rename private static fileds by microsoft convention
2022-02-04 11:34:32 +03:00
973624c30b
Merge branch 'feature/refactoring' into feature/asc-common-refactor
2022-02-03 17:30:13 +03:00
487a55a99e
ApiCore: used file-scope namespaces, fix conflicts
2022-02-03 16:19:48 +03:00
524fb32a0d
Merge branch 'feauter/refactoring' into feauter/asc-api-core-refactor
2022-02-03 16:08:15 +03:00
62c8f69f25
Merge branch 'feature/refactoring' into 'feature/asc-clear-events-refactor'
2022-02-03 15:16:05 +03:00
34dab043e0
Merge branch 'develop' into feature/analizators
...
# Conflicts:
# common/ASC.Core.Common/ASC.Core.Common.csproj
2022-02-03 12:55:33 +03:00
4661ee96d0
Packages updated
2022-02-02 19:54:23 +03:00
c2d3d10ec5
refactoring : bugfix
2022-02-02 13:09:37 +03:00
f6620e34ae
Merge branch 'develop' into feature/refactoring
2022-02-02 13:09:25 +03:00
084e3a8d30
ApiCore: IServiceProvider replaced by IServiceScopeFactory
2022-02-01 20:07:26 +03:00
23eaa4be39
Common: private properties replaced with fields, used single line expressions, cosmetic
2022-02-01 17:51:29 +03:00
f2c0f3ec77
Common: ICahcheNotify is reduced to IEventBus
2022-02-01 14:38:03 +03:00
ad78c46495
Api: priveate properties replaced with fields, used single line expressions, cosmetic
2022-01-31 19:36:51 +03:00
2584fc4042
refactoring: remove waste
2022-01-31 18:15:43 +03:00
7ab885b2e2
refactoring: bugfix
2022-01-31 16:56:30 +03:00
34ff334692
Merge branch 'develop' into feature/analizators
2022-01-31 14:35:16 +03:00
1908af64f0
cache: return support kafka. refactoring
2022-01-27 15:20:51 +03:00
0628f4044a
refactoring: bugfix: apiCore
2022-01-26 16:04:22 +03:00
6a918e52a2
refactoring: add globalUsing: api.core
2022-01-26 11:06:31 +03:00
b4334b8947
analizators/Add HttpClient service
2022-01-25 13:47:36 +03:00
fce8d26cef
analizators/ca1507
2022-01-24 13:49:00 +03:00
fb3a61d0d2
analizators/s3442
2022-01-24 12:57:01 +03:00
510bd4d731
analizators/s2219
2022-01-21 16:42:02 +03:00
fb65d3a09d
analizators/1481
2022-01-21 16:15:15 +03:00
473259657e
analizators/s1118
2022-01-21 13:47:56 +03:00
728c1b896e
analizators/s1104
2022-01-21 12:19:57 +03:00
1403afbc16
analizators/U2U1209
2022-01-19 11:59:14 +03:00
84638feaf0
analizators/U2U1202
2022-01-18 16:54:24 +03:00
0ee1a35424
analizators/U2U1115
2022-01-17 11:22:52 +03:00
9bc8584184
analizators/U2U1103
2022-01-13 15:53:57 +03:00
cacb889ee2
analizators/U2U1100
2022-01-13 15:04:28 +03:00
986d1d49e6
refactoring: ICacheNotify<T> map to MemoryCacheNotify by default then RedisConfiguration is null
2022-01-13 14:24:14 +03:00
3d33fecf77
analizators/s2259
2021-12-30 14:00:03 +03:00
5e91416c53
analizators/s4035
2021-12-28 18:44:54 +03:00
dcc7986a90
map ICacheNotify<> to RedisCache<>
2021-12-23 18:27:58 +03:00
6d250efffa
add *.dll for support redis + update Grpc.* dll
2021-12-23 16:17:31 +03:00
04ccfb2caa
Webhooks: fix empty result
2021-12-14 15:51:03 +03:00
17d2c04533
fix Bug 53455
2021-12-13 19:23:05 +03:00
384e012c5f
net 6: remove TryUseWindowsService
2021-11-25 16:48:08 +03:00
b74e4ccfd1
Removed unused dependencies. Fixed tests
2021-11-24 12:39:39 +03:00
59c88e2006
up to 6.0.0
2021-11-23 17:56:27 +03:00
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
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
26511d9fb7
Merge branch 'develop' into feature/webhooks
...
# Conflicts:
# ASC.Tests.sln
2021-10-29 13:18:57 +03:00
8c7815d9a5
Merge pull request #427 from ONLYOFFICE/feature/sc
...
Feature/sc
2021-10-28 18:49:01 +03:00
40dc6a8e86
fix loading products
2021-10-28 16:07:14 +03:00
a69df29e7d
Services: fix httpContextAccessor
2021-10-28 13:23:26 +03:00
0215599566
merge from develop
2021-10-27 19:37:12 +03:00
403388fbf1
Added solution filter
...
Removed unused services
replaced sh with bat
start service from source
2021-10-25 14:29:36 +03:00
8ba2f0c694
Merge branch 'develop' into feature/backup
...
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# web/ASC.Web.Api/Models/SettingsWrapper.cs
2021-10-25 11:02:42 +03:00
e5e4a89e5b
Merge branch 'develop' into feature/net6
2021-10-22 16:10:37 +03:00
ed8487e99f
Webhook: format
2021-10-19 19:53:28 +03:00
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
735a9b60cf
net6: warning CA1416
...
also remove unnecessary usings
2021-10-13 11:07:03 +03:00
01879779cd
Merge branch 'develop' into feature/backup
2021-10-04 15:21:45 +03:00
0f833ae1de
net6: warning SYSLIB0020
2021-10-01 13:26:36 +03:00
24224a7437
Files: fix rename folders. fix favorites
2021-09-30 21:26:01 +03:00
d27160cf98
Fix mobile app requests
2021-09-28 14:41:35 +03:00
90bb2ef44a
fixed bearer
2021-09-24 12:08:10 +03:00
315665e87a
BuildAndDeploy
2021-09-23 20:58:39 +03:00
aa6c02b190
Merge branch 'develop' into feature/backup
...
# Conflicts:
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# packages/asc-web-common/api/settings/index.js
# packages/asc-web-common/components/PrivateRoute/index.js
# packages/asc-web-common/store/SettingsStore.js
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/ru/SelectFile.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/Shell.jsx
2021-09-20 16:26:34 +03:00
2e20b4958d
fix CookieAuthHandler
2021-09-08 13:16:58 +03:00
51d905abc6
Cookie: logout after failed auth
2021-09-07 22:58:01 +03:00
Vashchuk Nikita
3b4cb1dfc6
Added GlobalFilter, fix
2021-09-03 17:02:52 +03:00
Vashchuk Nikita
45d221a109
Split webhooks into service and core
2021-08-26 21:43:41 +03:00
dd9e5e9b5d
Merge branch 'develop' into feature/webhooks
2021-08-26 15:17:53 +03:00
b791586252
net6
2021-08-25 18:26:13 +03:00
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
610e31ec3b
fixed equals
2021-08-20 19:04:55 +03:00
Vashchuk Nikita
e1c648e06a
Merge branch 'develop' into feature/webhooks
2021-08-19 13:49:16 +03:00
Vashchuk Nikita
7d4b22ca83
added tests, migrations
2021-08-19 12:11:26 +03:00
cf87addaa3
Security: added new method
2021-08-18 17:04:16 +03:00
16469eb138
Api: added ConfigureNLogLogging
2021-08-08 15:56:54 +03:00
672de09a90
NLog: up to 4.7.10
2021-08-08 15:55:27 +03:00
Vashchuk Nikita
b70c2e6f09
fix
2021-08-03 19:26:28 +03:00
a0b34c5cc9
Webhook: fix
2021-07-31 20:12:41 +03:00
Vashchuk Nikita
3c8fadc28d
modified WebhooksMiddleware
2021-07-29 15:39:22 +03:00
Vashchuk Nikita
b913cdc813
Added WebhooksIdentifier.cs
2021-07-28 18:16:56 +03:00
Vashchuk Nikita
afdd1ab982
Added CustomMiddleware(WebhooksMiddleware.cs)
2021-07-28 13:10:14 +03:00
f1668a3b43
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
2021-07-27 12:43:01 +03:00
1268a436ca
Startup: fix load products
2021-07-16 11:56:14 +03:00
ad57feecd8
Log: fix configuring
2021-07-13 21:17:18 +03:00
7e6e25274f
Api: fix confirm
2021-07-10 20:27:15 +03:00
58cdc94843
add Tenant status in settings and refactoring tenantStatusFilter
2021-06-30 17:26:46 +03:00
349cdb9853
add check if restoring or transfering
2021-06-30 16:38:07 +03:00
a23b23de3c
Startup: added ability to skip load products and consumers
2021-06-24 11:15:20 +03:00
20d1f9a738
merge from develop
2021-06-23 16:10:46 +03:00
3788bab48e
HealthCheck: fix Studio
2021-06-22 19:55:47 +03:00
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
...
Feature/crm migrate
2021-06-16 17:02:46 +03:00
5fcbdbd7dd
added health checks
2021-06-16 16:54:36 +03:00
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth
2021-06-02 23:57:00 +03:00
2018820472
Merge branch 'develop' into feature/crm-migrate
2021-05-31 19:37:51 +03:00
3e6cc50323
Api: error custom messages
2021-05-31 18:08:55 +03:00
Vashchuk Nikita
82abf11109
Merge branch 'develop' into feature/calendar
...
# Conflicts:
# ASC.Web.sln
# config/autofac.products.json
# config/nginx/onlyoffice.conf
# products/ASC.Calendar/Server/ASC.Calendar.csproj
# products/ASC.Calendar/Server/Controllers/CalendarController.cs
# products/ASC.Calendar/Server/Program.cs
# products/ASC.Calendar/Server/Properties/launchSettings.json
# products/ASC.Calendar/Server/Resources/CalendarAddonResource.Designer.cs
# products/ASC.Calendar/Server/Resources/CalendarAddonResource.resx
# products/ASC.Calendar/Server/Startup.cs
2021-05-18 13:24:02 +03:00
92ce702b28
crm: refactoring. bugfix
2021-05-05 17:09:05 +03:00
261e6d8b4c
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-05 15:09:59 +03:00
c86257cf67
Merge branch 'develop' into feature/crm-migrate
2021-05-04 11:25:27 +03:00
0dbadc6394
from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects
2021-04-30 18:42:10 +03:00
8816e535c1
merge from develop
2021-04-28 19:50:59 +03:00
38ed10ccb8
Merge branch 'feature/two-factor-auth' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-04-28 11:13:01 +03:00
f4d091135c
ConfirmAuth: auth by email
2021-04-27 20:27:23 +03:00
NikitaVashchuk
3eb3cef5a3
fix
2021-04-20 10:55:52 +03:00
bd495757cc
Merge branch 'master' into develop
2021-04-19 18:52:56 +03:00
5f2998af87
refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile
2021-04-16 19:33:26 +03:00
226792cc42
Files: fixed tests
2021-04-14 14:51:17 +03:00
8ff27ff1be
added ControllerNameAttributeConvention
2021-04-02 18:46:00 +03:00
c0582c1130
merge from develop
2021-04-01 16:28:36 +03:00
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
c750a55e36
core: added ControllerNameAttribute
2021-03-22 19:07:34 +03:00
d568693154
Big Fix commit:
...
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
f0e227731f
Fixed loading products, lazy loading webitemmanager
2021-01-26 12:29:50 +03:00
64655a7da0
Api: modules. Added info method
2021-01-25 17:37:26 +03:00
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
f6ca373137
MemoryCache -> IMemoryCache
2021-01-12 20:51:14 +03:00
29aa793329
Api: max data count - 1000
2020-12-15 14:13:14 +03:00
75fce656f0
Merge branch 'develop' into feature/dotnet5
2020-11-17 11:31:14 +03:00
a66f99f574
net5.0
2020-11-15 18:55:57 +03:00
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
7e828b5643
Autofac: fix
2020-11-02 19:27:08 +03:00
049e8f63e9
Refactoring: scope.
2020-10-29 11:13:51 +03:00
e9a9b320e8
Scope: refactoring. Notify, People
2020-10-27 18:34:22 +03:00
367c93fd91
Refactoring: scope
2020-10-22 20:57:18 +03:00
3ddb202c56
Scope: refactoring
2020-10-21 14:52:44 +03:00
bff9629389
Scope: refactoring
2020-10-20 16:24:46 +03:00
f56f231c91
Refactoring: scope
2020-10-19 22:04:07 +03:00
830c73a134
Scope: refactoring
2020-10-19 18:53:15 +03:00
3a29e9970f
Merge branch 'develop' into refactoring/scope
...
# Conflicts:
# products/ASC.Files/Server/Startup.cs
2020-10-18 22:52:24 +03:00
181ac04fd8
DI: register fix
2020-10-18 19:34:30 +03:00
a4eb45f1ab
Scope: refactoring
2020-10-18 19:03:14 +03:00
5eed00dd28
Removed sq bugs and code smells
2020-10-16 16:21:59 +03:00
c622be89a3
revert discard
2020-10-12 22:39:23 +03:00
26bb1567f7
ProductSecurityFilter: fix
2020-10-12 19:00:04 +03:00
b120d801aa
Confirm: fix
2020-10-12 18:58:38 +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
08590b6b58
Fix confirm
2020-10-07 13:45:53 +03:00
SuhorukovAnton
edbc0f247c
fix-messages: IDE0022
2020-09-30 17:47:42 +03:00
SuhorukovAnton
ba1ed22345
fix-messages: IDE0058
2020-09-30 14:50:39 +03:00
SuhorukovAnton
754ac38e3e
fix-messages: IDE0074
2020-09-29 12:18:16 +03:00
SuhorukovAnton
2d34d70a4e
fix-messages: IDE0051 and IDE0052
2020-09-29 11:57:37 +03:00
SuhorukovAnton
29ec562a78
fix-messages: IDE0038
2020-09-28 18:21:29 +03:00
5271c7f2f5
Api: fix error response
2020-09-03 12:38:13 +03:00
maksim
8282f3f658
fix
2020-08-27 17:01:37 +03:00
4501d3229a
Nuget: replaced thirdparty
2020-08-20 17:50:08 +03:00
f00a964c32
Merge branch 'master' into feature/private
...
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
2020-08-14 17:19:36 +03:00
SuhorukovAnton
df8b6fd8b0
private: firtst version
2020-08-12 12:58:08 +03:00
Artem Tarasov
1a8aacebdc
Merge branch 'master' into feature/Wizard
...
# Conflicts:
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Resource.Manager/Startup.cs
# web/ASC.Web.Components/src/components/password-input/index.js
2020-07-21 13:13:47 +03:00
562abfcdc9
DI: refactoring
2020-07-17 13:52:28 +03:00
e10ac2ccfa
BaseStartup: refactoring
2020-07-15 15:33:44 +03:00
7f095f03d1
Merge branch 'master' into feature/Wizard
...
# Conflicts:
# common/ASC.Resource.Manager/Startup.cs
# config/kafka.json
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
# web/ASC.Web.Core/TariffSettings.cs
2020-07-15 15:23:28 +03:00
baa71247d8
Merge branch 'master' into feature/general-startup
2020-07-15 13:06:32 +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
SuhorukovAnton
00558dd95f
general-startup: fix
2020-07-06 10:56:17 +03:00
SuhorukovAnton
71d90ebfa2
general-startup: fix
2020-07-03 18:57:59 +03:00
SuhorukovAnton
2f5491f1ba
general-startup: first version
2020-07-03 14:47:27 +03:00
c9a64ca377
Added NullIfDefault
2020-07-02 18:15:52 +03:00
da9423bfdc
Wizard: api
2020-07-02 17:11:59 +03:00
d14313c6c1
References updated
2020-06-25 14:38:34 +03:00
bb6f32e36a
Api: fix
2020-05-18 15:08:03 +03:00
ecd66902a0
Merge branch 'master' into feature/system-json
2020-05-18 14:16:03 +03:00
550b0dd20e
Sln: packages updated
2020-05-18 10:27:22 +03:00
47c79d57f0
Optimization
2020-05-17 16:08:20 +03:00
c47bcebff3
Core: removed Custom Resolver
2020-05-14 18:51:22 +03:00
3a747ef8e4
Merge branch 'master' into feature/system-json
...
# Conflicts:
# common/ASC.Api.Core/Core/ApiContext.cs
# common/ASC.Api.Core/Core/ApiDateTime.cs
# common/ASC.Api.Core/Model/EmployeeWraper.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.People/Server/Models/GroupWrapperFull.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Models/BuildVersion.cs
2020-05-07 10:28:20 +03:00
7fd2cd206b
Api: Update
2020-04-20 15:54:13 +03:00
212fb746c9
Files: thirdparty fix
2020-03-16 11:25:39 +03:00
35e2e20049
Files: added model
2020-02-25 15:21:48 +03:00
44ec45ebb6
Merge branch 'master' into feature/elastic
...
# Conflicts:
# common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Caching/CachedQuotaService.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/AuthManager.cs
# common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
# common/ASC.Core.Common/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Core.Common/Data/DbSettingsManager.cs
# common/ASC.Core.Common/Tenants/TenantUtil.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.Studio.Notify/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/CookiesManager.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
2020-02-25 11:24:45 +03:00
a90b1fb424
People: added GetExpression
2020-02-25 11:02:13 +03:00
9db8b26985
Replaced NewtonsoftJson with System.Text.Json
2020-02-21 16:19:32 +03:00
bc6e1d5e9e
updated dependecies
2020-02-21 11:13:01 +03:00
a5280a1694
Added DIHelper
2020-02-17 11:58:14 +03:00
08db3b32b3
Merge branch 'master' into feature/ef
...
# Conflicts:
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
2019-12-06 12:25:18 +03:00
c9939b0da1
.net core up to 3.1
2019-12-06 12:12:51 +03:00
3dc8c87a94
EF: DbTenantService
2019-12-03 18:20:21 +03:00
26c8d56219
DI: refactoring. Added EmployeeWraperHelper
2019-11-11 18:42:07 +03:00
3e35efc027
ApiDateTime: removed TenantManager from param
2019-11-11 12:15:18 +03:00
9d2862bf9e
Renamed all "*factory" classes to "*Extension"
...
https://github.com/ONLYOFFICE/AppServer/pull/7#pullrequestreview-314756136
2019-11-11 12:03:49 +03:00
32781a87e2
DI: refactoring. Extract settings helpers
2019-11-08 15:21:51 +03:00
db4ef4a17a
DI: Log. refactoring.
2019-11-06 18:03:09 +03:00
0be2995e83
DI: filters and handlers
2019-11-01 12:37:02 +03:00
402c4d908d
DI: refactoring
2019-10-31 14:28:30 +03:00
0bbc383266
Merge branch 'master' into refactoring/di
...
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/Notify/StudioNotifyService.cs
2019-10-30 11:45:55 +03:00
8ca3a63e24
DI: refactoring
2019-10-22 19:08:37 +03:00
6b2f6b0a7b
DI: log
2019-10-17 18:55:35 +03:00
55138419b4
Confirm: fix auth
2019-09-27 18:53:40 +03:00
665ed9eb3c
Settings: GetPasswordSettings available for everyone
...
ConfirmAuthHandler: handle ArgumentNullException
2019-09-27 17:03:24 +03:00
c8573b8301
Confirm: fixed invite link
2019-09-27 15:28:51 +03:00
d8fb67f683
Merge branch 'master' into refactoring/di
...
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# web/ASC.Web.Api/Controllers/AuthenticationController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Core/Notify/StudioNotifyService.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
# web/ASC.Web.Core/Utility/CommonLinkUtility.cs
2019-09-27 13:45:37 +03:00
1afcd2442c
ConfirmAuthHandler: auth by uid
2019-09-27 12:18:48 +03:00
84ba343460
Auth: added check confirm method
2019-09-26 16:36:53 +03:00
22e4d19458
PasswordChange: added userId
2019-09-26 12:15:01 +03:00
710a3f62fa
Merge branch 'master' into refactoring/di
...
# Conflicts:
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-25 18:56:28 +03:00
6d815608a0
ConfirmAuth: PasswordChange
2019-09-24 15:27:13 +03:00
afb1f90e9a
.net core up to 3.0.0
2019-09-24 14:20:58 +03:00
