chirac
a84e8b5575
Merge branch 'fix_65_history' into 'master'
...
fix #65 , gestion propre de l'historique.
Closes #65
See merge request federez/re2o!186
2018-07-22 22:22:19 +02:00
klafyvel
f6a152f033
Merge branch 'fix_126' into 'master'
...
Fix #126
Closes #126
See merge request federez/re2o!188
2018-07-22 13:16:55 +02:00
Hugo LEVY-FALK
2ee17b370b
Passage par flags plutôt que par valeurs
2018-07-20 19:54:03 +02:00
chirac
6d8aeb6101
Update views.py
2018-07-20 12:59:24 +02:00
chirac
0bec40de58
Update models.py
2018-07-20 12:57:54 +02:00
Gabriel Detraz
fe378e7909
Function for shadow expire
2018-07-19 20:47:56 +02:00
Gabriel Detraz
11a59ee553
Fix #126
2018-07-19 20:37:01 +02:00
Hugo LEVY-FALK
6b945bf322
fix #65 , gestion propre de l'historique.
2018-07-19 12:30:15 +02:00
moamoak
cfa6fe097d
Merge branch 'fix_online_payment' into 'master'
...
Refactorisation des moyens de paiement
See merge request federez/re2o!174
2018-07-16 23:36:16 +02:00
Hugo LEVY-FALK
f28ad9a12d
Vérification de la permission de créditer le solde cohérente.
2018-07-16 20:14:26 +02:00
Hugo LEVY-FALK
899cd863eb
Fix la visibilité du bouton de recharge de solde.
2018-07-15 20:16:02 +02:00
moamoak
b0de7f2611
Merge branch 'Fix_139' into 'master'
...
Use m2m_changed signal to resync LDAP after a user's group has changed
Closes #139
See merge request federez/re2o!183
2018-07-14 13:43:27 +02:00
Hugo LEVY-FALK
241af30211
Fix d'affichage
2018-07-13 22:23:32 +02:00
Mael Kervella
2d766daed8
Fix: Fucking LDIF lines can span over multiple lines
2018-07-12 17:55:07 +00:00
Maël Kervella
098440eb50
Use m2m_changed signal to resync LDAP after a user's group has changed
2018-07-12 16:19:23 +00:00
Hugo LEVY-FALK
17f627c4c4
Plus de nom de paiement hardcodés !
2018-07-12 14:42:13 +02:00
Hugo LEVY-FALK
328c030cc4
Supprime la vue 'recharge' qui faisait doublon avec 'credit_solde'
2018-07-12 14:42:13 +02:00
Hugo LEVY-FALK
c9ec5b2385
Fix les erreurs d'affichage du solde sur la page de profil.
2018-07-12 14:42:13 +02:00
Hugo LEVY-FALK
6d5d9295d5
Ajout de la possibilité de recharger son solde.
2018-07-12 14:42:13 +02:00
Hugo LEVY-FALK
692b3b70b6
Passage du paiement par solde en paiement personnalisé.
2018-07-12 14:40:16 +02:00
Hugo LEVY-FALK
af3cc1cf69
Typos, pep8 et company.
2018-07-12 14:40:16 +02:00
Hugo LEVY-FALK
e0d71ed291
POC des moyens de paiements sous forme de modules.
2018-07-12 14:40:16 +02:00
Hugo LEVY-FALK
2eb0fc816d
Paiement de cotisation en ligne possible pour les utilisateurs normaux (désactivable)
2018-07-12 14:40:15 +02:00
Maël Kervella
08157c4565
Add context processor to get the current date
2018-07-12 12:19:26 +00:00
Maël Kervella
6a08e14165
Otimize DB request for the right page
...
Reimplement end_adhesion and is_adherent methods in the
query itself so it can be done in a single query and not
done for each user individually.
2018-07-12 11:56:07 +00:00
Maël Kervella
324b48d37a
Translate new right page
2018-07-12 11:56:07 +00:00
Maël Kervella
6df493cfb9
Display "gid: "
2018-07-12 11:56:07 +00:00
Maël Kervella
4eeb8802f6
Use button instead of badge
2018-07-12 11:56:07 +00:00
Maël Kervella
19f1e28308
Refactor display of rights in users/listright page
2018-07-12 11:56:07 +00:00
Maël Kervella
4cbb05d294
Add a Django command to fully rebuild the LDAP
2018-07-07 18:01:04 +00:00
Maël Kervella
5706e9064e
Fix #117 : Use unix_name instead of name for ldap groups
...
A group in the LDAP now use the `unix_name` instead of the `name`
The `new_group` form has now a more logical order for the fields
The label for the `unix_name` is now more explicit
2018-07-07 12:53:57 +00:00
klafyvel
17f3867371
Merge branch 'master' into 'clean_api_duplicate'
...
# Conflicts:
# CHANGELOG.md
2018-06-24 22:57:15 +02:00
Maël Kervella
8ea85f88ce
Fix #136 : Reactivate the welcome mail
2018-06-22 21:41:15 +00:00
Maël Kervella
3f4dd43fa9
Fix ldap testing
2018-06-21 15:09:40 +00:00
Gabriel Detraz
f41fcc843f
Add test LDAP
2018-06-20 12:14:02 +00:00
Grizzly
3e244b8ba9
Ajout d'un bouton pour supprimer les accés gracieux
2018-06-17 13:12:12 +00:00
Grizzly
4252f84398
Ajout d'un bouton de supression des banissements
2018-06-17 12:13:10 +00:00
chirac
fbd7c3de49
Revert "Merge branch 'fix_room_force_move_in' into 'master'"
...
This reverts merge request !161
2018-05-14 23:58:05 +02:00
Hugo LEVY-FALK
c1ceb5e2b3
fix de l'emménagement forcé
2018-05-14 23:16:36 +02:00
5757a1e911
Avec le name ça marche mieux
2018-05-13 17:54:48 +02:00
dc999b80b5
Utilisation du paquet Debian pour le js
2018-05-13 17:54:48 +02:00
39e96bc53d
Datetimepicker pour les bans et whitelists
2018-05-13 17:54:48 +02:00
root
c693f9f5ba
Création du widget datetimeinput
2018-05-13 17:54:18 +02:00
chirac
dcd1e2af96
Merge branch 'fix_110_display_superuser' into 'master'
...
Fix #110 display superuser
Closes #110
See merge request federez/re2o!150
2018-05-03 14:42:44 +02:00
Hugo LEVY-FALK
a5013920da
ACL
2018-05-03 14:22:52 +02:00
Hugo LEVY-FALK
9d79ffb5ca
Plus de BÔTÉ dans l'affichage des superusers
2018-05-03 14:08:05 +02:00
Hugo LEVY-FALK
8a19977757
Ne réinvente pas la roue
2018-05-03 11:55:34 +02:00
Hugo LEVY-FALK
4a5fd06ace
Ajout de superusers
2018-05-03 10:56:21 +02:00
Hugo LEVY-FALK
6f3fc983ac
Suppression de superuser
2018-05-03 10:26:17 +02:00
chirac
94cea4e7c3
Merge branch 'fix_#114' into 'master'
...
Fix #114 : Take locale datetime formats into account in help text
Closes #114
See merge request federez/re2o!144
2018-05-03 06:47:37 +02:00