Eole
|
49b4b20a1e
|
Implementation of graph in final version
|
2016-04-27 16:46:50 +02:00 |
|
Eole
|
49f416dc50
|
Merge branch 'develop' into Eole_Graph
Conflicts:
client/index.html
client/js/controllers/home/home.js
client/partials/home/home.html
|
2016-04-27 16:42:28 +02:00 |
|
Loic GUEGAN
|
1cdc04c5f1
|
Test
|
2016-04-27 16:06:43 +02:00 |
|
Loic GUEGAN
|
ef3054bb8f
|
Correct bug
|
2016-04-27 15:52:58 +02:00 |
|
root
|
c9202d9113
|
Error correction
|
2016-04-27 15:51:38 +02:00 |
|
EoleDev
|
1d42345e07
|
End of comments
|
2016-04-27 14:22:59 +02:00 |
|
Loic GUEGAN
|
a845b20ee9
|
Merge branch 'loic' into loic-image-edition
|
2016-04-26 23:37:10 +02:00 |
|
Loic GUEGAN
|
91b6918ef3
|
Change upload
|
2016-04-26 23:36:33 +02:00 |
|
EoleDev
|
5263cf00a2
|
Refactoring of comments beginning
|
2016-04-26 20:42:31 +02:00 |
|
EoleDev
|
477dc82182
|
Nettoyage
|
2016-04-26 17:35:32 +02:00 |
|
Yoggzo
|
0fc14b5761
|
structure of Automating
|
2016-04-21 23:57:37 +02:00 |
|
Yoggzo
|
7e5b9f3a72
|
add router functions
|
2016-04-21 22:52:00 +02:00 |
|
Yoggzo
|
3f6af0b644
|
modification in structure for ip and routers
|
2016-04-21 21:51:46 +02:00 |
|
Yoggzo
|
94ce37f517
|
end of floatingip
|
2016-04-21 21:31:25 +02:00 |
|
EoleDev
|
20dc35d9ab
|
Error correction automating
|
2016-04-20 09:45:24 +02:00 |
|
Loic GUEGAN
|
a5fb35e17e
|
Merge branch 'loic' into loic-image-edition
|
2016-04-20 09:10:28 +02:00 |
|
Loic GUEGAN
|
7a587387aa
|
Debug
|
2016-04-20 09:10:02 +02:00 |
|
Yoggzo
|
94629aeaf5
|
tentative ip publique
|
2016-04-19 23:57:03 +02:00 |
|
Yoggzo
|
438b9b4dcd
|
Correction de cette putain de classe non testee par othmane
|
2016-04-19 23:16:37 +02:00 |
|
EoleDev
|
49ce03168a
|
Error patch
|
2016-04-19 19:44:09 +02:00 |
|
Yoggzo
|
00184e623e
|
trying floating ip
|
2016-04-19 18:33:21 +02:00 |
|
Yoggzo
|
6a3f770c76
|
add init FloatingIp
|
2016-04-19 18:27:27 +02:00 |
|
Yoggzo
|
3795d05a97
|
trying test floatingip
|
2016-04-19 18:00:37 +02:00 |
|
Yoggzo
|
2d260aa6f5
|
correct syntaxt on Network, add tests for automating
|
2016-04-19 17:17:14 +02:00 |
|
EoleDev
|
71794b98c5
|
Add floating request
|
2016-04-18 20:01:50 +02:00 |
|
EoleDev
|
eb38e10d6f
|
Merge branch 'develop'
|
2016-04-18 19:39:00 +02:00 |
|
Yoggzo
|
e1b15c38d7
|
begining of automating
|
2016-04-18 17:38:25 +02:00 |
|
Yoggzo
|
9e7eb6774b
|
begining of floating ip
|
2016-04-18 17:20:27 +02:00 |
|
Loic GUEGAN
|
5b5f526aa0
|
Correct bug
|
2016-04-18 13:16:50 +02:00 |
|
Loic GUEGAN
|
ae4e028231
|
Add functionnality
|
2016-04-17 20:43:41 +02:00 |
|
Loic GUEGAN
|
a481b727d9
|
Begin ...
|
2016-04-17 20:11:46 +02:00 |
|
Loic GUEGAN
|
bb1598713c
|
Clean code, add comment etc..
|
2016-04-17 18:50:05 +02:00 |
|
Loic GUEGAN
|
968eda48cc
|
Add ';' and correct indent
|
2016-04-17 18:44:29 +02:00 |
|
Loic GUEGAN
|
fdfdd27a35
|
Add ';'
|
2016-04-17 18:43:49 +02:00 |
|
Loic GUEGAN
|
8e700c2b7d
|
Add comments and correct some bugs
|
2016-04-17 18:42:15 +02:00 |
|
Yoggzo
|
aa26e5f959
|
modif upload
|
2016-04-17 11:44:32 +02:00 |
|
Loic GUEGAN
|
21b68f1da1
|
Test
|
2016-04-16 22:06:18 +02:00 |
|
Loic GUEGAN
|
a3ff4d243e
|
Test
|
2016-04-16 19:10:27 +02:00 |
|
EoleDev
|
31d2d0c158
|
Merge branch 'compute'
Conflicts:
server/core/LibOverride/genTokenOptions.php
|
2016-04-14 16:28:25 +02:00 |
|
EoleDev
|
b348dbc226
|
Error correction token management
|
2016-04-14 16:26:09 +02:00 |
|
EoleDev
|
24bb5fefbd
|
Mise a jour et nettoyage depot
|
2016-04-14 16:24:44 +02:00 |
|
EoleDev
|
27730911d8
|
Merge commit '237b627' into develop
|
2016-04-14 15:38:55 +02:00 |
|
manzerbredes
|
396c90f921
|
Test
|
2016-04-05 09:33:07 +02:00 |
|
manzerbredes
|
a7bf9306d3
|
Test
|
2016-04-03 11:15:52 +02:00 |
|
Yoggzo
|
c32933b362
|
debut automatisation
|
2016-03-30 18:30:44 +02:00 |
|
manzerbredes
|
237b627bf6
|
Merge branch 'develop' into loic
|
2016-03-30 14:14:10 +02:00 |
|
root
|
b6ffc16d78
|
Merge branch 'develop' of https://github.com/manzerbredes/istic-openstack into develop
|
2016-03-30 12:42:40 +02:00 |
|
Apache
|
1fdc1a19ce
|
Reactivation Token time management
|
2016-03-30 12:40:30 +02:00 |
|
root
|
750dcc61ce
|
mettre les private pour la classe network coté serveur et mes premières essaie pour angularjs notamement extraction des donnée
|
2016-03-30 12:40:16 +02:00 |
|
Yoggzo
|
957d9c4dcc
|
verif tests image --> OK
|
2016-03-30 12:14:11 +02:00 |
|