Commit Graph
53 Commits
Author SHA1 Message Date
CelineDknp 5792d26f33 Manual merge ? 2019-04-07 16:02:58 +02:00
Sébastien Strebelle 7245a55d47 Added individual base price in back 2019-04-06 15:17:15 +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
CelineDknp e5a3bd8836 Don't rememeber 2019-03-30 17:06:42 +01:00
CelineDknp 12ba9c23de First draft phone number for managers 2019-03-28 15:22:10 +01:00
Unknown ab94ab7463 Tooltips on FA buttons 2019-03-22 15:22:49 +01:00
adhallet d8b08be29a Merge remote-tracking branch 'origin/integration' into integration 2019-03-18 13:26:28 +01:00
adhallet a20aa821ef Move JS import 2019-03-18 13:25:27 +01:00
adhallet bc3496663d Show/hide password on login page 2019-03-18 13:16:47 +01:00
CelineDknp 097efcfefd Logs are cleaned 2019-03-17 17:53:21 +01:00
CelineDknp 81c112adfd Fixed unseeable logs 2019-03-13 13:06:32 +01:00
CelineDknp f3664ca28f Optimization of the water_element queries 2019-03-04 15:11:49 +01:00
CelineDknp 313bcaff4a Tiny fix again 2019-02-22 18:51:13 +01:00
adhallet 2d4f6e49d1 Removed JQuery UI from preload 2019-02-22 05:58:26 +01:00
Unknown b33d3e8f0a Merge branch 'gui-gis' into integration 2019-02-20 19:07:32 +01:00
CelineDknp de9af029fa Transactions that cancel themselves should not be kept in DB 2019-02-17 02:22:45 +01:00
CelineDknp 603ca8df52 Fixes from integration 2019-02-11 11:09:18 +01:00
CelineDknp f22e818b96 tiny fix 2019-02-11 10:37:24 +01:00
CelineDknp 757ae3083c Returns the zone for everyone 2019-02-09 17:36:38 +01:00
CelineDknp 1c28dcaf32 Return value for detail 2019-02-07 17:24:38 +01:00
CelineDknp 7c2d13eb62 Pretty logs 2019-01-30 15:50:31 +01:00
CelineDknp c45d7b6806 Merge manual for one print 2019-01-27 18:23:43 +01:00
CelineDknp e5c39656f3 Roll back 2019-01-21 20:59:06 +01:00
adhallet 7ca6545c1c Change password form - move it to profile page 2019-01-21 02:38:11 +01:00
CelineDknp db18e1be03 First draft of back-end for log rollback 2019-01-19 16:58:13 +01:00
CelineDknp 65a034ba3f Delete logs 2019-01-19 01:32:11 +01:00
CelineDknp 454270f40b Log methods + log when adding 2019-01-19 01:10:57 +01:00
CelineDknp 11fdbfda7b Fixed password change 2019-01-14 00:23:04 +01:00
adhallet 06b78b6dda CSS on password reset form 2019-01-12 16:07:09 +01:00
CelineDknp 88382a3883 Password reset is done 2019-01-10 18:28:28 +01:00
CelineDknp 3998ad627b Changing profile infos is now possible 2019-01-09 21:34:51 +01:00
CelineDknp 8b99264aef Working on the change of password 2019-01-09 21:12:13 +01:00
AdrienUCL 71776d8047 Add names to form inputs 2019-01-09 17:37:20 +01:00
AdrienUCL f4dae8625f Profile edition forms 2019-01-09 03:11:30 +01:00
AdrienUCL dcb5d2f5ad rules for profile edition urls 2019-01-09 00:24:49 +01:00
Unknown bae6c69a8e Proper login screen 2018-12-18 13:20:37 +01:00
CelineDknp f600b4e4b6 Add users working 2018-12-14 18:26:12 +01:00
CelineDknp de21a87c23 Possible fix 2018-12-14 11:39:03 +01:00
CelineDknp 773bcb36e2 Start of auth correctly 2018-12-14 01:06:29 +01:00
CelineDknp 7ae4c5b8ae Auth half done ? 2018-12-13 17:29:14 +01:00
CelineDknp 272a312913 First tries to implement auth permissions 2018-12-12 20:28:33 +01:00
AdrienUCL 0b47a7ec81 favicon on auth page (does not inherit base.html) 2018-12-07 16:03:59 +01:00
adhallet 2c537ea32f Removing unneeded options 2018-12-06 17:48:26 +01:00
CelineDknp cbbc76d5e4 Authentication + modifs on setting.py, be careful 2018-11-27 16:04:51 +01:00
CelineDknp 69879677a1 Merge branch 'integration' into dev-API 2018-11-27 11:11:18 +01:00
adhallet 59bf286049 Add CSRF token 2018-11-21 23:17:20 +01:00
adhallet 10dc962812 Login page 2018-11-21 23:14:12 +01:00
CelineDknp 8574f906d0 Half handeling the customers 2018-11-21 22:01:09 +01:00