loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'loic-image-edition' into loic

Browse source
This commit is contained in:
Loic GUEGAN 2016-04-27 17:03:29 +02:00
commit 9a93133272
7 changed files with 135 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/index.html
View file

@ -26,6 +26,7 @@
<div ng-include="'./partials/home/machineDetails.html'"></div>
<div ng-include="'./partials/loading.html'"></div>
<div ng-include="'./partials/image/upload.html'"></div>
<div ng-include="'./partials/image/edit.html'"></div>
<!-- MAIN GRID -->
@ -95,6 +96,8 @@
<script src="./js/controllers/network/network.js"></script>
<script src="./js/controllers/image/image.js"></script>
<script src="./js/controllers/image/upload.js"></script>
<script src="./js/controllers/image/edit.js"></script>
<!-- Includes and dependencies for jointJS -->