Commit 4d11473b authored by delanoe's avatar delanoe

Merge branch 'testing' into stable

parents 4b3cf941 df0a746f
......@@ -24,9 +24,16 @@ benefited from synergies with the whole ecosystem of open source
softwares for text and network analytics, including Cortext, NLTK and
SigmaJS.
# Code of Conduct for the contributors
In order to be allowed to contribute to the project, each
contributor has to sign manually or digitally this [Code Of
Conduct](CODE_OF_CONDUCT.md) and send it to (team AT gargantext DOT
org). In case of digital signature, the digital identity has to be
signed by 2 others members of the project at least. Digital identity
means certified with the GPG key of the contributor with a strong level
of security.
# Team, partners and supports
The core team at the origin of Gargantext is :
* David Chavalarias, principal investigator
* Alexandre Delanoë, project manager
......
......@@ -580,9 +580,9 @@ function Main_test(Data) {
$(".dynatable-record-count").insertAfter(".imadiv")
$(".dynatable-pagination-links").insertAfter(".imadiv")
$('<div class="imadiv"></div>').insertAfter("#my-ajax-table")
$(".dynatable-record-count").insertAfter(".imadiv")
$(".dynatable-pagination-links").insertAfter(".imadiv")
// $('<div class="imadiv"></div>').insertAfter("#my-ajax-table")
// $(".dynatable-record-count").insertAfter(".imadiv")
// $(".dynatable-pagination-links").insertAfter(".imadiv")
// binds a custom filter to our 'doubleSearch' via dynatable.queries.functions
MyTable.data('dynatable').queries
.functions['doubleSearch'] = function(record,searchString) {
......
......@@ -2376,9 +2376,9 @@ function MainTableAndCharts( ngdata , initial , filtersParams, callerLabel) {
$(".dynatable-record-count").insertAfter(".imadiv")
$(".dynatable-pagination-links").insertAfter(".imadiv")
$('<div class="imadiv"></div>').insertAfter("#my-ajax-table")
$(".dynatable-record-count").insertAfter(".imadiv")
$(".dynatable-pagination-links").insertAfter(".imadiv")
// $('<div class="imadiv"></div>').insertAfter("#my-ajax-table")
// $(".dynatable-record-count").insertAfter(".imadiv")
// $(".dynatable-pagination-links").insertAfter(".imadiv")
// restore chart filters
if (typeof(filtersParams.from) != 'undefined'
......
......@@ -482,9 +482,9 @@ function Main_test( data , initial) {
$(".dynatable-record-count").insertAfter(".imadiv")
$(".dynatable-pagination-links").insertAfter(".imadiv")
$('<div class="imadiv"></div>').insertAfter("#my-ajax-table")
$(".dynatable-record-count").insertAfter(".imadiv")
$(".dynatable-pagination-links").insertAfter(".imadiv")
// $('<div class="imadiv"></div>').insertAfter("#my-ajax-table")
// $(".dynatable-record-count").insertAfter(".imadiv")
// $(".dynatable-pagination-links").insertAfter(".imadiv")
console.log("After table 3")
return "OK"
......
......@@ -110,5 +110,6 @@
<!-- custom-lib for dynatable.js and dc.js -->
<script type="text/javascript" src="{% static "lib/gargantext/Docs_dyna_chart_and_table.js" %}"></script>
<!-- <script type="text/javascript" src="{% static "lib/gargantext/help.js" %}"></script> -->
{% endblock %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment