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

1421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ai.astrakhantsev
e2948782fa #8103063 BuildQuery 2023-02-02 10:32:53 +05:00
ngfrolov
00a6a333e4
WellFinalDocumentsController remove CancellationToken default value 2023-02-01 14:38:59 +05:00
ai.astrakhantsev
5d3b954171 Merge branch 'feature/WellFinalDocumentsRepository' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/WellFinalDocumentsRepository 2023-01-31 10:13:40 +05:00
ai.astrakhantsev
e58c292d30 #7065595 fix 2023-01-31 10:13:32 +05:00
ngfrolov
df11450216
Merge branch 'dev' into feature/8103063 2023-01-31 09:28:37 +05:00
ngfrolov
a2b2b98dac
nit WellFinalDocumentsService rename method 2023-01-30 17:44:05 +05:00
ngfrolov
e4becb18ff
Merge branch 'feature/WellFinalDocumentsRepository' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/WellFinalDocumentsRepository 2023-01-30 17:27:11 +05:00
ngfrolov
a367dea6a8
Merge branch 'dev' into feature/WellFinalDocumentsRepository 2023-01-30 17:26:58 +05:00
ngfrolov
31aa5e6ca2
nit ConvertToPdf code formatiing 2023-01-30 17:06:22 +05:00
Никита Фролов
d8cbec34eb Merge pull request 'convertToPdf' (#20) from convertToPdf into dev 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/20
Reviewed-by: Никита Фролов <ng.frolov@digitaldrilling.ru>
 2023-01-30 17:02:54 +05:00
ngfrolov
6affefae90
Merge branch 'dev' into convertToPdf 2023-01-30 15:37:46 +05:00
ai.astrakhantsev
89e5cbcf9a # TelemetryWirelineRunOutDto 2023-01-30 15:07:36 +05:00
ai.astrakhantsev
9505e159c0 Merge branch 'feature/WellFinalDocumentsRepository' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/WellFinalDocumentsRepository 2023-01-30 14:32:24 +05:00
ai.astrakhantsev
236c32b16c #7065595 fix 2023-01-30 14:32:16 +05:00
ai.astrakhantsev
dc2d20bef7 Merge branch 'dev' into feature/8103063 2023-01-30 10:53:34 +05:00
ai.astrakhantsev
9410508213 #8103063 fix 2023-01-30 10:52:12 +05:00
eugeniy_ivanov
86c52f5256 refact readme 2023-01-27 18:17:42 +05:00
eugeniy_ivanov
dd0e49be0a added light console app for test "OS detection" 2023-01-27 18:16:25 +05:00
eugeniy_ivanov
46074b6bd1 OS identification and build start process option 2023-01-27 17:31:43 +05:00
ngfrolov
7fcb77f5b4
Fix return types 2023-01-27 11:59:51 +05:00
ngfrolov
1d618302f8
Format code. 2023-01-27 10:11:04 +05:00
Никита Фролов
d5fd53595e Merge branch 'dev' into convertToPdf 2023-01-27 09:17:47 +05:00
ai.astrakhantsev
7be6173f73 Merge branch 'feature/8103063' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/8103063 2023-01-26 15:37:57 +05:00
ai.astrakhantsev
ecdade0913 #8103063 fix 2023-01-26 15:37:46 +05:00
eugeniy_ivanov
f0d316cf40 refact convert process command 2023-01-26 15:28:19 +05:00
eugeniy_ivanov
b7f1962c6f valid file extension 2023-01-26 15:25:09 +05:00
Никита Фролов
5d47652751 Merge branch 'dev' into feature/8103063 2023-01-26 11:07:44 +05:00
ai.astrakhantsev
ccbc499754 #8103063 Подтягивание режимов при формировании композитной скважины 2023-01-26 10:59:24 +05:00
eugeniy_ivanov
325c5054fe cleaning up unnecessary dependencies 2023-01-25 05:41:29 +05:00
eugeniy_ivanov
907fcc88e8 -refact path convert file 2023-01-25 05:33:02 +05:00
ngfrolov
05c238737d
fix SubsystemOperationTimeService. WelOperationCategories use valid constants. 2023-01-24 15:21:49 +05:00
ngfrolov
bce61f97da
Fix PlannedTrajectory permissions 2023-01-24 15:03:45 +05:00
ngfrolov
52a51aa137
Merge branch 'dev' into feature/WellFinalDocumentsRepository 2023-01-24 12:16:25 +05:00
ai.astrakhantsev
d8b131622f #7987467 fix 2023-01-24 09:59:18 +05:00
ngfrolov
be9168b4bf
Merge branch 'dev' into convertToPdf 2023-01-24 09:43:12 +05:00
ai.astrakhantsev
0e5f41a073 Merge branch 'dev' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into dev 2023-01-23 11:45:03 +05:00
ai.astrakhantsev
b847b72008 #5703631 Не приходит сообщение на почту об ожидании загрузки или согласовании документов в программу на бурение ЕЦП 2023-01-23 11:44:50 +05:00
ngfrolov
56be094b83
fix WellOperationTemplate sort operations names 2023-01-23 11:15:25 +05:00
ai.astrakhantsev
703112d894 Merge branch 'dev' into feature/WellFinalDocumentsRepository 2023-01-20 10:48:17 +05:00
ai.astrakhantsev
27cf27ed55 #7065595 Перенос сервиса "Дело скважины" в репозиторий 2023-01-20 10:47:39 +05:00
ngfrolov
b178af93fb
fix protobuf model 2023-01-20 09:10:34 +05:00
eugeniy_ivanov
350759f1c6 -типы методов класса конвертации изменены на статические 
-удаляются только преобразованные файлы
 2023-01-20 08:32:22 +05:00
ngfrolov
4dced662e1
Fix TelemetryWirelineRunOut. AddOrUpdateAsync issue 2023-01-19 12:28:38 +05:00
ngfrolov
f7654a95b6
fix TelemetryWirelineRunOutController.PostData. It`s async. 2023-01-19 12:05:47 +05:00
ngfrolov
49678c4973
fix TelemetryWirelineRunOut. make wellinfo optional for POST request. 2023-01-19 11:43:37 +05:00
ngfrolov
56e02ffdd8
fix WellInfoDto. Add well Id. 2023-01-18 15:05:11 +05:00
Никита Фролов
219fe450a1 Merge branch 'dev' into convertToPdf 2023-01-18 13:58:25 +05:00
ngfrolov
d9fcfd862e
fix permission migration 2023-01-18 13:57:21 +05:00
eugeniy_ivanov
11ccfc8be1 редактирование readme файла 2023-01-18 12:14:13 +05:00
eugeniy_ivanov
e86e1bb854 refact 2023-01-18 11:31:58 +05:00