lhark
|
a8f817ff58
|
Fix indent 2
|
2017-12-18 21:12:57 -05:00 |
|
lhark
|
cc48d0b36a
|
Fix templates indentation
|
2017-12-18 20:58:11 -05:00 |
|
lhark
|
f79fef700e
|
Fix machine template indentation
|
2017-12-18 20:45:48 -05:00 |
|
Gabriel Detraz
|
358d14c01b
|
Merge branch 'messages' into 'master'
Possibilité d'afficher un message global
See merge request federez/re2o!48
|
2017-12-17 16:39:22 +01:00 |
|
Gabriel Detraz
|
71893dd7f1
|
Merge branch 'Fix_62' into 'master'
LDAP: refresh group when edit user (Fix #62)
Closes #62
See merge request federez/re2o!49
|
2017-12-17 16:39:12 +01:00 |
|
Gabriel Detraz
|
78b0175d3d
|
Merge branch 'patch-1' into 'master'
Pas besoin de pip3
See merge request federez/re2o!51
|
2017-12-17 16:33:34 +01:00 |
|
Gabriel Detraz
|
00c2338388
|
Update .gitlab-ci.yml
|
2017-12-17 16:31:21 +01:00 |
|
Gabriel Detraz
|
b3271c3e5f
|
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 |
|
Gabriel Detraz
|
07bf0d3f6b
|
Fix bug, utiliser apt pour pylint-django
|
2017-12-17 16:21:39 +01:00 |
|
Maël Kervella
|
483a5b32cc
|
LDAP: refresh group when edit user (Fix #62)
|
2017-12-17 03:03:55 +00:00 |
|
Gabriel Detraz
|
d70266ed8c
|
Possibilité d'afficher un message global
|
2017-12-16 04:03:23 +01:00 |
|
Gabriel Detraz
|
f911707ffc
|
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
|
6db6f88e5a
|
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 |
|
Gabriel Detraz
|
a5f4ff9375
|
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
|
36ff582d35
|
Affichage de la chambre dans les logs radius + fix evaluation str en python2 pour freeradius
|
2017-12-09 04:12:22 +01:00 |
|
Maël Kervella
|
2f3b874ec3
|
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 Michelet
|
caf4c40ce2
|
modification d'indentation pour le fix cookie issue #59
|
2017-12-09 00:38:46 +01:00 |
|
Matthieu Michelet
|
3f1cca6bfa
|
fix issue #59
|
2017-12-08 22:27:08 +01:00 |
|
Gabriel Detraz
|
3809a415ed
|
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
|
3c5297e81f
|
Added Juniper Stacks support and optimized auth.py
|
2017-12-03 19:46:44 +01:00 |
|
Gabriel Detraz
|
4ac51db31a
|
Merge branch 'asso_users' into 'master'
Asso users
See merge request federez/re2o!41
|
2017-11-24 19:43:26 +01:00 |
|
Gabriel Detraz
|
47059c5f6b
|
Fonction can_create sur un user
|
2017-11-21 05:47:24 +01:00 |
|
Gabriel Detraz
|
5221927717
|
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
|
a02c0791d5
|
Ajoute le support des membres et admin clubs
|
2017-11-20 04:41:59 +01:00 |
|
Hugo LEVY-FALK
|
f10f0dbb2e
|
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
|
43e698e5e1
|
Fix variable nas_type
|
2017-11-19 20:18:23 +00:00 |
|
Gabriel Detraz
|
6bf81d9e98
|
Doc + si nas-innconnu, on traite quand même la requète
|
2017-11-19 20:10:27 +00:00 |
|
Maël Kervella
|
c775d51390
|
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
|
8b5eb25da9
|
Fix typo sur les services
|
2017-11-17 18:23:42 +01:00 |
|
Gabriel Detraz
|
f60ecc56b6
|
Merge branch 'srv' into 'master'
Srv
See merge request federez/re2o!38
|
2017-11-16 08:30:04 +01:00 |
|
root
|
2b0c3d9193
|
Merge branch 'srv' of https://gitlab.federez.net/federez/re2o into srv
|
2017-11-16 08:23:28 +01:00 |
|
Gabriel Detraz
|
1389826ef3
|
Some text
|
2017-11-16 08:23:09 +01:00 |
|
|
|
3e351f87bd
|
Merge branch 'srv' into 'master'
Fix #52
Closes #52
See merge request federez/re2o!37
|
2017-11-16 03:42:49 +01:00 |
|
lhark
|
f278da2290
|
Fix typo in description
|
2017-11-15 21:36:05 -05:00 |
|
Gabriel Detraz
|
136bf24ef1
|
Typo + val par default priority et poids
|
2017-11-16 02:53:24 +01:00 |
|
Gabriel Detraz
|
af6a1acb41
|
Fix regeneration service dns
|
2017-11-16 02:46:00 +01:00 |
|
Gabriel Detraz
|
055249d1cd
|
Fix #52
|
2017-11-16 02:34:57 +01:00 |
|
Maël Kervella
|
2c08510e3d
|
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
|
da06613505
|
Text devient Txt
|
2017-11-15 15:17:44 +01:00 |
|
Gabriel Detraz
|
bbda15e202
|
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 |
|
Hugo LEVY-FALK
|
504ac0d9b3
|
Fix #51 : reverse url.
|
2017-11-15 11:37:10 +01:00 |
|
Gabriel Detraz
|
2d0033e556
|
Fix bug sur l'edition du txt + élargi le champ pour dnssec
|
2017-11-15 03:07:00 +01:00 |
|
Gabriel Detraz
|
b32ac01718
|
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 |
|
Laouen Fernet
|
a61eb851dc
|
Fix #28 : ajouter paginator en bas de page
|
2017-11-14 22:23:39 +01:00 |
|
Gabriel Detraz
|
f4c7d2098f
|
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 |
|
Hugo LEVY-FALK
|
b01872e3e5
|
Fix #48 : Rename invoice PDF file
|
2017-11-14 20:00:24 +01:00 |
|
Gabriel Detraz
|
0c7fe449f6
|
Merge branch 'reverse_url' into 'master'
Utilisation d'URL dynamiques
See merge request federez/re2o!31
|
2017-11-14 18:03:01 +01:00 |
|
Gabriel Detraz
|
f56af23d59
|
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 |
|
Hugo LEVY-FALK
|
6b78419cbc
|
Missed aff_club.html
|
2017-11-14 16:11:08 +01:00 |
|
Hugo LEVY-FALK
|
ffddb00bd0
|
Fix #15 Deprecated font HTML tag
|
2017-11-14 15:48:17 +01:00 |
|
