Commit Graph

69 Commits

Author SHA1 Message Date
b2079ccace fixed warnings 2022-02-07 20:19:58 +03:00
812241a69a Analyzers: fix 2022-02-07 17:53:58 +03:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
9ad899e72a analizators/s1264 2022-01-24 12:27:43 +03:00
667697f933 analizators/s2259 2022-01-21 16:46:30 +03:00
473259657e analizators/s1118 2022-01-21 13:47:56 +03:00
0630a43b58 Elastic: fix ping 2022-01-21 11:26:25 +03:00
84638feaf0 analizators/U2U1202 2022-01-18 16:54:24 +03:00
36c26bc803 analizators/U2U1117 2022-01-18 15:40:28 +03:00
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
c85c2e6f26 analizators/U2U1007 2022-01-11 18:37:10 +03:00
a671732da5 analizators/SCS0005 2022-01-10 12:24:21 +03:00
f1668a3b43 Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar 2021-07-27 12:43:01 +03:00
d821f9a2af TimeZone: fix 2021-07-22 22:40:37 +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
Vashchuk Nikita
94047ab0a1 Fix Calendar 2021-05-17 21:35:23 +03:00
a5c6ba5dcc Common, db: moved from 08a01422 2021-05-17 14:35:00 +03:00
3aae413e12 replace Path.Combine to CrossPlatform.PathCombine 2021-04-16 16:26:26 +03:00
62cd0a6af0 Test: fix test migrate, drop test db 2020-12-25 13:48:04 +03:00
b487adb9fc Refactoting & optimization 2020-11-24 13:15:11 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
5eed00dd28 Removed sq bugs and code smells 2020-10-16 16:21:59 +03:00
dd80e300d0 Common, Core.Common moved from release/11 4414f77b 2020-09-15 16:11:05 +03:00
82dd4a8828 Settings: fix timeZones for unix 2020-09-03 18:30:14 +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
02b33bc07b Merge branch 'master' into feature/files-index
# Conflicts:
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
2020-05-06 11:54:26 +03:00
af7fb87e73 Elastic: settings 2020-05-03 18:50:40 +03:00
623a6609cc JWT: fix 2020-04-24 13:28:06 +03:00
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +03:00
1b0784e3cf Files: updated JWT 2020-04-16 16:07:30 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
f017d9cc23 fix from review 2020-02-03 13:48:06 +03:00
7798898100 moved from hotfix/10.5.2 2020-01-16 21:17:17 +03:00
3dc8c87a94 EF: DbTenantService 2019-12-03 18:20:21 +03:00
190c0a5c48 TimeZoneConverter: fixed NullReferenceException 2019-11-14 16:51:15 +03:00
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00
402c4d908d DI: refactoring 2019-10-31 14:28:30 +03:00
8ca3a63e24 DI: refactoring 2019-10-22 19:08:37 +03:00
726ca634e4 Revert "removed ConfigurationManager"
This reverts commit c03be150f4.

ProgressQueue init
2019-10-22 16:48:48 +03:00
c03be150f4 removed ConfigurationManager 2019-10-22 16:30:03 +03:00
78584b78a3 DI: removed LogManager 2019-10-22 14:21:44 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00
5ec41ccaff DI: removed appSettings 2019-10-14 11:23:45 +03:00
42fe613918 DI: configuration 2019-10-10 12:53:58 +03:00
74d8709f62 DI: configuration 2019-10-09 19:08:37 +03:00
515f7de555 DI: Configuration 2019-10-09 18:04:46 +03:00
387ce4e9ad DI: configuration 2019-09-27 14:51:09 +03:00
fa6e8ab647 Optimization 2019-08-28 12:15:33 +03:00
8c49db565f ca1507 2019-08-16 13:15:25 +03:00