Commit Graph
779 Commits
Author SHA1 Message Date
CelineDknp 8e56c19b4e Fixed balance. Oops 2019-04-07 16:52:28 +02:00
CelineDknp ca999a19cc Balance of consumers 2019-04-07 16:39:35 +02:00
CelineDknp 498cb30941 Fixed issue where we could delete Protos 2019-04-07 16:13:27 +02:00
CelineDknp 5792d26f33 Manual merge ? 2019-04-07 16:02:58 +02:00
Sébastien Strebelle 680b7e71b6 Merge remote-tracking branch 'origin/integration' into integration 2019-04-06 15:17:23 +02:00
Sébastien Strebelle 7245a55d47 Added individual base price in back 2019-04-06 15:17:15 +02:00
adhallet 95e19fe383 Water element validation - no state check needed 2019-04-06 14:03:07 +02:00
adhallet a754918d45 Merge remote-tracking branch 'origin/integration' into integration 2019-04-06 13:58:41 +02:00
adhallet 3fd0376bfc Water element creation state defaults to ok 2019-04-06 13:58:29 +02:00
Sébastien Strebelle 087cd77787 Merge remote-tracking branch 'origin/integration' into integration 2019-04-06 13:57:54 +02:00
Sébastien Strebelle ad9dd4f4d2 back ready for consumer zone in datatable 2019-04-06 13:57:47 +02:00
adhallet 358d81efff Load & disable on monthly report submission 2019-04-06 13:56:14 +02:00
adhallet ebcb1ec139 CSRF Tokens on all GIS requests 2019-04-06 13:31:57 +02:00
Sébastien Strebelle d1e32e2c35 Merge remote-tracking branch 'origin/integration' into integration
# Conflicts:
#	code/haitiwater/apps/authentication/views.py
2019-04-02 15:10:00 +02:00
Sébastien Strebelle 3729426ebe clean exports + lint authentication 2019-04-02 15:08:46 +02:00
Unknown 6aeb4789bc fix profile info not displayed 2019-04-02 14:49:29 +02:00
Unknown 776296298a Show zone pricing details on click 2019-04-02 09:38:50 +02:00
Unknown d97bf9a0d9 Send zero when no price is set 2019-04-02 09:04:26 +02:00
Unknown a1b6b7d215 Align tip on email with email, not with phone 2019-04-02 08:59:25 +02:00
Sébastien Strebelle bdd07c9a09 fix comment 2019-04-01 22:59:50 +02:00
Sébastien Strebelle 77e54bf779 Graph 2 + some opti 2019-04-01 22:38:44 +02:00
Sébastien Strebelle 727385626b user name instead of user ID on manager name list 2019-04-01 21:09:21 +02:00
adhallet df4c70db73 Increment alpha 3 to beta 1 2019-04-01 20:32:14 +02:00
adhallet fca6c69422 Redirect to login when user is not authenticated on a restricted page 2019-04-01 20:28:51 +02:00
adhallet de882413b5 New filter on manager's names 2019-04-01 19:38:34 +02:00
Unknown 77b3655bdc Processing consumer table 2019-04-01 11:22:58 +02:00
CelineDknp 2c33de87d5 Merge branch 'integration' of https://github.com/AdrienHalletUCL/HaitiWater into integration 2019-03-30 17:07:48 +01:00
CelineDknp e5a3bd8836 Don't rememeber 2019-03-30 17:06:42 +01:00
Sébastien Strebelle 211b3db0ca v3 2019-03-29 21:34:25 +01:00
Sébastien Strebelle 3852414ea3 Merge remote-tracking branch 'origin/integration' into integration 2019-03-29 21:00:26 +01:00
Sébastien Strebelle 4b72af620b end of API lint and secu 2019-03-29 21:00:17 +01:00
Unknown 7f0143e4a1 Merge remote-tracking branch 'origin/integration' into integration 2019-03-29 14:11:30 +01:00
Unknown 1548d81915 Allow manager's phone modification 2019-03-29 14:11:20 +01:00
Sébastien Strebelle f5729f9599 fixed modify zone of manager 2019-03-29 14:08:07 +01:00
Unknown e9916066c3 Phone number rearrange 2019-03-28 16:49:16 +01:00
CelineDknp ff56302a04 Adding to managers 2019-03-28 15:30:18 +01:00
CelineDknp 12ba9c23de First draft phone number for managers 2019-03-28 15:22:10 +01:00
Unknown 5d70aa1f34 Merge remote-tracking branch 'origin/integration' into integration 2019-03-28 14:44:47 +01:00
Unknown eccf443415 Phones padding 2019-03-28 14:44:44 +01:00
Unknown 24c9fcb6ff Phone number for managers 2019-03-28 14:36:36 +01:00
Sébastien Strebelle 8c2fc16b70 fixed payment cache 2019-03-28 13:29:18 +01:00
Sébastien Strebelle 00b0876bdc Merge remote-tracking branch 'origin/integration' into integration 2019-03-28 13:15:04 +01:00
Sébastien Strebelle bfed9c9963 Lint edit and export + fix consumer phone 2019-03-28 13:14:39 +01:00
Unknown 104c23b226 Rework financial requests 2019-03-26 09:51:53 +01:00
Unknown 131564062a Merge remote-tracking branch 'origin/integration' into integration 2019-03-26 08:28:26 +01:00
Unknown d70d6c54ef Selection is now background color (was bold) 2019-03-26 08:28:23 +01:00
adhallet 6131a726c4 Resize menu on all layouts & nano positions 2019-03-25 21:34:39 +01:00
adhallet 429e86a6fb Reduction of the nano menu (desktop) from 300 to 200px 2019-03-25 21:31:01 +01:00
Unknown aab2742df3 Argument for ajax request on zone table 2019-03-25 13:36:53 +01:00
Unknown 4d8b338d2b re-center drawer control (GIS) 2019-03-25 13:03:27 +01:00