Commit graph

405 commits

Author SHA1 Message Date
Yoggzo
804fa322d8 difficulties with automating 2016-03-27 19:54:38 +02:00
Yoggzo
19d84e2ae4 Update commentaries 2016-03-27 19:40:36 +02:00
Yoggzo
e9c7477ff0 Modifications in error management and correct error in Image.php 2016-03-27 19:24:03 +02:00
Yoggzo
dcf0d8b2ba begining of automating tasks 2016-03-23 15:46:57 +01:00
Yoggzo
db2c1490b3 auth correction in AppTestClass.php 2016-03-23 15:44:06 +01:00
EoleDev
54ec6723de Maj Library 2016-03-23 15:30:47 +01:00
EoleDev
0dc17aa9ef Correction Erreur 2016-03-23 15:13:42 +01:00
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
6e78d76f88 Merge branch 'compute' into develop 2016-03-22 17:15:09 +01:00
stupidon
c37b891909 syntax correction 2016-03-22 17:14:40 +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
manzerbredes
3cef0ea672 Ttest 2016-03-21 06:54:39 +01:00
manzerbredes
3c336f00d2 Add login check witouth reloading page 2016-03-21 06:47:01 +01:00
manzerbredes
3216a69b75 Merge branch 'loic' into develop 2016-03-20 11:24:03 +01:00
manzerbredes
57006dba22 Add login check 2016-03-20 11:23:06 +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
manzerbredes
0ce2b2fa30 Add overlay upload 2016-03-16 18:01:03 +01:00
manzerbredes
f01cfa2ec7 Make image manager 2016-03-16 16:05:24 +01:00
manzerbredes
c8314a0089 Test 2016-03-16 15:38:43 +01:00
manzerbredes
004dc2acdd Test 2016-03-16 15:36:12 +01:00
Apache
c7edd70b5e Bind Click Graph 2016-03-16 15:09:35 +01:00
manzerbredes
6c65d02fbd Merge branch 'develop' into loic 2016-03-16 13:07:21 +01:00
manzerbredes
1061d8c85e Test 2016-03-16 13:07:04 +01:00
Apache
fea574ac18 TestGraph 2016-03-16 12:59:25 +01:00
manzerbredes
4dea72976b Merge branch 'develop' into loic 2016-03-16 12:43:07 +01:00
Apache
a2f120aa73 Front-end path redefinition 2016-03-16 11:11:25 +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
manzerbredes
26d10bc0fa Merge branch 'develop' into loic 2016-03-15 16:17:39 +01:00
EoleDev
2b8decb81f Maj Library 2016-03-09 16:17:33 +01:00
EoleDev
b7ebe1272c Library maj 2016-03-09 16:16:22 +01:00
Othmane Kabir
20f8eb41d3 commit finale 2016-03-09 16:13:20 +01:00
EoleDev
03ef74d0cf MAJ Librarys 2016-03-09 16:03:46 +01:00
EoleDev
1d3ed3af6d Merge branch 'Evan' into develop 2016-03-09 15:37:42 +01:00
EoleDev
08ea5ef31a Merge branch 'Evan' of http://github.com/manzerbredes/istic-openstack into Evan 2016-03-09 15:36:36 +01:00
Yoggzo
aee0bda9d4 correct errors 2016-03-09 15:39:43 +01:00
EoleDev
c479658f0b New Library 2016-03-09 15:36:02 +01:00
manzerbredes
8ad216dedf test 2016-03-09 15:33:52 +01:00