610e31ec3b
fixed equals
2021-08-20 19:04:55 +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
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
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
5fcbdbd7dd
added health checks
2021-06-16 16:54:36 +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
8816e535c1
merge from develop
2021-04-28 19:50:59 +03:00
NikitaVashchuk
3eb3cef5a3
fix
2021-04-20 10:55:52 +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
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
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
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
f56f231c91
Refactoring: scope
2020-10-19 22:04:07 +03:00
830c73a134
Scope: refactoring
2020-10-19 18:53:15 +03:00
181ac04fd8
DI: register fix
2020-10-18 19:34:30 +03:00
c622be89a3
revert discard
2020-10-12 22:39:23 +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
29ec562a78
fix-messages: IDE0038
2020-09-28 18:21:29 +03:00
maksim
8282f3f658
fix
2020-08-27 17:01:37 +03:00
SuhorukovAnton
df8b6fd8b0
private: firtst version
2020-08-12 12:58:08 +03:00
562abfcdc9
DI: refactoring
2020-07-17 13:52:28 +03:00
e10ac2ccfa
BaseStartup: refactoring
2020-07-15 15:33:44 +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
c9a64ca377
Added NullIfDefault
2020-07-02 18:15:52 +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
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
