Commit Graph

  • 80070d4198 Merge branch 'uuid' into 'main' main Senad Uka 2023-11-23 06:31:22 +00:00
  • d54b643378 Added uuid middleware Nedim 2023-11-21 18:28:30 +01:00
  • a7ab058d01 Merge branch 'buyer' into 'main' Senad Uka 2023-11-21 07:01:52 +00:00
  • 903da29fed Added buyer seller bolean Nedim 2023-11-15 16:16:44 +01:00
  • d7f79c51c3 Merge branch 'hotfix' into 'main' Senad Uka 2023-11-21 06:56:02 +00:00
  • 9b425229d3 Merge branch 'loginfix' into 'main' Senad Uka 2023-11-21 06:55:47 +00:00
  • f9328bdecb Hotifix Nedim 2023-11-14 20:41:51 +01:00
  • 2e7105a18e Fixed login Nedim 2023-11-14 20:35:28 +01:00
  • 758e033870 Merge branch 'docker-one' into 'main' Senad Uka 2023-11-14 10:52:57 +00:00
  • 4d3d7a55e2 Docker one Nedim 2023-11-14 11:47:44 +01:00
  • 050a8f81fd Merge branch 'docker' into 'main' Senad Uka 2023-11-14 10:10:26 +00:00
  • 766ed0ae65 Merge branch 'companies-users' into 'main' Senad Uka 2023-11-14 10:10:10 +00:00
  • 6c496d644b Added change to dockerfile Nedim 2023-11-14 10:24:25 +01:00
  • 515134dde5 Fixed qor admin companies users Nedim 2023-11-13 18:03:16 +01:00
  • 8f365557a8 Merge branch 'filter-by-company' into 'main' Senad Uka 2023-11-13 06:30:47 +00:00
  • 53a7248ea4 Merge branch 'devices-fix' into 'main' Senad Uka 2023-11-13 06:24:32 +00:00
  • 99b9df5066 Protected routes Nedim 2023-11-10 17:32:17 +01:00
  • 3248359726 Return imeis for contract Nedim 2023-11-08 22:49:52 +01:00
  • 5296edc4a7 Upstream sync Senad Uka 2023-11-09 10:06:06 +01:00
  • 01f27bf6f9 Merge branch 'user' into 'main' Senad Uka 2023-11-07 06:58:48 +00:00
  • 367b5d51f2 Added login and logout Nedim 2023-11-06 11:22:51 +01:00
  • e47336dc8d Merge branch 'patch' into 'main' Senad Uka 2023-11-02 11:03:53 +00:00
  • 4767756499 Patch contract by ImeiID Nedim 2023-11-02 11:56:06 +01:00
  • b9fb75ff36 Merge branch 'login' into 'main' Senad Uka 2023-11-02 06:16:01 +00:00
  • 72ccd5e71c Added reset password route Nedim 2023-10-30 19:21:43 +01:00
  • 75692d7b20 Upstream sync Senad Uka 2023-10-31 07:35:23 +01:00
  • 06aec8c900 Merge branch 'stats' into 'main' Senad Uka 2023-10-25 02:51:06 +00:00
  • d40b225e4e Added measurements, and devices statsh Nedim 2023-10-20 12:03:59 +02:00
  • 6892c56c1e Upstream sync Senad Uka 2023-10-24 10:24:20 +02:00
  • fd880aeaa2 Upstream sync Senad Uka 2023-10-24 05:48:19 +02:00
  • 2c267b71e4 Merge branch 'evets-of-notification' into 'main' Senad Uka 2023-10-19 10:01:37 +00:00
  • 2e60460131 Added temperature exceded event Nedim 2023-10-16 19:43:35 +02:00
  • 44efa194fc upstream sync Senad Uka 2023-10-19 07:57:48 +02:00
  • 5b1acd1c5f Upstream sync Senad Uka 2023-10-17 11:51:48 +02:00
  • 3ff212d6d2 Upstream sync. Senad Uka 2023-10-17 11:46:28 +02:00
  • 7c3407c86d upstream sync Senad Uka 2023-10-17 10:32:52 +02:00
  • 3cff15ed25 Merge branch 'notificaitons' into 'main' Senad Uka 2023-10-17 08:29:00 +00:00
  • abe79e5556 Added notificaiton model Nedim 2023-10-09 18:23:44 +02:00
  • 00d15ebe7e Upstream sync Senad Uka 2023-10-16 12:03:47 +02:00
  • 533451f39d Upstream sync Senad Uka 2023-10-16 05:44:09 +02:00
  • d01c1a0232 Upstream sync Senad Uka 2023-10-13 11:48:14 +02:00
  • 7369739bdd upstream sync Senad Uka 2023-10-12 05:23:34 +02:00
  • d3011d77ff upstream sync Senad Uka 2023-10-10 08:39:50 +02:00
  • 598f706958 Merge branch 'create-contract' into 'main' Senad Uka 2023-10-10 06:39:06 +00:00
  • 314abe0462 Added create contact ednpoint Nedim 2023-10-06 10:47:26 +02:00
  • f32b5d5748 usptream sync Senad Uka 2023-10-04 13:31:28 +02:00
  • eb924d2bec Merge branch 'get-contracts-for-buyers' into 'main' Senad Uka 2023-10-04 11:27:30 +00:00
  • 2cfac4a023 Contracts for buyer Nedim 2023-10-03 18:26:57 +02:00
  • 7df0c64d15 upstream sync Senad Uka 2023-10-02 12:59:19 +02:00
  • 8a2dbfe055 Merge branch 'invoice' into 'main' Senad Uka 2023-10-02 10:57:29 +00:00
  • 60042ebd30 Added invoices endpoint Nedim 2023-09-27 19:20:44 +02:00
  • 937c61c635 Upstream sync Senad Uka 2023-09-27 08:04:50 +02:00
  • 7320fcb527 Upstream sync Senad Uka 2023-09-26 07:25:19 +02:00
  • 3b7ba95d27 Merge branch 'devices-serach' into 'main' Senad Uka 2023-09-25 12:10:48 +00:00
  • 045d349c86 Added search params for get contract Nedim 2023-09-22 11:38:32 +02:00
  • 04df3ece96 Merge branch 'main-new' into 'main' Senad Uka 2023-09-25 05:18:15 +00:00
  • 4779c32a56 Fixed comments Nedim 2023-09-22 08:28:50 +02:00
  • 85e695b2d8 Rebase Nedim 2023-09-19 08:15:42 +02:00
  • c2d6923375 Upstream sync Senad Uka 2023-09-21 11:59:08 +02:00
  • f4dcb823c4 Merge branch 'revert-0b8792b3' into 'main' Senad Uka 2023-09-21 09:57:06 +00:00
  • 080587f327 Revert "Merge branch 'fetch-device-info' into 'main'" Senad Uka 2023-09-21 09:56:37 +00:00
  • 0b8792b373 Merge branch 'fetch-device-info' into 'main' Senad Uka 2023-09-21 09:39:36 +00:00
  • 11d560f4d2 Merge branch 'soft-delete' into 'main' Senad Uka 2023-09-21 09:37:42 +00:00
  • 499906f883 Added fetch device info Nedim 2023-09-19 08:15:42 +02:00
  • 0a450eae56 Upstream sync Senad Uka 2023-09-19 05:09:33 +02:00
  • 56bb362e51 Soft delete device Nedim 2023-09-14 18:33:27 +02:00
  • dc728c4183 Upstream sync Senad Uka 2023-09-18 13:39:32 +02:00
  • 1f30f85787 Upstream sync Senad Uka 2023-09-18 12:27:40 +02:00
  • 9750aa2c37 Merge branch 'device-info-comment-fix' into 'main' Senad Uka 2023-09-15 09:06:20 +00:00
  • aefa8d927b Fixed comments for create new device where device not found while saving device_info Nedim 2023-09-15 07:41:39 +02:00
  • faea7f213b Merge branch 'save-device-info' into 'main' Senad Uka 2023-09-14 06:18:58 +00:00
  • dcf1652dd9 Fixed naming Nedim 2023-09-14 08:10:33 +02:00
  • 1353404aed Added logic for finding devices Nedim 2023-09-13 21:54:43 +02:00
  • 386f051d67 Added route for saving device info Nedim 2023-09-12 18:28:18 +02:00
  • 32c0cd1ffc Merge branch 'services' into 'main' Senad Uka 2023-09-11 10:25:54 +00:00
  • 67615d76dd Added multiple services to be trigered from main API Nedim 2023-09-11 12:01:30 +02:00
  • f52d8d9a30 Merge branch 'module-name' into 'main' Senad Uka 2023-09-11 09:22:38 +00:00
  • 203961986d Module name Nedim 2023-09-11 08:08:24 +02:00
  • 013601dd50 Fixed module name setting-up-user Nedim 2023-09-11 08:08:24 +02:00
  • a4fed06efc Merge branch 'setting-up-user' into 'main' Senad Uka 2023-09-11 06:08:55 +00:00
  • 0829e049f0 Fixed module name Nedim 2023-09-11 08:08:24 +02:00
  • 5fa6f33501 Merge branch 'setting-up-user' into 'main' Senad Uka 2023-09-11 05:55:03 +00:00
  • f02e5e49cb Added views for QOR admin Nedim 2023-09-07 13:04:34 +02:00
  • 40c6366608 Added devices and companies models Nedim 2023-09-06 11:58:33 +02:00
  • 8bbfa53d42 Merge branch 'env-setup' into 'main' Senad Uka 2023-09-05 09:40:52 +00:00
  • 2cdbbd5745 Added environment variables Nedim 2023-09-05 11:37:03 +02:00
  • b9131699a7 Merge branch 'initial-setup' into 'main' Senad Uka 2023-09-04 09:32:12 +00:00
  • 62de1401e5 Setup boilerplate gorm , and admin part Nedim 2023-09-04 11:13:21 +02:00
  • eb4303bb08 Initial commit Senad Uka 2023-09-04 05:54:45 +00:00