OpenSource/HaitiWater
1
0 Fork 0
mirror of https://github.com/AdrienHallet/HaitiWater.git synced 2026-10-27 18:05:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
904 Commits 4 Branches 0 Tags
240d892abc5d261d95318ac94de66b4eee136ebf
Commit Graph
904 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sébastien Strebelle 240d892abc rest of table tests 2019-05-01 12:49:51 +02:00
Sébastien Strebelle fc6cb415db half table tests 2019-05-01 00:40:49 +02:00
Sébastien Strebelle 16aed4e0d2 all delete tests 2019-04-30 20:15:28 +02:00
Sébastien Strebelle 38f027645f all edit tests 2019-04-30 17:54:34 +02:00
Sébastien Strebelle 2585757732 all add tests 2019-04-28 23:47:08 +02:00
Sébastien Strebelle 89af159407 test of tests 2019-04-23 10:00:09 +02:00
Sébastien Strebelle 447da41770 Merge remote-tracking branch 'origin/integration' into integration 2019-04-23 08:38:08 +02:00
Sébastien Strebelle 4bed3fa261 Cleaning imports all the way 2019-04-23 08:37:56 +02:00
CelineDknp fe9707808c Adding base price to Haiti 2019-04-16 17:31:18 +02:00
adhallet 01dea1ba05 Merge remote-tracking branch 'origin/integration' into integration 2019-04-14 16:03:18 +02:00
adhallet 112ce006dc Display more informations on controls 2019-04-14 16:03:06 +02:00
adhallet 23af51b017 Pointer cursor on all table rows 2019-04-14 15:49:59 +02:00
Unknown e54be8ee73 New consumer filter from zone based on row 2019-04-08 19:03:08 +02:00
Sébastien Strebelle 59383a90f2 right name for indiv price 2019-04-08 18:15:32 +02:00
Unknown d3268ff74d Remove useless duration field for individual prices 2019-04-08 18:04:05 +02:00
Sébastien Strebelle a41d94dc60 Merge remote-tracking branch 'origin/integration' into integration 2019-04-08 17:53:48 +02:00
Sébastien Strebelle ebd3eabd70 filter GIS depending on markers 2019-04-08 17:53:40 +02:00
Unknown f6cf0c5dda Base price for individuals outlets in zone modal and table 2019-04-08 17:52:52 +02:00
Sébastien Strebelle 4f5eb02f35 GIS aware of connected user 2019-04-08 13:10:23 +02:00
Sébastien Strebelle 9859447306 some lint 2019-04-08 13:00:19 +02:00
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