Commit graph

97 commits

Author SHA1 Message Date
EoleDev
d3fc2ab36c Merge branch 'Eole' into develop
Conflicts:
	client/js/controllers/home/home.js
2016-03-23 14:43:27 +01:00
root
a26989103d Merge branch 'develop' of https://github.com/manzerbredes/istic-openstack into develop 2016-03-23 11:31:51 +01:00
root
1342db6028 insertion des commentaires 2016-03-23 11:22:12 +01:00
stupidon
58f772e69c syntax correction 2016-03-22 17:13:08 +01:00
stupidon
7a61955d85 indentation and comments 2016-03-22 17:05:39 +01:00
stupidon
3372268aa1 completed error management and all functions of Compute module 2016-03-22 16:55:59 +01:00
Yoggzo
1fa4dcbab6 correct error in error management ! 2016-03-21 10:19:26 +01:00
Yoggzo
700a849da8 add other exceptions management and correct syntax on exception mangement 2016-03-20 10:41:58 +01:00
root
f9643dd9ff Time maagement on token 2016-03-19 12:49:07 +01:00
Yoggzo
fe0eb3a9e2 add exception management, correct mistakes in error management in Image.php and add function to simplify parameters using in tests 2016-03-17 11:34:56 +01:00
Yoggzo
e01936a73e add commentaries, update error management and correct some mistakes in Image.php, resolve conflict in AppTestClass.php 2016-03-17 09:46:32 +01:00
EoleDev
11dc33c440 Error / Conflict Correction 2016-03-15 23:45:19 +01:00
EoleDev
85b5ebaa18 Merge branch 'Eole' into develop 2016-03-15 23:08:55 +01:00
stupidon
b50d3cc788 Merge branch 'compute' into develop 2016-03-15 22:39:50 +01:00
stupidon
b8e08062f3 defined rest of the server functions 2016-03-15 22:39:05 +01:00
stupidon
3c1ac3a13d Merge branch 'compute' into develop 2016-03-15 22:04:31 +01:00
stupidon
3da0e2d81c opencloud changes 2016-03-15 22:04:03 +01:00
EoleDev
2b8decb81f Maj Library 2016-03-09 16:17:33 +01:00
Othmane Kabir
20f8eb41d3 commit finale 2016-03-09 16:13:20 +01:00
EoleDev
1d3ed3af6d Merge branch 'Evan' into develop 2016-03-09 15:37:42 +01:00
Yoggzo
aee0bda9d4 correct errors 2016-03-09 15:39:43 +01:00
Yoggzo
5c6f6c97b7 solve syntax error 2016-03-09 15:26:01 +01:00
root
c8d1eeda92 MAJ Library 2016-03-09 15:21:46 +01:00
EoleDev
a706b0d565 Debut revoke 2016-03-09 14:53:48 +01:00
Yoggzo
73c33feded modifs on Image constructor 2016-03-09 14:35:08 +01:00
Yoggzo
78a4f8574f modif in image constructor 2016-03-09 14:31:14 +01:00
root
a51bcad21a terminaison des fonctions 2016-03-08 00:26:20 +01:00
stupidon
eb37fe6b48 syntax correction 2016-03-06 13:50:17 +01:00
stupidon
dad2e1de33 corrected syntax errors 2016-03-05 14:12:27 +01:00
stupidon
c43e532f76 added createServer and corrected certain minor bugs 2016-03-05 14:05:52 +01:00
stupidon
f4e59ee82c - added more details in the listServers, listImages, listFlavors functions
- updated all functions to provide basic error-handling
- defined updateServer and deleteServer
2016-03-05 13:58:52 +01:00
manzerbredes
dde482df64 Correct conflicts 2016-03-02 21:03:25 +01:00
Yoggzo
0298591cee Architecture modification 2016-03-02 16:00:46 +01:00
root
dac5c28a67 Merge branch 'develop' of https://github.com/manzerbredes/istic-openstack into othmane 2016-03-02 15:11:56 +01:00
root
70fcf3553a ajout des fonctions 2016-03-02 01:34:10 +01:00
stupidon
603645dbeb fetch ram and disk for server's flavor in listServers 2016-03-01 20:02:27 +01:00
stupidon
3c1fe7e6dc added disksize and ram to listServers 2016-03-01 18:52:29 +01:00
stupidon
f551dffd8a compute listServers fix 2016-03-01 16:53:23 +01:00
stupidon
efbd08263c Merge branch 'compute' into develop 2016-03-01 16:30:20 +01:00
stupidon
53c507194d further fix for 2-dimensional array output 2016-03-01 16:29:49 +01:00
stupidon
fa3f85f7f9 Merge branch 'compute' into develop 2016-03-01 16:12:44 +01:00
stupidon
dfd0566a9d minor correction in list output format 2016-03-01 16:12:19 +01:00
stupidon
76e748ab70 Merge branch 'compute' into develop 2016-03-01 13:20:11 +01:00
stupidon
3bf50ae06f fixed syntax error 2016-03-01 13:19:39 +01:00
stupidon
928da5c124 Merge branch 'compute' into develop 2016-02-29 16:59:53 +01:00
stupidon
2d0a01358d fixed list function output format 2016-02-29 16:59:27 +01:00
Yoggzo
1af80a481f Add error management 2016-02-29 15:30:42 +01:00
Yoggzo
6ce1bbc7be Add error management 2016-02-29 15:29:30 +01:00
EoleDev
0ab3116656 Error Correction on Token Save 2016-02-28 22:54:51 +01:00
stupidon
d3ad74297d Merge branch 'compute' into develop 2016-02-28 21:23:53 +01:00