chirac
|
2e97af4aba
|
Merge branch 'fingerprintssh' into 'master'
Fingerprintssh
See merge request federez/re2o!193
|
2018-07-29 21:29:26 +02:00 |
|
Maël Kervella
|
e2c0271bf2
|
Use the record label as for other DNS records
|
2018-07-29 19:19:08 +00:00 |
|
Gabriel Detraz
|
562d116c29
|
Renomme 88 en 85
|
2018-07-29 19:19:08 +00:00 |
|
Gabriel Detraz
|
9b6d00ceeb
|
Fix entrée en double
|
2018-07-29 19:19:08 +00:00 |
|
Gabriel Detraz
|
86d80521c0
|
Exposition des sshfpr via api rest
|
2018-07-29 19:19:08 +00:00 |
|
Gabriel Detraz
|
fe50f23ea1
|
Calcul des hash; simplification et migration pour sshfpr
|
2018-07-29 19:19:08 +00:00 |
|
Gabriel Detraz
|
ce0b67209f
|
Les algo sont fixés par RFC; simplification
|
2018-07-29 19:19:08 +00:00 |
|
Gabriel Detraz
|
eac4933853
|
Application des migrations dans le bon ordre
|
2018-07-29 19:19:08 +00:00 |
|
Maël Kervella
|
5dce3629b7
|
translation and cleanup
|
2018-07-29 19:15:29 +00:00 |
|
chirac
|
352a416647
|
Precision, clef ssh pub et pas hash stocké
|
2018-07-29 19:15:28 +00:00 |
|
Grizzly
|
7ccc93cf4c
|
mise en page pour les longues fingerpint ssh
|
2018-07-29 19:15:28 +00:00 |
|
chirac
|
e9f4767709
|
Gestion complete des algo de fingerprintssh
|
2018-07-29 19:15:28 +00:00 |
|
chirac
|
0b4c52a49a
|
Ajout des modèles sshfingerprint et sshfingerprintalgo
|
2018-07-29 19:15:28 +00:00 |
|
chirac
|
e5781f1416
|
Merge branch 'Dname' into 'master'
Fix history et i18n
See merge request federez/re2o!207
|
2018-07-29 20:16:42 +02:00 |
|
Gabriel Detraz
|
4d93c6db6a
|
Fix history et i18n
|
2018-07-29 20:13:10 +02:00 |
|
chirac
|
feddc3f69b
|
Conflicts fix switch_conf_json
# Conflicts:
# re2o/templatetags/acl.py
# re2o/views.py
# topologie/templates/topologie/aff_port.html
|
2018-07-29 20:02:20 +02:00 |
|
chirac
|
12b6f74a13
|
Merge branch 'Dname' into 'master'
Dname
See merge request federez/re2o!192
|
2018-07-29 17:25:11 +02:00 |
|
chirac
|
4e9b0586ed
|
Update models.py alignement
|
2018-07-29 16:45:12 +02:00 |
|
chirac
|
95dc427dc4
|
Merge branch 'master' into 'Dname'
# Conflicts:
# re2o/templatetags/acl.py
|
2018-07-29 13:57:53 +02:00 |
|
chirac
|
c977eccafd
|
Update aff_dname.html
|
2018-07-29 13:56:19 +02:00 |
|
chirac
|
9be8ca1cf4
|
Merge branch 'easier_acl' into 'master'
Fix acl.py lower
See merge request federez/re2o!206
|
2018-07-28 23:16:56 +02:00 |
|
chirac
|
53079c0a9e
|
Fix acl.py lower
|
2018-07-28 23:13:51 +02:00 |
|
chirac
|
ac7c847354
|
Merge branch 'easier_acl' into 'master'
Suppression du dictionnaire dans re2o/templatetags/acl.py
See merge request federez/re2o!205
|
2018-07-28 19:37:00 +02:00 |
|
Hugo LEVY-FALK
|
b5513db8ae
|
Suppression du dictionnaire de mort dans re2o/templatetags/acl.py
|
2018-07-26 20:11:13 +02:00 |
|
Maël Kervella
|
1336b096a7
|
Fix link for membership
|
2018-07-25 18:57:28 +00:00 |
|
Maël Kervella
|
939d5326aa
|
Fix if-else
|
2018-07-25 18:46:48 +00:00 |
|
Maël Kervella
|
74086539c0
|
translation
|
2018-07-25 18:43:28 +00:00 |
|
Maël Kervella
|
45676ef669
|
Fix indentation and missing div
|
2018-07-25 18:28:13 +00:00 |
|
chirac
|
af35507c6d
|
Merge branch 'new_profil' into 'master'
New profil
See merge request federez/re2o!197
|
2018-07-24 22:39:04 +02:00 |
|
chirac
|
55ebc4c166
|
Merge branch 'Fix_mr_190' into 'master'
Fix ticks
See merge request federez/re2o!202
|
2018-07-24 12:01:55 +02:00 |
|
Maël Kervella
|
4bd0be94ed
|
Translate to english
|
2018-07-23 22:04:21 +00:00 |
|
Gabriel Detraz
|
7631ea6c5f
|
Correct credit for dname
|
2018-07-23 21:49:27 +00:00 |
|
Charlie Jacomme
|
342b7c1173
|
serializers pour dnames
|
2018-07-23 21:49:27 +00:00 |
|
Charlie Jacomme
|
a5988e29b8
|
migrations for dname
|
2018-07-23 21:49:27 +00:00 |
|
Charlie Jacomme
|
fc176a60c1
|
New DNAME model
|
2018-07-23 21:49:26 +00:00 |
|
Maël Kervella
|
a854174954
|
Fix shit
|
2018-07-23 21:41:30 +00:00 |
|
chirac
|
41cd115f51
|
Merge branch 'ticks' into 'master'
Fix #143
Closes #143
See merge request federez/re2o!190
|
2018-07-23 23:12:54 +02:00 |
|
moamoak
|
7457d840aa
|
Merge branch 'python_legacy' into 'master'
Legacy shaebang pour python2
See merge request federez/re2o!195
|
2018-07-23 19:57:04 +02:00 |
|
Hugo LEVY-FALK
|
cf1057b717
|
utilisation du filtre tick partout où des booléens sont affichés.
|
2018-07-23 13:41:17 +00:00 |
|
Grizzly
|
2e1f4fa425
|
deplacement du templatetags et nettoyage du template
|
2018-07-23 13:17:29 +00:00 |
|
Grizzly
|
3777ec0f3a
|
prise en compte des type non booléens
|
2018-07-23 13:17:29 +00:00 |
|
Grizzly
|
b8c50385fc
|
ajout d'un templatetag tick pour afficher les booléens
|
2018-07-23 13:17:29 +00:00 |
|
chirac
|
137b3409c6
|
Update authentication.py
|
2018-07-23 11:05:01 +02:00 |
|
Gabriel Detraz
|
7dcd32cb1e
|
Imports corrects
|
2018-07-23 00:05:59 +02:00 |
|
grisel-davy
|
9321e6b5ed
|
Envoi le la variable d'activation du solde
|
2018-07-23 00:01:01 +02:00 |
|
grisel-davy
|
6b9896143f
|
Prise en compte du bannissement et déployement des des infos si clique dans les titres
|
2018-07-23 00:00:37 +02:00 |
|
grisel-davy
|
c5af76f963
|
Changement des couleurs et prise en ompte de l'activation du solde
|
2018-07-22 23:59:57 +02:00 |
|
Gabriel Detraz
|
96318b7265
|
Legacy shaebang pour python2
|
2018-07-22 22:59:49 +02:00 |
|
chirac
|
a84e8b5575
|
Merge branch 'fix_65_history' into 'master'
fix #65, gestion propre de l'historique.
Closes #65
See merge request federez/re2o!186
|
2018-07-22 22:22:19 +02:00 |
|
Hugo LEVY-FALK
|
c7bf295838
|
i18n sur le title du bouton historique
|
2018-07-22 22:18:31 +02:00 |
|