8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-18 01:13:12 +00:00
Commit graph

2257 commits

Author SHA1 Message Date
chirac
8deb2b9c9e Merge branch 'patch-1' into 'master'
Pas besoin de pip3

See merge request federez/re2o!51
2017-12-17 16:33:34 +01:00
chirac
a3d42fe553 Update .gitlab-ci.yml 2017-12-17 16:31:21 +01:00
chirac
0f97de12a5 Merge branch 'patch-1' into 'master'
Fix bug, utiliser apt pour pylint-django

See merge request federez/re2o!50
2017-12-17 16:25:10 +01:00
chirac
7652376a2f Fix bug, utiliser apt pour pylint-django 2017-12-17 16:21:39 +01:00
Maël Kervella
4c42f72f98 LDAP: refresh group when edit user (Fix #62) 2017-12-17 03:03:55 +00:00
Gabriel Detraz
00cf95423e Possibilité d'afficher un message global 2017-12-16 04:03:23 +01:00
chirac
1bb1c9f490 Merge branch 'add_button_switch' into 'master'
Added a button to navigate between the list of a switch's ports and edition forms, issue #50.

See merge request federez/re2o!46
2017-12-15 03:03:29 +01:00
Laouen Fernet
7ccd7f1c0e Added a button to navigate between the list of a switch's ports and edition forms, issue #50. 2017-12-15 01:54:27 +01:00
chirac
38e096b5df Merge branch 'affichage_chbre' into 'master'
Affichage de la chambre dans les logs radius + fix evaluation str en python2 pour freeradius

See merge request federez/re2o!44
2017-12-09 04:16:21 +01:00
Gabriel Detraz
3ed1d7d074 Affichage de la chambre dans les logs radius + fix evaluation str en python2 pour freeradius 2017-12-09 04:12:22 +01:00
moamoak
b4187a80c0 Merge branch 'fix_cookie' into 'master'
fix issue #59

Closes #59

See merge request federez/re2o!43
2017-12-09 00:44:25 +01:00
matthieu
dd787fac73 modification d'indentation pour le fix cookie issue #59 2017-12-09 00:38:46 +01:00
MICHELET matthieu
781b6ceeaf fix issue #59 2017-12-08 22:27:08 +01:00
chirac
0dca51bed3 Merge branch 'stack_radius' into 'master'
Added Juniper Stacks support and optimized auth.py

See merge request federez/re2o!42
2017-12-03 19:56:26 +01:00
Thibault de BOUTRAY
18551186b5 Added Juniper Stacks support and optimized auth.py 2017-12-03 19:46:44 +01:00
chirac
4ee149bd48 Merge branch 'asso_users' into 'master'
Asso users

See merge request federez/re2o!41
2017-11-24 19:43:26 +01:00
Gabriel Detraz
57f74f380a Fonction can_create sur un user 2017-11-21 05:47:24 +01:00
Gabriel Detraz
772fdcaa1b Acl gérées cotée models, can_edit et can_view (vers les acl django...) 2017-11-21 05:25:05 +01:00
Gabriel Detraz
394ada93e5 Ajoute le support des membres et admin clubs 2017-11-20 04:41:59 +01:00
klafyvel
0dfc4b54e6 Merge branch 'fix_federez_wifi' into 'master'
Doc + si nas-innconnu, on traite quand même la requète

See merge request federez/re2o!40
2017-11-19 21:24:01 +01:00
Gabriel Detraz
c2d7403157 Fix variable nas_type 2017-11-19 20:18:23 +00:00
Gabriel Detraz
b22cda435b Doc + si nas-innconnu, on traite quand même la requète 2017-11-19 20:10:27 +00:00
moamoak
ef2ddf11de Merge branch 'fix_typo_service' into 'master'
Fix typo sur les services

See merge request federez/re2o!39
2017-11-17 19:43:06 +01:00
Gabriel Detraz
8b508b2c43 Fix typo sur les services 2017-11-17 18:23:42 +01:00
chirac
e177d91103 Merge branch 'srv' into 'master'
Srv

See merge request federez/re2o!38
2017-11-16 08:30:04 +01:00
root
6b806b9fcc Merge branch 'srv' of https://gitlab.federez.net/federez/re2o into srv 2017-11-16 08:23:28 +01:00
Gabriel Detraz
01b5e059ad Some text 2017-11-16 08:23:09 +01:00
58ba596093 Merge branch 'srv' into 'master'
Fix #52

Closes #52

See merge request federez/re2o!37
2017-11-16 03:42:49 +01:00
lhark
cbfc1d42e8 Fix typo in description 2017-11-15 21:36:05 -05:00
Gabriel Detraz
cabeb78d1d Typo + val par default priority et poids 2017-11-16 02:53:24 +01:00
Gabriel Detraz
7938bb7a26 Fix regeneration service dns 2017-11-16 02:46:00 +01:00
Gabriel Detraz
dfdecf54ca Fix #52 2017-11-16 02:34:57 +01:00
moamoak
5f7f1fd8c0 Merge branch 'fix_txt' into 'master'
Fix bug sur l'edition du txt + élargi le champ pour dnssec

See merge request federez/re2o!35
2017-11-15 15:45:42 +01:00
Gabriel Detraz
f903138ff9 Text devient Txt 2017-11-15 15:17:44 +01:00
chirac
3e50b02b8a Merge branch 'fix_reverse_url' into 'master'
Fix #51 : reverse url.

Closes #51

See merge request federez/re2o!36
2017-11-15 15:06:22 +01:00
LEVY-FALK Hugo
5758523e12 Fix #51 : reverse url. 2017-11-15 11:37:10 +01:00
Gabriel Detraz
6077a773b5 Fix bug sur l'edition du txt + élargi le champ pour dnssec 2017-11-15 03:07:00 +01:00
chirac
8904cc148d Merge branch 'add_paginator' into 'master'
Fix #28 : ajouter paginator en bas de page

Closes #28

See merge request federez/re2o!34
2017-11-14 22:46:14 +01:00
FERNET Laouen
2b5a9f7cc1 Fix #28 : ajouter paginator en bas de page 2017-11-14 22:23:39 +01:00
chirac
2ff7e916a5 Merge branch 'rename_invoice_pdf_file' into 'master'
Fix #48 : Rename invoice PDF file

Closes #48

See merge request federez/re2o!33
2017-11-14 20:29:47 +01:00
LEVY-FALK Hugo
d3b0e14ba9 Fix #48 : Rename invoice PDF file 2017-11-14 20:00:24 +01:00
chirac
66dec02f59 Merge branch 'reverse_url' into 'master'
Utilisation d'URL dynamiques

See merge request federez/re2o!31
2017-11-14 18:03:01 +01:00
chirac
42a081bd2a Merge branch 'deprecated_font_html_tag' into 'master'
Fix #15 Deprecated font HTML tag

Closes #15

See merge request federez/re2o!32
2017-11-14 17:59:35 +01:00
LEVY-FALK Hugo
1d6e26c078 Missed aff_club.html 2017-11-14 16:11:08 +01:00
LEVY-FALK Hugo
86b3b5ddcd Fix #15 Deprecated font HTML tag 2017-11-14 15:48:17 +01:00
LEVY-FALK Hugo
1f293e99d7 Merge branch 'master' into reverse_url 2017-11-14 15:10:37 +01:00
chirac
8750117855 Merge branch 'ci-lint' into 'master'
Add gitlab-ci support and pylint

See merge request federez/re2o!30
2017-11-13 20:11:09 +01:00
Hugo Hervieux
2528d16c3f Add gitlab-ci support and pylint 2017-11-12 14:18:54 +01:00
Gabriel Detraz
70f5d55667 Fix bug, empèche le crash de freeradius si login non ascii 2017-11-11 18:08:47 +00:00
Gabriel Detraz
cd7fab5edf Tribute MoaMoak 2017-11-09 01:56:15 +01:00