mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-04 17:06:27 +00:00
Merge branch 'fix_127' into 'master'
Fix #127 and remove duplicate migration Closes #127 See merge request federez/re2o!165
This commit is contained in:
commit
f439da2872
3 changed files with 14 additions and 21 deletions
13
CHANGELOG.md
13
CHANGELOG.md
|
@ -22,6 +22,19 @@ rm static/css/jquery-ui-timepicker-addon.css
|
|||
```
|
||||
|
||||
|
||||
## MR 159: Graph topo & MR 164: branche de création de graph
|
||||
|
||||
Add a graph of the network topology
|
||||
Install *graphviz*:
|
||||
```
|
||||
apt-get -y install graphviz
|
||||
```
|
||||
Create the *media/images* directory:
|
||||
```
|
||||
mkdir -p media/images
|
||||
```
|
||||
|
||||
|
||||
## MR 163: Fix install re2o
|
||||
|
||||
Refactored install_re2o.sh script.
|
||||
|
|
|
@ -14,3 +14,4 @@ libjs-jquery
|
|||
libjs-jquery-ui
|
||||
libjs-jquery-timepicker
|
||||
libjs-bootstrap
|
||||
graphviz
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.10.7 on 2018-05-15 18:34
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('machines', '0080_auto_20180502_2334'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='extension',
|
||||
name='soa',
|
||||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='machines.SOA'),
|
||||
),
|
||||
]
|
Loading…
Reference in a new issue