402 commits

Author	SHA1	Message	Date
Hugo LEVY-FALK	78754b4b9d	Typos, pep8 et company.	2018-07-03 13:58:10 +02:00
Hugo LEVY-FALK	d999089925	POC des moyens de paiements sous forme de modules.	2018-06-28 22:46:16 +02:00
Hugo LEVY-FALK	d4383c2291	Paiement de cotisation en ligne possible pour les utilisateurs normaux (désactivable)	2018-06-25 22:36:14 +02: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
Yoann Pietri	5757a1e911	Avec le name ça marche mieux	2018-05-13 17:54:48 +02:00
Yoann Pietri	dc999b80b5	Utilisation du paquet Debian pour le js	2018-05-13 17:54:48 +02:00
Yoann Pietri	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
grisel-davy	acd8fff2ca	Ajout du champ comment dans le ServiceUserForm	2018-05-02 21:10:28 +02:00
Maël Kervella	ef91a1047a	Add migrations for the fix	2018-04-26 18:21:48 +00:00
Maël Kervella	090c838381	Take locale datetime formats into account in help text	2018-04-26 13:08:04 +00:00
Hugo LEVY-FALK	d2946a94b5	affiche les superuser	2018-04-17 00:32:37 +02:00
Hugo LEVY-FALK	e4d53e6791	Fix #86	2018-04-16 23:57:22 +02:00
Maël Kervella	6c30c36943	Fix : missing migrations	2018-04-15 10:54:53 +00:00
Maël Kervella	915d5e8931	Fix: user.models.User.auto_uid can't be static	2018-04-15 10:52:27 +00:00
Maël Kervella	0065e2e0f5	Fix unused variables in kwargs	2018-04-15 10:52:27 +00:00
Maël Kervella	1469c7d6a6	Pylint compliance on users	2018-04-15 10:52:27 +00:00
Maël Kervella	7b0b5c2af4	Pep8 compliance on users	2018-04-15 10:52:26 +00:00
moamoak	08dbd2615f	Merge branch 'rm_stuff_settings' into 'master' ... Fix #97 Update settings.py Closes #97 See merge request federez/re2o!129	2018-04-14 17:38:46 +02:00
chirac	a4f66ca1b4	Merge branch 'Fix_regression_mailing' into 'master' ... Fix regression mailing See merge request federez/re2o!128	2018-04-14 17:36:45 +02:00
chirac	a99ee1a29c	Update models.py	2018-04-14 17:35:07 +02:00
Maël Kervella	4a67ee8556	Fix the display of mailing info on clubs	2018-04-14 11:57:26 +00:00
Maël Kervella	aa7ded9f20	Fix #95 by removing duplicates classes and functions	2018-04-13 17:33:01 +00:00
Gabriel Detraz	529fbe6c95	Fix del/edit serviceuser	2018-04-10 17:47:26 +00:00
Gabriel Detraz	bb6b19f574	Fix le changement d'etat de l'user	2018-04-07 22:14:40 +02:00
klafyvel	b49866d9ee	Merge branch 'buttons_amelioration' into 'master' ... modification panel profil See merge request federez/re2o!109	2018-04-03 21:10:10 +02:00
chirac	2fffa98d46	Merge branch 'master' into 'profil_frontend' ... # Conflicts: # users/views.py	2018-04-03 18:38:28 +02:00
Gabriel Detraz	3affe08d29	Factorisation de paginator + pagination des machines dans profil	2018-04-03 05:01:01 +02:00
Gabriel Detraz	ec076fb4bf	xReactivation du sendmail	2018-04-03 04:58:26 +02:00
Gabriel Detraz	b748a3003a	Merge branch 'aff_port_naturel' into 'master' ... Aff port naturel See merge request nounous/re2o!21	2018-04-02 20:21:01 +02:00
grisel-davy	cf9d37dc54	affichage des ports plus naturel	2018-04-02 20:12:53 +02:00
Gabriel Detraz	513933abba	Register club et adherent admin pour histo	2018-04-02 03:35:32 +02:00
Gabriel Detraz	e7be7e1a2c	Fix service users + stack	2018-04-01 20:44:49 +02:00
Gabriel Detraz	543037b667	Save que si l'objet a été modifié	2018-04-01 00:07:01 +02:00
Gabriel Detraz	bb5c9603de	Fix history shell	2018-03-31 17:27:32 +02:00
Gabriel Detraz	1795d26c55	Gestion de l'historique avec un mixin forms et model	2018-03-31 17:19:02 +02:00