Commit Graph

1486 Commits

Author SHA1 Message Date
d9684f6985 добавление необходимых полей в конструктор MessageRequest 2023-02-03 09:38:56 +05:00
ngfrolov
cfdadcb2d2
Merge master to dev 2023-02-03 09:17:14 +05:00
479cf72f0c Документирующие комментарии в MessageRequestBase 2023-02-03 09:09:55 +05:00
0b7f53997a Документирующие комментарии в MessageRequestBase 2023-02-03 09:08:25 +05:00
ngfrolov
e804f7de2b
Fix Add permissions for ProcessMap 2023-02-03 09:07:53 +05:00
c62d3adb18 Убрано лишнее 2023-02-02 17:51:27 +05:00
2746c94729 Рефактор метода GetMessagesAsync в MessageService 2023-02-02 16:07:41 +05:00
e81abc86e6 Рефактор 2023-02-02 15:58:07 +05:00
b70fa35ef6 bug fixing in UserRepositoty.UpdateAsync 2023-02-02 15:21:48 +05:00
ngfrolov
5956f8238f
#8103063 nit prettify 2023-02-02 14:30:27 +05:00
5644c06fac #8103063 Замечания 2023-02-02 12:04:50 +05:00
a4ff666b97 Добавлена сортировка сообщений в MessageController 2023-02-02 11:08:25 +05:00
20b99011d1 Merge branch 'feature/8103063' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/8103063 2023-02-02 11:05:02 +05:00
1f80e38c10 #8103063 BuildQuery 2023-02-02 11:04:53 +05:00
ngfrolov
e4b790abbd
Merge branch 'dev' into feature/8103063 2023-02-02 11:04:44 +05:00
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
5d3b954171 Merge branch 'feature/WellFinalDocumentsRepository' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/WellFinalDocumentsRepository 2023-01-31 10:13:40 +05:00
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
89e5cbcf9a # TelemetryWirelineRunOutDto 2023-01-30 15:07:36 +05:00
9505e159c0 Merge branch 'feature/WellFinalDocumentsRepository' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/WellFinalDocumentsRepository 2023-01-30 14:32:24 +05:00
236c32b16c #7065595 fix 2023-01-30 14:32:16 +05:00
dc2d20bef7 Merge branch 'dev' into feature/8103063 2023-01-30 10:53:34 +05:00
9410508213 #8103063 fix 2023-01-30 10:52:12 +05:00
86c52f5256 refact readme 2023-01-27 18:17:42 +05:00
dd0e49be0a added light console app for test "OS detection" 2023-01-27 18:16:25 +05:00
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
7be6173f73 Merge branch 'feature/8103063' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/8103063 2023-01-26 15:37:57 +05:00
ecdade0913 #8103063 fix 2023-01-26 15:37:46 +05:00
f0d316cf40 refact convert process command 2023-01-26 15:28:19 +05:00
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
ccbc499754 #8103063 Подтягивание режимов при формировании композитной скважины 2023-01-26 10:59:24 +05:00
325c5054fe cleaning up unnecessary dependencies 2023-01-25 05:41:29 +05:00
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
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