|
|
66cf28ba29
|
analizators/U2U1100
|
2022-01-12 18:42:03 +03:00 |
|
|
|
0a786bbfa3
|
analizators/s4830
|
2021-12-28 15:00:48 +03:00 |
|
|
|
384e012c5f
|
net 6: remove TryUseWindowsService
|
2021-11-25 16:48:08 +03:00 |
|
|
|
13e13f2303
|
Net: fix requests
|
2021-11-24 22:34:39 +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 |
|
|
|
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 |
|
|
|
aa79ef2c9d
|
Merge branch 'hotfix/v1.0.1' into feature/desktop-login
|
2021-11-02 14:03:26 +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 |
|
|
|
3c25ee55b3
|
Auth: temp fix for plugin
|
2021-10-28 20:14:20 +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 |
|
|
|
e5e4a89e5b
|
Merge branch 'develop' into feature/net6
|
2021-10-22 16:10:37 +03:00 |
|
|
|
e310d5e655
|
net6: httpClient: add using
|
2021-10-21 17:56:31 +03:00 |
|
|
|
7d511385bc
|
removed unused references
|
2021-10-19 19:08:47 +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 |
|
|
|
4bd4954ad4
|
Merge branch 'release/1.0.0' into feature/desktop-login
|
2021-10-19 13:10:47 +03:00 |
|
|
|
fb7922f579
|
Thirdparty: login. Desktop
|
2021-10-15 11:34:34 +03:00 |
|
|
|
6947adcfc8
|
Personal: fix quota
|
2021-10-14 13:47:12 +03:00 |
|
|
|
735a9b60cf
|
net6: warning CA1416
also remove unnecessary usings
|
2021-10-13 11:07:03 +03:00 |
|
|
|
66d126410c
|
Login: added desktop param
|
2021-10-13 10:25:19 +03:00 |
|
|
|
ae9a3187bc
|
net6: warning SYSLIB0014
|
2021-10-12 13:14:33 +03:00 |
|
|
|
5d3d8f4d45
|
Web: Changed opportunity to show/hide DebugInfo to appsettings.json param "debug-info:enabled" and 'api/2.0/settings.json'
|
2021-10-05 11:13:38 +03:00 |
|
|
|
027e01ce71
|
Api: fix document server version
|
2021-10-03 14:50:33 +03:00 |
|
|
|
737efc3be7
|
Api: settings. Added recapthca public key
|
2021-09-17 17:57:22 +03:00 |
|
|
|
8835570193
|
Settings: added param withpassword
|
2021-09-13 15:42:09 +03:00 |
|
|
|
618cf7a1ce
|
Api: fix SendJoinInviteMail
|
2021-09-08 16:28:10 +03:00 |
|
Vashchuk Nikita
|
3b4cb1dfc6
|
Added GlobalFilter, fix
|
2021-09-03 17:02:52 +03:00 |
|
|
|
8171563965
|
backup.core: move backup.core
|
2021-09-02 15:41:54 +03:00 |
|
|
|
4b3cb1b4fb
|
backup.core: first version
|
2021-08-31 12:40:28 +03:00 |
|
Vashchuk Nikita
|
45d221a109
|
Split webhooks into service and core
|
2021-08-26 21:43:41 +03:00 |
|
|
|
b791586252
|
net6
|
2021-08-25 18:26:13 +03:00 |
|
Vashchuk Nikita
|
c41361bdd8
|
fix
|
2021-08-24 11:08:58 +03:00 |
|
Vashchuk Nikita
|
9f0e41b880
|
Merge branch 'develop' into feature/webhooks
|
2021-08-23 12:36:01 +03:00 |
|
|
|
6767c2ac2e
|
Api: release config
|
2021-08-19 17:36:13 +03:00 |
|
|
|
cf87addaa3
|
Security: added new method
|
2021-08-18 17:04:16 +03:00 |
|
|
|
546c1872a3
|
Added asp logging
|
2021-08-08 16:19:54 +03:00 |
|
Vashchuk Nikita
|
8a51dee296
|
modified DbWorker(Lazy), Sender. Added BuildQueueService and WorkerService.cs.
|
2021-07-26 20:03:55 +03:00 |
|
|
|
653066af0c
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# config/nginx/onlyoffice.conf
|
2021-07-20 18:21:00 +03:00 |
|
|
|
e81c3df0be
|
Added displaying version from appsettings.json (api/2.0/settings.json)
|
2021-07-14 17:31:06 +03:00 |
|
|
|
ad57feecd8
|
Log: fix configuring
|
2021-07-13 21:17:18 +03:00 |
|
|
|
b4c4625f3f
|
Moved getting firebase config to API method /api/2.0/settings.json
|
2021-07-09 18:28:08 +03:00 |
|
Vashchuk Nikita
|
2dcf6b8225
|
Added WebhookHostedService, modified Publisher and Sender
|
2021-07-08 20:32:59 +03:00 |
|
|
|
1083fd8416
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-06-30 16:09:53 +03:00 |
|
|
|
8ee188346b
|
Api: setphone can be authorized by confirm link
|
2021-06-30 11:20:55 +03:00 |
|
|
|
6118e95028
|
Merge branch 'develop' into feature/personal
|
2021-06-17 14:25:09 +03:00 |
|
|
|
a8527e1a57
|
WebApi: sendsms, setphone
|
2021-06-16 20:46:24 +03:00 |
|
|
|
01639a56cc
|
RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
|
2021-06-16 20:08:26 +03:00 |
|
