chirac
1ff94d2385
Merge branch 'mergeupstream' into 'master'
...
Mergeupstream
See merge request federez/re2o!103
2018-03-22 18:39:08 +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
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
Hugo LEVY-FALK
4924dc50b4
Pas de boutons redondants.
2018-03-17 22:33:21 +01:00
Hugo LEVY-FALK
da0e2a3e96
WIP : boutons dans les dropdowns.
2018-03-17 22:33:21 +01:00
Hugo LEVY-FALK
8a3adcc99b
Couleurs dans les informations.
2018-03-17 22:33:21 +01:00
Hugo LEVY-FALK
3f8814edd8
Menu en accordéon.
2018-03-17 22:33:21 +01:00
root
e1f002b09a
pip c'est la vie, mais askip ça plaît pas.
2018-03-17 22:27:43 +01:00
Hugo LEVY-FALK
49da8ee0bf
On a besoin de pycrypto.
2018-03-17 22:27:43 +01:00
Maël Kervella
e97e304145
API: Add support for DNS
2018-03-17 18:59:10 +00:00
Maël Kervella
ef6b62439b
API: Add support for firewall
2018-03-17 18:59:10 +00:00
Maël Kervella
7028788cf2
API: Add support for DHCP
2018-03-17 18:59:10 +00:00
Maël Kervella
a86369e7c8
API: Add support for mailings
2018-03-17 18:56:08 +00:00
Maël Kervella
ee3f4fb598
API: Generic services views
2018-03-17 18:56:08 +00:00
Maël Kervella
d509643dfe
API: Useful functions
...
JSONResponse, JSONSuccess and JSONError are for building answers
accept_method is a decorator to check if the method to access the view
is accepted
2018-03-17 18:56:06 +00:00
Maël Kervella
b4fcadaecf
API: Create the API app
2018-03-17 18:56:01 +00:00
moamoak
a03a92070e
Merge branch 'matthieu_acl_fix' into 'master'
...
Fix #79
Closes #79
See merge request federez/re2o!98
2018-03-08 18:51:45 +01:00
matthieu Michelet
2e9de93a86
edit placement
2018-03-08 18:43:27 +01:00
matthieu Michelet
29779b3f1b
Mis à jour de la methode is_admin pour prendre en compte la présence de l'user dans le groupe admin. issue #79
2018-03-08 18:25:53 +01:00
klafyvel
26e87451a1
Merge branch 'navbar' into 'master'
...
Passage à fontawesome
See merge request federez/re2o!96
2018-03-08 08:20:39 +01:00
e6bf3a6558
Piggy bank
2018-03-08 08:10:50 +01:00
klafyvel
ab79b2c919
Merge branch 'moamoak/mailing_API' into 'master'
...
Improve the API for multiple mailings
See merge request federez/re2o!94
2018-03-07 18:19:55 +01:00
Maël Kervella
8c2f634901
REST : Add API for mailing for club and other
...
Access /users/rest/ml/std/
for list of standard mailings
Access /users/rest/ml/std/member/<ml_name>/
for list of members of specific standard mailing
Access /users/rest/ml/club/
for list of club mailings
Access /users/rest/ml/club/member/<ml_name>/
for list of members of specific club mailing
Access /users/rest/ml/club/admin/<ml_name>/
for list of admins of specific club mailing
2018-03-07 16:04:43 +00:00
Maël Kervella
377447d23b
Club : Add option to specify if a mailing should be generated for
2018-03-07 16:04:22 +00:00
8cd7ed1a54
Modification de la navbar et passage sous font awesome
2018-03-07 11:45:03 +01:00
klafyvel
082f684781
Merge branch 'better_dropdown' into 'master'
...
Better selection of user while editing interface
Closes #73
See merge request federez/re2o!93
2018-03-06 17:45:02 +01:00
Maël Kervella
ac75bba842
Machines : Remove old form
2018-03-06 16:34:17 +00:00
matthieu Michelet
97f1d927b3
Chirac est un con
2018-03-06 17:33:48 +01:00
klafyvel
3a3960bf9d
Merge branch 'remove_cookie_banner' into 'master'
...
Remove cookie banner
Closes #75
See merge request federez/re2o!92
2018-03-06 17:17:23 +01:00
klafyvel
d7be9e9083
Merge branch 'fix_mailing' into 'master'
...
Fix : Droit machines.serveur pour l'API des mailings
See merge request federez/re2o!89
2018-03-06 17:16:30 +01:00
Maël Kervella
d9a2c1e72d
Machines : dropdown in edit_interface form
...
Replace the dropdown for the field user in the edit_interface HTML form
with a massive_bootstrap_form.
Related to https://gitlab.federez.net/federez/re2o/issues/73
2018-03-06 16:06:44 +00:00
496a7ab6a0
Ajout du bouton navbar
2018-03-06 17:04:57 +01:00
