Commit graph

128 commits

Author SHA1 Message Date
Eole
d88851c8a6 Error Correction 2016-04-27 19:17:15 +02:00
Loic GUEGAN
cc6f0008e3 Apply 2016-04-27 19:06:34 +02:00
Loic GUEGAN
9a93133272 Merge branch 'loic-image-edition' into loic 2016-04-27 17:03:29 +02:00
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
Loic GUEGAN
91b6918ef3 Change upload 2016-04-26 23:36:33 +02:00
Loic GUEGAN
7a587387aa Debug 2016-04-20 09:10:02 +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
Loic GUEGAN
21b68f1da1 Test 2016-04-16 22:06:18 +02:00
manzerbredes
396c90f921 Test 2016-04-05 09:33:07 +02:00
manzerbredes
a7bf9306d3 Test 2016-04-03 11:15:52 +02:00
manzerbredes
237b627bf6 Merge branch 'develop' into loic 2016-03-30 14:14:10 +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
manzerbredes
f4da4f285a test 2016-03-28 19:01:32 +02:00
manzerbredes
a577b60ce4 Test 2016-03-28 18:20:29 +02:00
manzerbredes
53f65de9d4 Test 2016-03-28 12:17:43 +02:00
manzerbredes
60cfe3ebc0 Test 2016-03-28 11:27:37 +02: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
manzerbredes
3c336f00d2 Add login check witouth reloading page 2016-03-21 06:47:01 +01:00
manzerbredes
57006dba22 Add login check 2016-03-20 11:23:06 +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
Apache
fea574ac18 TestGraph 2016-03-16 12:59:25 +01:00
Apache
a2f120aa73 Front-end path redefinition 2016-03-16 11:11:25 +01:00
manzerbredes
8ad216dedf test 2016-03-09 15:33:52 +01:00
manzerbredes
3b569b6d00 Make some test 2016-03-06 15:10:34 +01:00
manzerbredes
b0b2dc9a64 Avalaible images can be display 2016-03-06 15:04:47 +01:00
manzerbredes
96094547dd Add image view, controller. 2016-03-06 14:51:50 +01:00
manzerbredes
3454c71f05 Test request 2016-03-06 14:42:50 +01:00
manzerbredes
824382b3ea Clean file name 2016-03-02 20:51:04 +01:00
manzerbredes
e2be86814e Clean some things 2016-03-02 20:46:24 +01:00
manzerbredes
fa5a48bc3a Correct bugs 2016-03-02 17:41:04 +01:00
manzerbredes
b6d7d2c30e Correct bug 2016-03-02 07:25:28 +01:00
manzerbredes
2d99f1ecf2 Create loading service 2016-03-02 07:14:05 +01:00
manzerbredes
e9108d4b97 Finish details machine 2016-03-01 22:50:37 +01:00
manzerbredes
5ef1c9b8b1 Edit machineDetails 2016-03-01 20:51:08 +01:00
manzerbredes
f1628e280a Clean Identity service 2016-03-01 20:20:05 +01:00
manzerbredes
cdc3c2cdcb test 2016-03-01 19:08:30 +01:00