547 Commits

Author	SHA1	Message	Date
ngfrolov	f30c3ce833	comment add cache header for static files	2023-02-16 09:49:44 +05:00
ngfrolov	7779116c8a	WellOperationRepository.GetCategories(..) add arg, to filter categories/	2023-02-15 18:02:36 +05:00
ngfrolov	fda5385e46	IWellService refactor. ... - Add #nullable, - Add WellRequest, - Remove obsolete method	2023-02-15 17:57:32 +05:00
ngfrolov	759d6125b5	Merge branch 'dev' into feature/8103063	2023-02-03 15:59:50 +05:00
Никита Фролов	71bb74137b	Merge branch 'dev' into fix/add-sort-to-paginated-elements	2023-02-03 09:57:05 +05:00
ai.astrakhantsev	5644c06fac	#8103063 Замечания	2023-02-02 12:04:50 +05:00
Olga Nemt	a4ff666b97	Добавлена сортировка сообщений в MessageController	2023-02-02 11:08:25 +05:00
ngfrolov	e4b790abbd	Merge branch 'dev' into feature/8103063	2023-02-02 11:04:44 +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	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	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	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
ngfrolov	7fcb77f5b4	Fix return types	2023-01-27 11:59:51 +05:00
Никита Фролов	d5fd53595e	Merge branch 'dev' into convertToPdf	2023-01-27 09:17:47 +05:00
ai.astrakhantsev	ecdade0913	#8103063 fix	2023-01-26 15:37:46 +05:00
ai.astrakhantsev	ccbc499754	#8103063 Подтягивание режимов при формировании композитной скважины	2023-01-26 10:59:24 +05:00
eugeniy_ivanov	907fcc88e8	-refact path convert file	2023-01-25 05:33:02 +05:00
ngfrolov	be9168b4bf	Merge branch 'dev' into convertToPdf	2023-01-24 09:43:12 +05:00
ai.astrakhantsev	b847b72008	#5703631 Не приходит сообщение на почту об ожидании загрузки или согласовании документов в программу на бурение ЕЦП	2023-01-23 11:44:50 +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	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	c5131d0f07	Add new permissions	2023-01-18 10:44:40 +05:00
ngfrolov	07f77f83d8	fix TelemetryDataSaubController	2023-01-17 15:39:36 +05:00
ngfrolov	595eca8e26	nit code format	2023-01-17 13:28:35 +05:00
ngfrolov	1a7d643c50	merge dev to ProcessMapReport	2023-01-12 16:24:10 +05:00
ngfrolov	cfab294945	nit. docfix	2023-01-12 16:22:36 +05:00
ngfrolov	7c6e00fe51	PlannedTrajectory fix	2023-01-12 12:07:31 +05:00
Никита Фролов	68c227e7c6	Merge branch 'dev' into PlannedTrajectory_refact	2023-01-12 11:24:50 +05:00
eugeniy_ivanov	e950f40122	GetFileName -> async	2023-01-12 09:40:37 +05:00
ngfrolov	5948a762ba	#7963103 fixes	2023-01-11 16:00:11 +05:00
eugeniy_ivanov	0b3825a531	finally refact	2023-01-11 14:59:54 +05:00
ai.astrakhantsev	60a80745a9	#7963103 Замечания	2023-01-11 13:51:11 +05:00
eugeniy_ivanov	5c00e996f5	Merge remote-tracking branch 'origin/dev' into PlannedTrajectory_refact	2023-01-10 15:54:11 +05:00
ai.astrakhantsev	193b9ff9f6	#7963103 Отображение общей наработки тальканата по всем объектам	2023-01-10 10:49:27 +05:00
eugeniy_ivanov	46453b3893	повторный рефакт ... после ревью	2022-12-29 04:25:08 +05:00
ngfrolov	7585aefc4e	WellOperationService to WellOperationRepository	2022-12-28 17:38:53 +05:00
ngfrolov	fb4bb375e1	Merge branch 'dev' into feature/ProcessMapReport	2022-12-28 15:22:50 +05:00
eugeniy_ivanov	5a6ad78c21	refact finally	2022-12-27 21:45:03 +05:00
ai.astrakhantsev	bfc9376733	#7987467 +	2022-12-27 14:30:52 +05:00
eugeniy_ivanov	9819c2ac0d	refct #3	2022-12-27 00:02:49 +05:00