rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-26 08:53:46 +00:00
Code Issues Releases Wiki Activity
1648 commits 211 branches 14 tags 12 MiB
Commit graph

413 commits

Author SHA1 Message Date
chirac
415a393bfa Merge branch 'better_user' into crans 2018-06-26 22:33:34 +02:00
grisel-davy
8105a61324 Ajout de l'extension mail dans preference et debut de frontend 2018-06-26 22:27:33 +02:00
Charlie Jacomme
99bd78aabe Merge branch 'mail' into crans 2018-06-26 19:01:43 +02:00
Charlie Jacomme
dbf24147bc fix mailalias model 2018-06-26 18:59:15 +02:00
Grizzly
b150663125 Crée des comptes mail et des alias mail 2018-06-26 16:46:57 +00:00
Charlie Jacomme
c762f49468 Optimizing facture request 2018-06-26 18:44:07 +02:00
Grizzly
d8bcbba229 orthographe et mise en page 2018-06-26 15:22:16 +00:00
Gabriel Detraz
3d5783caa2 Merge branch 'better_user' of https://gitlab.federez.net/federez/re2o into better_user 2018-06-26 14:56:49 +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
grisel-davy
48b85f8658 Prise en compte du bannissement et déployement des des infos si clique dans les titres 2018-06-16 09:57:21 +02:00
grisel-davy
75324a13d3 Envoi de la variable d'activation du solde 2018-06-15 18:16:07 +02:00
grisel-davy
e18c538495 Envoi le la variable d'activation du solde 2018-06-15 18:12:43 +02:00
grisel-davy
88386fc55c Changement des couleurs et prise en ompte de l'activation du solde 2018-06-15 11:00:12 +02:00
grisel-davy
83aa267940 rectification si aucune machine 2018-06-10 21:36:36 +02:00
grisel-davy
9e7edd9902 debut de refonte de la page profil 2018-06-10 21:32:41 +02: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