Commit Graph
388 Commits
Author SHA1 Message Date
CelineDknp 7502ce5ab7 Merge branch 'DB-log' of https://github.com/AdrienHalletUCL/HaitiWater into DB-log 2019-02-11 12:56:43 +01:00
CelineDknp c7410ee738 Processing request 2019-02-11 12:56:32 +01:00
Unknown bdd100f386 Fix trailing slash 2019-02-11 12:53:18 +01:00
Unknown be3bcd2ca0 Try to fix not send 1 2019-02-11 11:50:45 +01:00
Unknown 2f64e94776 Send ID via data parameter instead of array 2019-02-11 11:45:00 +01:00
Unknown c9a4668452 re-activate requests 2019-02-11 11:42:39 +01:00
Unknown c4a52ffd7a Fix not displayed details on log table click 2019-02-11 11:41:10 +01:00
CelineDknp 0dcbb29d10 Fixed failure in details 2019-02-11 11:24:55 +01:00
CelineDknp bc8651d7de Merge branch 'DB-log' of https://github.com/AdrienHalletUCL/HaitiWater into DB-log 2019-02-11 11:09:37 +01:00
CelineDknp 603ca8df52 Fixes from integration 2019-02-11 11:09:18 +01:00
Sébastien Strebelle 7e3e3ed7dc reactivated service worker 2019-02-11 11:01:49 +01:00
Sébastien Strebelle 29cb34e68b Merge remote-tracking branch 'origin/DB-log' into DB-log 2019-02-11 10:59:15 +01:00
Sébastien Strebelle 36b86bface deactivated service worker 2019-02-11 10:58:24 +01:00
Unknown ebf6d4f46d Request header 2019-02-11 10:50:20 +01:00
CelineDknp f22e818b96 tiny fix 2019-02-11 10:37:24 +01:00
AdrienHalletUCL b0b0dee81e Fix method duplication 2019-02-11 10:35:24 +01:00
Unknown 7be83822f4 Merge branch 'GUI-log' into DB-log 2019-02-11 10:28:24 +01:00
Unknown 50b9a5eb5e Back request to accept/revert 2019-02-11 08:57:29 +01:00
CelineDknp 0e5a6034d2 Returns the zone for water element 2019-02-09 17:37:40 +01:00
CelineDknp 757ae3083c Returns the zone for everyone 2019-02-09 17:36:38 +01:00
CelineDknp 8d213d6c29 Returns the manager name 2019-02-09 17:29:02 +01:00
CelineDknp 89e3ce6b07 Fix consumer not showing for fountain manager 2019-02-09 17:16:41 +01:00
Sébastien Strebelle c58f9b9457 Merge branch 'integration' of github.com:AdrienHalletUCL/HaitiWater into integration 2019-02-08 13:02:55 +01:00
Sébastien Strebelle 1f51088d34 Notification on saving monthly report 2019-02-08 13:02:52 +01:00
adhallet 9c276c8046 We actually need to add consumers as a fountain manager 2019-02-07 16:29:43 +01:00
adhallet 8389041e5f Do not render add/edit modal and add button when user = fountain manager 2019-02-07 11:14:04 +01:00
adhallet 7f244552c8 Graph refresh button 2019-02-06 20:19:39 +01:00
adhallet 6d40ec1727 Proper graph size setting 2019-02-06 20:16:49 +01:00
adhallet c0f6cbab17 Remove the CSRF_Token exemption and send it in header 2019-02-06 19:33:37 +01:00
adhallet ee30272151 Set graph height to 300px to keep layout 2019-02-05 14:02:25 +01:00
adhallet a77481d23d fix datepicker open on page load 2019-02-05 13:49:51 +01:00
adhallet 966d3cec46 Remove legacy fontawesome 4.1 2019-02-05 13:45:59 +01:00
adhallet 526befe324 Hosting FontAwesome locally as with other vendors 2019-02-05 13:44:52 +01:00
adhallet 8244b7fee6 New logo from Lucie 2019-02-05 13:16:29 +01:00
AdrienUCL 707a75706c fix - Display selection on button 2019-02-01 19:29:13 +01:00
Unknown 6fcb881f04 Add button to choose month in water_element table 2019-02-01 19:25:41 +01:00
Unknown 109551e3bb Requests to accept/revert 2019-01-30 17:24:31 +01:00
Unknown 1d6358f1d3 remove useless import 2019-01-30 17:24:09 +01:00
CelineDknp 85d1a7d526 Fixed tiny bug when logs were empty 2019-01-30 15:54:36 +01:00
CelineDknp 7c2d13eb62 Pretty logs 2019-01-30 15:50:31 +01:00
CelineDknp 8c324784c5 Fix problem when showing logs 2019-01-30 14:53:32 +01:00
CelineDknp f1d74ae476 Merge branch 'DB-log' of https://github.com/AdrienHalletUCL/HaitiWater into DB-log 2019-01-30 14:42:21 +01:00
CelineDknp cff6edd0e9 Fix first problem with wounting consumers 2019-01-30 14:39:21 +01:00
adhallet d7e0a784a2 fix - import group on backend 2019-01-30 10:05:06 +01:00
adhallet 7dea63cd41 Round gallons conversion to 3 decimals 2019-01-30 09:09:36 +01:00
Unknown 2a9a7420f1 fix - display details on row click 2019-01-29 19:32:33 +01:00
Sébastien Strebelle e5e3f510ec Merge branch 'service_worker' into integration 2019-01-29 19:20:28 +01:00
Sébastien Strebelle 8c1a6a8416 Merge remote-tracking branch 'origin/integration' into service_worker 2019-01-29 19:18:41 +01:00
Sébastien Strebelle 1b1ecfbfd8 final tested version of sw 2019-01-29 19:18:24 +01:00
CelineDknp b989219510 Fix tiny bug when creating fountain managers 2019-01-29 19:13:06 +01:00