on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity
2,605 Commits 1 Branch 0 Tags 37 MiB
1a27842e26
Commit Graph

2605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
on.nemtina
1a27842e26 Merge branch 'dev' into fix/23754474--SignalR-UpdateProcessMap-Method 2024-01-22 14:43:36 +05:00
ngfrolov
84ebe261d3
Fix PeriodicBackgroundWorkerTest.WorkRunsTwice_ShouldReturn_WorkCount() 2024-01-22 13:26:09 +05:00
ngfrolov
bbfe42c4f0
Fix ProcessMapPlanBaseRequest 2024-01-22 13:16:39 +05:00
ngfrolov
b67c30a2c7
fix PeriodicBackgroundWorker.Add() 2024-01-22 12:55:48 +05:00
on.nemtina
6f10f2091f Merge branch 'dev' into fix/23754474--SignalR-UpdateProcessMap-Method 2024-01-22 12:22:35 +05:00
Olga Nemt
e966b13428 Комментарий к описанию метода UpdateProcessMap 2024-01-22 12:17:21 +05:00
Olga Nemt
64a8a6abd7 Описание метода UpdateProcessMap 2024-01-22 12:02:17 +05:00
Никита Фролов
6045333f53 Merge pull request '#26822781 РТК - план - история' (#199) from feature/ProcessMap-history into dev 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/199
Reviewed-by: on.nemtina <on.nemtina@digitaldrilling.ru>
Reviewed-by: Степанов Дмитрий Александрович <da.stepanov@digitaldrilling.ru>
 2024-01-22 11:56:58 +05:00
ngfrolov
54ef71411a
ProcessMapPlanDrilling.http - fix encoding. 
Handle foreignKeys exceptions as validation exceptions.
Add integr.tests for bad request cases.
 2024-01-22 11:49:45 +05:00
Frolov-Nikita
8a38777db3
Merge branch 'dev' into feature/ProcessMap-history 2024-01-21 13:43:39 +05:00
Frolov-Nikita
cfe936abf0
remove DateValidationAttribute, 
reorganize and fix unitTests
 2024-01-21 13:43:15 +05:00
Frolov-Nikita
2ce2005e6a
merge dev to . 2024-01-21 13:02:12 +05:00
Frolov-Nikita
f69bec9687
Fix nullables in WellboreService 2024-01-21 13:00:03 +05:00
Никита Фролов
7f92f19ba6 Merge pull request 'Добавлен атрибут [Required] на non-nullable поля в dtos (ч. 3)' (#195) from fix/dtos-add-required-attribute-3 into dev 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/195
 2024-01-21 12:53:25 +05:00
Frolov-Nikita
b13353b994
Add some required attributes 2024-01-21 12:52:46 +05:00
Frolov-Nikita
b454322934
Merge branch 'dev' into fix/dtos-add-required-attribute-3 2024-01-21 12:45:38 +05:00
Никита Фролов
7abb006ba6 Merge pull request 'Добавлен атрибут [Required] на non-nullable поля в dtos' (#194) from fix/dtos-add-required-attribute into dev 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/194
 2024-01-21 12:44:40 +05:00
Frolov-Nikita
35df48f95a
merge dev to . 2024-01-21 12:25:50 +05:00
Никита Фролов
e027e27b5c Merge pull request 'feature/27778811-file-storage Переместить файловое хранилище из директории с программой' (#196) from feature/27778811-file-storage into dev 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/196
 2024-01-21 12:22:04 +05:00
Frolov-Nikita
5bcffd1ffe
clean appsettings.json 2024-01-21 12:21:23 +05:00
Frolov-Nikita
91b4ee4d4f
Merge branch 'dev' into feature/27778811-file-storage 2024-01-21 12:13:53 +05:00
Никита Фролов
3fda567cf7 Merge pull request '#27789416 Приведение свойств TelemetryDataSaubDto в соответствие со свойствами TelemetryDataSaub' (#198) from fix/27789416-compare-telemetryDataSaubDto-with-telemetryDataSaub into dev 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/198
 2024-01-21 11:55:39 +05:00
Никита Фролов
d69e43e485 Merge pull request '#27789462 TelemetryDataSpinDto удалить свойство Date.' (#197) from fix/27789462-telemetryDataSpinDto-remove-date-property into dev 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/197
 2024-01-21 11:54:48 +05:00
Frolov-Nikita
4a1809345f
fix all integration test 2024-01-21 09:38:07 +05:00
Frolov-Nikita
7eedf62419
fix integration test 2024-01-20 15:38:37 +05:00
Оля Бизюкова
7379b6e33d Приведение свойств TelemetryDataSaubDto в соответствие со свойствами TelemetryDataSaub 2024-01-19 20:18:11 +05:00
ngfrolov
9a2762ba60
refactor integrationTests 2024-01-19 17:49:09 +05:00
ngfrolov
6178061b49
Add ProcessMapPlanDrilling. 2024-01-19 17:48:45 +05:00
Оля Бизюкова
38fab5b6f0 Удалено свойство Date 2024-01-19 17:19:26 +05:00
Оля Бизюкова
82a4d11ccf Папка data gпрописана в .gitignore 2024-01-19 16:55:27 +05:00
Оля Бизюкова
9cdf29c6c5 Мелкая правка 2024-01-19 16:48:00 +05:00
Оля Бизюкова
9c3887092d Правка ContentPath в appsettings.json 2024-01-19 12:25:57 +05:00
Оля Бизюкова
8870931348 Настройка ContentPath в appsettings.json 2024-01-19 10:57:13 +05:00
Оля Бизюкова
183d07639e Убрано лишнее 2024-01-19 10:42:02 +05:00
Оля Бизюкова
c8c0ea37fe Настройка папки для файлов в appsettings.json 2024-01-19 00:26:47 +05:00
on.nemtina
d1f17cf3af Merge branch 'dev' into fix/dtos-add-required-attribute-3 2024-01-18 13:55:50 +05:00
ngfrolov
657c542cb2
Update nugets 2024-01-18 11:05:22 +05:00
Оля Бизюкова
b8f9a6ae4a Добавлен атрибут [Required] на non-nullable поля в dtos (ч. 3) 2024-01-17 13:12:17 +05:00
Оля Бизюкова
42f3c3edd1 Правки по результатам ревью 2024-01-17 11:51:57 +05:00
ngfrolov
bfdb844b56
Merge branch 'dev' into fix/dtos-add-required-attribute 2024-01-16 15:56:39 +05:00
ngfrolov
b4e65b09b2
Merge branch 'master' into dev 2024-01-16 15:33:20 +05:00
ngfrolov
22f2f34059
workflow/ separate deploy to dev and prod 2024-01-16 15:12:52 +05:00
ngfrolov
004ab09b81
workflow fix spacing 2024-01-16 15:00:09 +05:00
ngfrolov
d67a22b2f1
workflow fix trigger 2024-01-16 14:59:01 +05:00
ngfrolov
4ff540126b
comment tests 2024-01-16 14:57:16 +05:00
ngfrolov
ba7be9abe6
wworkflow deploy change triggers 2024-01-16 14:54:10 +05:00
ngfrolov
ff41693397
workflow deploy test 2024-01-16 14:48:44 +05:00
ngfrolov
ae2a808438
rename workflow 2024-01-16 14:46:13 +05:00
ngfrolov
1f962aa1cb
workflow deploy to test server 2024-01-16 14:43:51 +05:00
on.nemtina
8c04307bfe Merge branch 'dev' into fix/dtos-add-required-attribute 2024-01-16 13:27:04 +05:00