Merge branches 'mat_FEATURE_graph' and 'master' into mat

Conflicts:
	gargantext_web/api.py

gargantext_web/urls.py

@@ -37,6 +37,7 @@ urlpatterns = patterns('',
     url(r'^chart/corpus/(\d+)/data.csv$', views.send_csv),
     url(r'^graph.json$', views.json_node_link),
 
+    url(r'^api/nodes$', gargantext_web.api.NodesController.get),
     url(r'^api/corpus/(\d+)/ngrams$', gargantext_web.api.CorpusController.ngrams),
     url(r'^api/corpus/(\d+)/metadata$', gargantext_web.api.CorpusController.metadata),
     url(r'^api/corpus/(\d+)/data$', gargantext_web.api.CorpusController.data),

parsing/Taggers/treetagger

-/home/alexandre/local/logiciels/Treetagger/pythonwrapperP3/treetagger
+/home/mat/projects/gargantext/old/gargantext-stable-2/shared/treetagger
\ No newline at end of file

templates/graph-it.html

+{% block css %}
+    <!-- {% load staticfiles %} -->
+    <link rel="stylesheet" href="{% static "css/bootstrap.css" %}">
+    <link rel="stylesheet" href="{% static "css/bootstrap-theme.min.css" %}">
+{% endblock %}
+
+
+
+{% block content %}
+    <div class="container theme-showcase" role="main">
+            <div class="jumbotron">
+                <h1>Gargantext</h1>
+                <p>A web platform to explore text-mining</p>
+            </div>
+    </div>
+    <div class="container visualization"></div>
+    <div class="container tree"></div>
+    <div class="container graph-it"></div>
+
+    <!-- <script type="text/javascript" src="{% static "js/jquery/jquery.min.js" %}"></script> -->
+    
+<!-- 
+    <script type="text/javascript" src="{% static "js/jquery/jquery-1.9.1.min.js" %}"></script>
+    <link rel="stylesheet" type="text/css" href="https://raw.githubusercontent.com/xdan/datetimepicker/master/jquery.datetimepicker.css"/ >
+    <script type="text/javascript" src="{% static "js/jquery/jquery.datetimepicker.js" %}"></script>
+ -->
+
+
+<!-- 
+    <link rel="stylesheet" href="//code.jquery.com/ui/1.11.1/themes/smoothness/jquery-ui.css">
+    <script type="text/javascript" src="//code.jquery.com/jquery-1.10.2.js"></script>
+    <script type="text/javascript" src="//code.jquery.com/ui/1.11.1/jquery-ui.js"></script>
+ -->
+
+    <link rel="stylesheet" href="{% static "css/jquery-ui.css" %}">
+    <script type="text/javascript" src="{% static "js/jquery/jquery.min.js" %}"></script>
+    <script type="text/javascript" src="{% static "js/jquery/jquery-ui.js" %}"></script>
+
+<!-- 
+    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/jstree/3.0.4/themes/default/style.min.css" />
+    <script src="//cdnjs.cloudflare.com/ajax/libs/jstree/3.0.4/jstree.min.js"></script>
+ -->
+    <script type="text/javascript" src="{% static "js/charts/dygraph-combined.js" %}"></script>
+    <script type="text/javascript" src="{% static "js/graph-it.js" %}"></script>
+        
+
+{% endblock %}
\ No newline at end of file