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

1890 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gabriel Detraz
469d96ff00 Merge branch 'new_upstream' into 'master' 
New upstream

See merge request nounous/re2o!12
 2018-03-25 18:37:23 +02:00
Gabriel Detraz
3b18d308be Adapte auth.py pour la nouvelle gestion switchs 2018-03-25 18:35:32 +02:00
Gabriel Detraz
81ec19ecce Del code mort 2018-03-25 16:23:02 +02:00
Gabriel Detraz
ce21f3a550 Merge branch 'master' of https://gitlab.federez.net/federez/re2o 2018-03-25 16:06:32 +02:00
Gabriel Detraz
3e1978a64e Merge branch 'inherit_sw' into 'master' 
Switch hérite de interface

See merge request nounous/re2o!11
 2018-03-25 12:16:51 +02:00
Gabriel Detraz
3293dff1a4 Fix assignation de l'ip 2018-03-25 04:52:36 +02:00
Gabriel Detraz
3a2e007372 Switch hérite de interface 2018-03-25 04:05:47 +02:00
Gabriel Detraz
cb87b3f6c0 Merge branch 'default_shell' into 'master' 
Default shell

See merge request nounous/re2o!10
 2018-03-24 21:32:48 +01:00
Gabriel Detraz
51c5fc8126 Defini un shell par defaut 2018-03-24 21:32:24 +01:00
Gabriel Detraz
cf286e2732 Merge branch 'derniere_connexion' into 'master' 
Ajout de derniere_connexion.py

See merge request nounous/re2o!9
 2018-03-24 19:58:27 +01:00
esum
b41507d0e5 Ajout de derniere_connexion.py 2018-03-24 19:46:32 +01:00
Gabriel Detraz
d299e25fa3 Merge branch 'tri_droits' into 'master' 
finalisation de la page de gestion des droits

See merge request nounous/re2o!8
 2018-03-24 19:44:40 +01:00
grisel-davy
fd35836f47 finalisation de la page de gestion des droits 2018-03-24 19:42:17 +01:00
Grizzly
40c1d078a4 Merge branch 'edit_shell' into 'master' 
Edit shell

See merge request nounous/re2o!7
 2018-03-24 19:08:38 +01:00
Gabriel Detraz
1038625fb8 Edition graphique des shells pour les admin 2018-03-24 19:07:15 +01:00
Arthur Grisel-davy
1c2fb2b728 Merge branch 'borne_object' into 'master' 
Borne object

See merge request nounous/re2o!6
 2018-03-24 11:31:51 +01:00
Gabriel Detraz
14a7431f45 Unifi_ap_sync , commande manage.py pour nommer les bornes 2018-03-24 04:20:54 +01:00
Gabriel Detraz
5de22014eb Migrations des bornes dans la classe dédiée + fix divers 2018-03-24 04:09:05 +01:00
grisel-davy
53dc43f586 Création de la page d'administration des droits des users 2018-03-24 00:51:54 +01:00
Gabriel Detraz
4cd7066fa0 Object bornes specifique 2018-03-24 00:50:27 +01:00
Arthur Grisel-davy
12ca857d83 Merge branch 'better_frontend' into 'master' 
image cliquable

See merge request nounous/re2o!5
 2018-03-23 15:32:45 +01:00
grisel-davy
9a7e9ebfff image cliquable 2018-03-23 15:31:18 +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
grisel-davy
ce95e882a0 Merge branch 'master' into better_frontend 2018-03-23 15:04:22 +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
chirac
1ff94d2385 Merge branch 'mergeupstream' into 'master' 
Mergeupstream

See merge request federez/re2o!103
 2018-03-22 18:39:08 +01:00
Gabriel Detraz
f77c3692d2 Merge branch 'mergeupstream' into 'master' 
Mergeupstream

See merge request nounous/re2o!2
 2018-03-22 18:34:03 +01:00
Gabriel Detraz
7be0b98905 Change le mode de chsh 2018-03-22 18:30:07 +01:00
Gabriel Detraz
15796c90f7 Merge branch 'master' of https://gitlab.federez.net/federez/re2o 2018-03-22 18:29:15 +01:00
Gabriel Detraz
17d2c81df0 Merge branch 'chsh' into 'master' 
Ajout d'une commande chsh

See merge request nounous/re2o!1
 2018-03-22 01:57:19 +01:00
Krokmou
57833142eb Ajout d'une commande chsh 2018-03-22 01:38:16 +01:00
Mikachu
beb7c48c56 on envoie les mails par dÃfaut à @example.com 2018-03-21 22:58:31 +01:00
moamoak
942a3e3cbd Merge branch 'fix_migration' into 'master' 
fixe la migration de preferences

See merge request federez/re2o!102
 2018-03-20 20:22:12 +01:00
Hugo Levy--Falk
b052e97663 fixe la migration de preferences 2018-03-20 20:07:57 +01:00
grisel-davy
7f58182b04 Le bouton est maintenant en vert, moins confusant. 2018-03-20 17:28:31 +01:00
Gabriel Detraz
d793da4372 Affiche le solde meme si pas de recharchement online 2018-03-19 02:13:53 +01:00
Gabriel Detraz
1c8415ac20 Merge migrations 2018-03-19 01:56:34 +01:00
klafyvel
c41675aba1 Merge branch 'fix_divers' into 'master' 
Fix divers

See merge request federez/re2o!101
 2018-03-18 12:41:08 +01:00
chirac
b6247674da Merge branch 'fix_payment_field_requirements' into 'master' 
Les champs d'identification pour le paiement ne sont requis que lorsque le moyen de paiement est sélectionné.

See merge request federez/re2o!100
 2018-03-18 11:47:25 +01:00
Hugo LEVY-FALK
53ea7e08bb Les champs d'identification pour le paiement ne sont requis que lorsque le moyen de paiement est activé. 2018-03-18 10:10:56 +01:00
Gabriel Detraz
377670a656 Fix description obligatoire 2018-03-18 02:16:09 +01:00
Gabriel Detraz
d9c68e0978 Fix bug affichage club dans la recherche 2018-03-18 01:52:01 +01:00
chirac
8ce44ee2af Merge branch 'moamoak/new_api' into 'master' 
API app

See merge request federez/re2o!99
 2018-03-18 00:59:08 +01:00
chirac
1fe2601d78 Merge branch 'new_user_page' into 'master' 
New user page

See merge request federez/re2o!95
 2018-03-18 00:57:26 +01:00
Hugo LEVY-FALK
b2eb23353a Tableau responsive dans la page user 2018-03-18 00:09:57 +01:00
Hugo LEVY-FALK
f70a16877d Icônes partout. 2018-03-18 00:00:47 +01:00
Hugo LEVY-FALK
f4a7fb7dfc Homogénéisation des boutons. 2018-03-17 23:52:01 +01:00
Hugo LEVY-FALK
9e79b117b2 La totalitée des barres déclenche l'affichage. 2018-03-17 22:33:21 +01:00