8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-10-06 02:52:10 +00:00
Commit graph

928 commits

Author SHA1 Message Date
Hugo LEVY-FALK
d9c172ea13 fix de @can_edit 2018-01-06 17:56:01 +01:00
Maël Kervella
67b519d2fb can_edit pour machines.models 2018-01-06 17:56:01 +01:00
Hugo LEVY-FALK
3ef9035712 Premier jet de décorateur can_edit 2018-01-06 17:56:01 +01:00
Hugo LEVY-FALK
541f630369 Déplacement du décorateur can_create dans re2o/utils.py 2018-01-06 17:56:01 +01:00
Maël Kervella
005497c662 Add can_create to machines.models 2018-01-06 17:56:01 +01:00
Maël Kervella
3f4838436c can_create for Machine 2018-01-06 17:56:01 +01:00
Hugo LEVY-FALK
39ef420c4b Documentation. 2018-01-06 17:56:01 +01:00
Hugo LEVY-FALK
843d78521f can_create avec choix du model 2018-01-06 17:56:01 +01:00
Hugo LEVY-FALK
e8db0f8cf2 décorateur can_create 2018-01-06 17:56:01 +01:00
Maël Kervella
9a9d6041c1 Merge branch 'open_graph' into 'master'
Open graph

See merge request federez/re2o!54
2017-12-23 17:30:04 +01:00
Matthieu Michelet
723e3295e9 Changement de la description dans les données open_graph 2017-12-23 17:20:21 +01:00
Matthieu Michelet
be3f508a00 Utilisation d'un logo Re2o et d'Url local issue #53 2017-12-23 17:20:21 +01:00
Matthieu Michelet
50663784bd NVérification du caractère sécurisé de la requete http/https issue #53 2017-12-23 17:12:13 +01:00
Matthieu Michelet
0383ee7a7b Fix de l'implémenation de open_graph issue #53 2017-12-23 17:12:13 +01:00
Matthieu Michelet
5422c64c02 implementation des données OpenGraph issue #53 2017-12-23 17:12:13 +01:00
Gabriel Detraz
559fe7b2d5 Merge branch 'code-cleanup' into 'master'
Code cleanup

See merge request federez/re2o!52
2017-12-19 15:02:46 +01:00
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