CDPP / AMDA_IHM

Commit b56648156450723677ee01d26d510512b7f2be29

Authored by Benjamin Renard
2 parents 1d0858cb 19591d13
Exists in master and in 38 other branches FER_10400, FER_10435, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_7862, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, akkodis/amdadev, amdadev, amdadev_test, density_maps, develop, openam

Merge branch 'amdadev' into develop

Showing 4 changed files with 3 additions and 3 deletions   Show diff stats
Inline Side-by-side
generic_data/EPN-TAP/.gitignore 0 → 100644
  Diff comments   View file @b566481
... ... @@ -0,0 +1 @@
  1 +*.csv
... ...
help/policy.html
  Diff comments   View file @b566481
... ... @@ -30,7 +30,6 @@
30 30 <li><a href="http://sweap.cfa.harvard.edu/Data.html" target="_blank">PSP / SWEAP</a>
31 31 <li><a href="https://www.cosmos.esa.int/web/solar-orbiter/solar-orbiter-publication-acknowledgement" target="_blank">SOLAR ORBITER</a>
32 32 <li><a href="STEREO.html" target="_blank">STEREO</a>
33   - <li><a href="https://www.cosmos.esa.int/web/solar-orbiter/solar-orbiter-publication-acknowledgement" target="_blank">SOLAR ORBITER</a>
34 33 <li><a href="http://themis.ssl.berkeley.edu/roadrules.shtml" target="_blank">THEMIS</a>
35 34 </ul>
36 35 </div>
... ...
php/config.php
  Diff comments   View file @b566481
... ... @@ -39,7 +39,7 @@ if (!defined(&#39;MAGIC_FILE&#39;)) define(&#39;MAGIC_FILE&#39;,&#39;/usr/share/misc/magic&#39;);
39 39 date_default_timezone_set('UTC');
40 40  
41 41 // GUESTS LOGIN section
42   -define("MaxGuests", 15); // Max Guests number
  42 +define("MaxGuests", 100); // Max Guests number
43 43 define("GuestSessionDuration", 300); //300 minutes
44 44 define("MaxGuestTimeInterval", 10); // days
45 45  
... ...
scripts/build_amdapy_doc.sh
  Diff comments   View file @b566481
... ... @@ -39,7 +39,7 @@ then
39 39 # Pull repository
40 40 cd $AMDAPY_PATH
41 41 git checkout $GIT_BRANCH
42   - git pull -c http.sslVerify=0
  42 + git -c http.sslVerify=0 pull
43 43 else
44 44 # Clone repository
45 45 cd $BUILD_DIR
... ...