Commit Graph

72 Commits

Author SHA1 Message Date
53a7248ea4 Merge branch 'devices-fix' into 'main'
Return imeis for contract

See merge request ukacorp/mesari/backend!23
2023-11-13 06:24:32 +00:00
Nedim
3248359726 Return imeis for contract 2023-11-09 10:20:17 +01:00
Senad Uka
5296edc4a7 Upstream sync 2023-11-09 10:06:06 +01:00
01f27bf6f9 Merge branch 'user' into 'main'
Added login and logout

See merge request ukacorp/mesari/backend!22
2023-11-07 06:58:48 +00:00
Nedim
367b5d51f2 Added login and logout 2023-11-06 11:22:51 +01:00
e47336dc8d Merge branch 'patch' into 'main'
Patch contract by ImeiID

See merge request ukacorp/mesari/backend!21
2023-11-02 11:03:53 +00:00
Nedim
4767756499 Patch contract by ImeiID 2023-11-02 11:56:45 +01:00
b9fb75ff36 Merge branch 'login' into 'main'
Added reset password route

See merge request ukacorp/mesari/backend!20
2023-11-02 06:16:01 +00:00
Nedim
72ccd5e71c Added reset password route 2023-11-01 15:14:38 +01:00
Senad Uka
75692d7b20 Upstream sync 2023-10-31 07:35:23 +01:00
06aec8c900 Merge branch 'stats' into 'main'
Stats

See merge request ukacorp/mesari/backend!19
2023-10-25 02:51:06 +00:00
Nedim
d40b225e4e Added measurements, and devices statsh
Added stats endpoints
2023-10-24 18:26:10 +02:00
Senad Uka
6892c56c1e Upstream sync 2023-10-24 10:24:20 +02:00
Senad Uka
fd880aeaa2 Upstream sync 2023-10-24 05:48:19 +02:00
2c267b71e4 Merge branch 'evets-of-notification' into 'main'
Evets of notification

See merge request ukacorp/mesari/backend!18
2023-10-19 10:01:37 +00:00
Nedim
2e60460131 Added temperature exceded event 2023-10-19 08:48:01 +02:00
Senad Uka
44efa194fc upstream sync 2023-10-19 07:57:48 +02:00
Senad Uka
5b1acd1c5f Upstream sync 2023-10-17 11:51:48 +02:00
Senad Uka
3ff212d6d2 Upstream sync. 2023-10-17 11:46:28 +02:00
Senad Uka
7c3407c86d upstream sync 2023-10-17 10:32:52 +02:00
3cff15ed25 Merge branch 'notificaitons' into 'main'
Added notificaiton model

See merge request ukacorp/mesari/backend!17
2023-10-17 08:29:00 +00:00
Nedim
abe79e5556 Added notificaiton model 2023-10-16 13:11:40 +02:00
Senad Uka
00d15ebe7e Upstream sync 2023-10-16 12:03:47 +02:00
Senad Uka
533451f39d Upstream sync 2023-10-16 05:44:09 +02:00
Senad Uka
d01c1a0232 Upstream sync 2023-10-13 11:48:14 +02:00
Senad Uka
7369739bdd upstream sync 2023-10-12 05:23:34 +02:00
Senad Uka
d3011d77ff upstream sync 2023-10-10 08:39:50 +02:00
598f706958 Merge branch 'create-contract' into 'main'
Added create contact ednpoint

See merge request ukacorp/mesari/backend!16
2023-10-10 06:39:06 +00:00
Nedim
314abe0462 Added create contact ednpoint 2023-10-09 08:33:51 +02:00
Senad Uka
f32b5d5748 usptream sync 2023-10-04 13:31:28 +02:00
eb924d2bec Merge branch 'get-contracts-for-buyers' into 'main'
Contracts for buyer

See merge request ukacorp/mesari/backend!15
2023-10-04 11:27:30 +00:00
Nedim
2cfac4a023 Contracts for buyer 2023-10-04 12:10:46 +02:00
Senad Uka
7df0c64d15 upstream sync 2023-10-02 12:59:19 +02:00
8a2dbfe055 Merge branch 'invoice' into 'main'
Added invoices endpoint

See merge request ukacorp/mesari/backend!14
2023-10-02 10:57:29 +00:00
Nedim
60042ebd30 Added invoices endpoint 2023-09-29 12:11:24 +02:00
Senad Uka
937c61c635 Upstream sync 2023-09-27 08:04:50 +02:00
Senad Uka
7320fcb527 Upstream sync 2023-09-26 07:25:19 +02:00
3b7ba95d27 Merge branch 'devices-serach' into 'main'
Devices serach

See merge request ukacorp/mesari/backend!13
2023-09-25 12:10:48 +00:00
Nedim
045d349c86 Added search params for get contract 2023-09-25 11:25:48 +02:00
04df3ece96 Merge branch 'main-new' into 'main'
Rebase

See merge request ukacorp/mesari/backend!12
2023-09-25 05:18:15 +00:00
Nedim
4779c32a56 Fixed comments 2023-09-22 08:28:50 +02:00
Nedim
85e695b2d8 Rebase 2023-09-21 12:54:40 +02:00
Senad Uka
c2d6923375 Upstream sync 2023-09-21 11:59:08 +02:00
f4dcb823c4 Merge branch 'revert-0b8792b3' into 'main'
Revert "Merge branch 'fetch-device-info' into 'main'"

See merge request ukacorp/mesari/backend!11
2023-09-21 09:57:06 +00:00
080587f327 Revert "Merge branch 'fetch-device-info' into 'main'"
This reverts merge request !10
2023-09-21 09:56:37 +00:00
0b8792b373 Merge branch 'fetch-device-info' into 'main'
Added fetch device info

See merge request ukacorp/mesari/backend!10
2023-09-21 09:39:36 +00:00
11d560f4d2 Merge branch 'soft-delete' into 'main'
Soft delete device

See merge request ukacorp/mesari/backend!8
2023-09-21 09:37:42 +00:00
Nedim
499906f883 Added fetch device info 2023-09-21 10:04:47 +02:00
Senad Uka
0a450eae56 Upstream sync 2023-09-19 05:09:33 +02:00
Nedim
56bb362e51 Soft delete device 2023-09-18 13:58:48 +02:00