chirac
b940dfbff3
Merge branch 'datepicker' into 'master'
...
Datepicker
See merge request federez/re2o!160
2018-05-13 21:03:13 +02:00
5757a1e911
Avec le name ça marche mieux
2018-05-13 17:54:48 +02:00
Hugo LEVY-FALK
838c5999b1
Suppression de bootstrap qui sert à rien du coup
2018-05-13 17:54:48 +02:00
Hugo LEVY-FALK
de75e7bb27
Utilisation du packet debian pour bootstrap
2018-05-13 17:54:48 +02:00
dc999b80b5
Utilisation du paquet Debian pour le js
2018-05-13 17:54:48 +02:00
39e96bc53d
Datetimepicker pour les bans et whitelists
2018-05-13 17:54:48 +02:00
root
c693f9f5ba
Création du widget datetimeinput
2018-05-13 17:54:18 +02:00
Gabriel Detraz
b2d57ec827
Refactor de la fonction gen_graph + graph quand modification des objets
2018-05-11 23:18:25 +02:00
Gabriel Detraz
c62a1ac30e
Merge branch 'master' into graph_topo
2018-05-11 19:27:27 +02:00
Gabriel Detraz
e690292e77
Merge branch 'master' into graph_topo
2018-05-11 18:54:28 +02:00
Gabriel Detraz
a975efd7ff
Remaniement du code make_machine_graph
2018-05-11 18:53:10 +02:00
chirac
d27d670571
Merge branch 'validation' into 'master'
...
Fix #100 : validation des factures plus explicite
Closes #100
See merge request federez/re2o!158
2018-05-10 22:33:19 +02:00
lebouder
f88597967d
Fix #100 : validation des factures plus explicite
2018-05-10 22:28:27 +02:00
chirac
e064db626d
Merge branch 'Fix_116' into 'master'
...
Fix #116 : Remove default SOA in Extension & Force reversion context
Closes #116
See merge request federez/re2o!147
2018-05-10 21:51:26 +02:00
chirac
add24d5c7d
Merge branch 'moamoak/js_shortcuts' into 'master'
...
Add CTRL+K and CTRL+L shortcuts
See merge request federez/re2o!156
2018-05-10 12:14:20 +02:00
Maël Kervella
60337ee203
Add CTRL+K and CTRL+L shortcuts
2018-05-09 15:03:15 +00:00
moamoak
05bc645a65
Merge branch 'fix_121_prettier_ACL_decorators' into 'master'
...
Fix #121 prettier acl decorators
Closes #121
See merge request federez/re2o!155
2018-05-07 22:50:23 +02:00
Hugo LEVY-FALK
5c254fa026
factorise les can_view_app
2018-05-07 22:01:32 +02:00
Hugo LEVY-FALK
664fb7ae00
Utilisation de inutile.
2018-05-07 20:24:04 +02:00
Hugo LEVY-FALK
b1ac9fffbb
PEP 8 pour preferences/views.py
2018-05-07 20:03:12 +02:00
Hugo LEVY-FALK
a61d8d6ebd
Factorisation des décorateurs ACL dans les vues. Fix #121
2018-05-07 19:43:53 +02:00
Hugo LEVY-FALK
f7d7a41586
Autorise plusieurs apps dans can_view_app
2018-05-07 19:33:06 +02:00
Hugo LEVY-FALK
84a901e3fc
Documentation des décorateurs d'ACL
2018-05-07 18:57:08 +02:00
Hugo LEVY-FALK
586321fd8a
Un seul décorateur pour les gouverner (presque) tous.
2018-05-07 17:22:00 +02:00
chirac
1955229842
Merge branch 'Fix_111_properly' into 'master'
...
Fix #111 properly
Closes #111
See merge request federez/re2o!154
2018-05-05 16:06:31 +02:00
Maël Kervella
8c2b2ca8df
Fix #111 properly
2018-05-03 12:57:43 +00:00
chirac
dcd1e2af96
Merge branch 'fix_110_display_superuser' into 'master'
...
Fix #110 display superuser
Closes #110
See merge request federez/re2o!150
2018-05-03 14:42:44 +02:00
Hugo LEVY-FALK
a5013920da
ACL
2018-05-03 14:22:52 +02:00
Hugo LEVY-FALK
9d79ffb5ca
Plus de BÔTÉ dans l'affichage des superusers
2018-05-03 14:08:05 +02:00
chirac
34d29349ed
Merge branch 'paginateur' into 'master'
...
Fixe #111 : Supression du paginateur si page unique
See merge request federez/re2o!151
2018-05-03 13:49:39 +02:00
grisel-davy
5575995437
Fixe #111 : Supression du paginateur si page unique
2018-05-03 13:45:13 +02:00
Hugo LEVY-FALK
8a19977757
Ne réinvente pas la roue
2018-05-03 11:55:34 +02:00
klafyvel
f62178bebb
Merge branch 'fix_ns' into 'master'
...
Fix #119 : Plusieurs NS peuvent avoir le meme origin
Closes #119
See merge request federez/re2o!149
2018-05-03 11:00:43 +02:00
Hugo LEVY-FALK
4a5fd06ace
Ajout de superusers
2018-05-03 10:56:21 +02:00
Hugo LEVY-FALK
6f3fc983ac
Suppression de superuser
2018-05-03 10:26:17 +02:00
chirac
94cea4e7c3
Merge branch 'fix_#114' into 'master'
...
Fix #114 : Take locale datetime formats into account in help text
Closes #114
See merge request federez/re2o!144
2018-05-03 06:47:37 +02:00
Gabriel Detraz
28393797e4
Et la migration
2018-05-03 06:42:59 +02:00
Gabriel Detraz
d8270f8073
Fix #119 : Plusieurs NS peuvent avoir le meme origin
2018-05-03 06:40:36 +02:00
chirac
cae97a385d
Merge branch 'fixe_comment' into 'master'
...
Ajout du champ comment dans le ServiceUserForm
See merge request federez/re2o!148
2018-05-02 21:16:56 +02:00
grisel-davy
acd8fff2ca
Ajout du champ comment dans le ServiceUserForm
2018-05-02 21:10:28 +02:00
chirac
c2facd8a27
Merge branch 'Fix_112' into 'master'
...
Fix #112 : Switch representation is only displayed on switch details
Closes #112
See merge request federez/re2o!146
2018-05-02 07:05:28 +02:00
grisel-davy
f7a74d3576
détection de la modification des objects du graph
2018-05-01 12:09:59 +02:00
Maël Kervella
5eaa9a2feb
Fix #116 : Remove default SOA in Extension & Force reversion context
...
- The default for extension SOA is now None, else a new SOA named `SOA
to edit` was created when adding a new extension (because of the
get_or_create() )
- The mixins are now inside a reversion context else sometimes the
reversion context was not set and re2o would crash on the set_comment
2018-04-29 16:34:05 +00:00
Maël Kervella
c8b2f95cb9
Fix #112 : Switch representation is only displayed on switch details
...
- The nice switch representation is only displayes on the swithc details
page and not on any other page using the `topologie/aff_port.html` (like
the search)
- Use acl to display links or not on the switch detail page
2018-04-29 15:41:55 +00:00
Maël Kervella
ef91a1047a
Add migrations for the fix
2018-04-26 18:21:48 +00:00
Maël Kervella
090c838381
Take locale datetime formats into account in help text
2018-04-26 13:08:04 +00:00
moamoak
52a35e523d
Merge branch 'fix_radius' into 'master'
...
Fix freeradius compatibility.
See merge request federez/re2o!143
2018-04-26 10:45:58 +02:00
Hugo LEVY-FALK
0cbd39cc0d
Fix freeradius compatibility.
2018-04-26 09:19:32 +02:00
grisel-davy
4f4d10b799
ajout des serveurs sur le graph
2018-04-25 20:28:56 +02:00
Gabriel Detraz
9f153c49d8
Ca me broute donc je fais simple
2018-04-25 18:39:13 +02:00
