rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-05 01:16:27 +00:00
Code Issues Releases Wiki Activity
1964 commits 211 branches 14 tags 12 MiB
Commit graph

485 commits

Author SHA1 Message Date
Maël Kervella
45676ef669 Fix indentation and missing div 2018-07-25 18:28:13 +00:00
Gabriel Detraz
7dcd32cb1e Imports corrects 2018-07-23 00:05:59 +02:00
grisel-davy
9321e6b5ed Envoi le la variable d'activation du solde 2018-07-23 00:01:01 +02:00
grisel-davy
6b9896143f Prise en compte du bannissement et déployement des des infos si clique dans les titres 2018-07-23 00:00:37 +02:00
grisel-davy
c5af76f963 Changement des couleurs et prise en ompte de l'activation du solde 2018-07-22 23:59:57 +02:00
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
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
Tipunchetrhum
88f519ba8e modification panel profil 2018-03-29 23:43:43 +02:00
Gabriel Detraz
db74a5c496 Merge branch 'arcas' into 'master' 
Arcas

See merge request nounous/re2o!16
 2018-03-29 14:26:21 +02:00
Gabriel Detraz
c9fd4cd7b5 Fix acl mixin sur users, docstring, fix topologie acl 2018-03-29 04:36:23 +02:00
Gabriel Detraz
12cf400e2a Shell -> ListShell 2018-03-28 20:46:33 +02:00
Gabriel Detraz
007ad3310a Factorise les get_instance dans le mixin acl 2018-03-28 17:15:45 +02:00
Gabriel Detraz
262431113f Passage de cotisations, topologie et users avec le nouveau mixin 2018-03-28 04:07:26 +02:00
Gabriel Detraz
2966547b19 Paginateur sur school + tableaux responsives + fix divers 2018-03-27 23:56:46 +02:00
Gabriel Detraz
50d04b0ae2 Fix divers 2018-03-25 23:02:03 +02:00
Lev-Arcady Sellem
da50e66aa5 Factorisation 2018-03-25 19:24:48 +02:00
Lev-Arcady Sellem
3c9d4b0e6d Changement de mot de passe en ligne de commande 2018-03-25 19:22:02 +02:00
Gabriel Detraz
51c5fc8126 Defini un shell par defaut 2018-03-24 21:32:24 +01:00
esum
b41507d0e5 Ajout de derniere_connexion.py 2018-03-24 19:46:32 +01:00
Gabriel Detraz
1038625fb8 Edition graphique des shells pour les admin 2018-03-24 19:07:15 +01:00
Arthur Grisel-davy
635542f041 Merge branch 'better_frontend' into 'master' 
Better frontend

See merge request nounous/re2o!4
 2018-03-23 15:10:30 +01:00
grisel-davy
8cab7e90aa ajout de div pour rendre les tables scrollables horizontalement 2018-03-23 15:06:12 +01:00
Gabriel Detraz
775c113591 Merge branch 'chsh' into 'master' 
chsh affiche le shell actuel

See merge request nounous/re2o!3
 2018-03-22 19:45:36 +01:00
Krokmou
06ecd44d02 chsh affiche le shell actuel 2018-03-22 19:21:49 +01:00