Merge branch 'master' of github.com:LimeSurvey/LimeSurvey

* 'master' of github.com:LimeSurvey/LimeSurvey: (1118 commits)
  Updated translation: Catalan by qualitatuvic Updated translation: German by c_schmitz Updated translation: Spanish (Spain) by aesteban Updated translation: Estonian by t6nnp6nn Updated translation: Galician by Calidonia Updated translation: Hindi by c_schmitz, ajparag Updated translation: Hungarian by c_schmitz, hunkissleslie Updated translation: Polish by elisa Updated translation: Russian by ddrmoscow, vipgroup Updated translation: Serbian by MilaVeljovic Updated translation: Thai by tomzt, adzpire Updated translation: Polish (Informal) by elisa
  11363: Import old *.lss (version 1.92) to version 2.5 limesurvey
  Fixed issue #11363: Import old *.lss (version 1.92) to version 2.5 limesurvey Dev: Trim bounce email
  Updated translation: German by c_schmitz
  Dev More text corrections
  Updated translation: Catalan by qualitatuvic Updated translation: Indonesian by radhwaw Updated translation: Italian by c_schmitz, lfanfoni Updated translation: Norwegian (Bokmål) by pmonstad Updated translation: Norwegian (Nynorsk) by pmonstad Updated translation: Turkish by kayazeren Updated translation: Italian (Informal) by c_schmitz, lfanfoni
  Dev Corrected pidgin English in aria captions ;)
  Fixed issue: Problems at update if non-standard dbprefix is used
  Fixed issue #11361: progress bar counts hidden questions
  Updated translation: German by c_schmitz, surveyunihi Updated translation: French (France) by arnaud21 Updated translation: Indonesian by radhwaw Updated translation: Polish by elisa Updated translation: German (Informal) by HonkXL, c_schmitz, actxcellence, hermann Updated translation: Polish (Informal) by elisa
  Fixed issue #11353: Unable to movbe to next page on survey list Fixed issue #11283: pagination in Questions in this survey causes a SQL error (MSSQL)
  Dev: Make numRegex a local variable to avoid conflict with array number dropdown
  Fixed issue #11338: List of surveys pagination problem for a limited user
  Fixed issue #11358: problem with fixed-point number when comma user as separator
  Fixed issue	#11285: Export results to .xslx not working under certain server environments
  Fixed issue: survey list, sort arrow direction not updated when sorting by a column
  Fixed issue #11353: Unable to move to next page on survey list (MSSQL)
  Fixed issue #11283: pagination in Questions in this survey causes a SQL error (MSSQL)
  Dev Automatic translation update
  Dev Small text change
  ...

.gitignore

@@ -1,10 +1,8 @@
 .settings
 .project
 /upload/surveys/*
-/styles/gringegreen/images/Thumbs.db
 /upload/templates/*
 /upload/labels/*
-!/upload/labels/readme.txt
 /tmp/runtime/HTML
 /application/controllers/admin/updater.php
 /tmp/*.html
@@ -17,12 +15,15 @@
 /nbproject
 /tmp/assets/*
 !/tmp/assets/.gitignore
-!/tmp/assets/index.html
 /tmp/runtime/cache/*
-/framework
 .svn
 /third_party/jqgrid/src
 .settings/org.eclipse.php.core.prefs
 .buildpath
 /application/config/config.php
 application/config/_config.php
+*.un~
+!index.html
+!readme.txt
+/tmp/runtime/URI/*.ser
+/tmp/runtime/CSS/*.ser

.scrutinizer.yml

@@ -1,5 +1,5 @@
 filter:
-    excluded_paths: [framework/*, locale/*, docs/*, fonts/*, third_party/*, application/third_party/*, images/*, styles/*, styles-public/*, templates/*, themes/*, tmp/*, upload/*]
+    excluded_paths: [framework/*, locale/*, docs/*, fonts/*, third_party/*, application/extensions/*, application/third_party/*, images/*, styles/*, styles-public/*, templates/*, themes/*, tmp/*, upload/*]
     paths: [application/*]
 checks:
     php:

application/config/config-defaults.php

@@ -59,8 +59,8 @@
 $config['timeOutTime']        =   60 * 10;          // Lock them out for 10 minutes.
 
 // Site Settings
-$config['dropdownthreshold']  =   '25';             // The number of answers to a list type question before it switches from Radio Buttons to List
 $config['printanswershonorsconditions'] = 1;        // If set to 1, only relevant answers to questions can be printed by user. If set to 0, also questions not shown are printed
+$config['allow_templates_to_overwrite_views'] = 0;
 
 // Only applicable, of course, if you have chosen 'R' for $dropdowns and/or $lwcdropdowns
 $config['repeatheadings']     =   '25';             // The number of answers to show before repeating the headings in array (flexible) questions. Set to 0 to turn this feature off
@@ -82,7 +82,7 @@
 $config['userideditable']     =  'N';               // Allow editing of user IDs
 $config['defaulttemplate']    =  'default';         // This setting specifys the default theme used for the 'public list' of surveys
 
-$config['allowedtemplateuploads'] = 'gif,ico,jpg,png,css,js,map,json,eot,svg,ttf,woff,txt,md';  // File types allowed to be uploaded in the templates section.
+$config['allowedtemplateuploads'] = 'gif,ico,jpg,png,css,js,map,json,eot,svg,ttf,woff,txt,md,xml';  // File types allowed to be uploaded in the templates section.
 
 $config['allowedresourcesuploads'] = '7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,ico,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,xml,zip,pstpl,css,js';   // File types allowed to be uploaded in the resources sections, and with the HTML Editor
 
@@ -384,7 +384,7 @@
 $config['pdflogowidth'] = '50';           // Logo width
 $config['pdfheadertitle'] = '';           // Header title (bold font). If this config param is empty and header is enabled, site name is used
 $config['pdfheaderstring'] = '';          // Header string (under title). If this config param is empty and header is enabled, survey name is used
-$config['bPdfQuestionFill'] = '1';  	   // Background in questions should be painted (1) or transparent (0)	
+$config['bPdfQuestionFill'] = '1';  	   // Background in questions should be painted (1) or transparent (0)
 $config['bPdfQuestionBold'] = '0';		  // Questions in bold (1) or normal (0)
 $config['bPdfQuestionBorder'] = '1'; 	  // Border in questions. Accepts 0:no border, 1:border
 $config['bPdfResponseBorder'] = '1';	  // Border in responses. Accepts 0:no border, 1:border
@@ -487,7 +487,7 @@
 * If LimeSurvey comes up as normal, then everything is fine. If you
 * get a page not found error or permission denied error then
 */
-$config['force_ssl'] = ''; // DO not turn on unless you are sure your server supports SSL/HTTPS
+$config['force_ssl'] = 'neither'; // DO not turn on unless you are sure your server supports SSL/HTTPS
 
 
 /**
@@ -526,6 +526,12 @@
 // Google Translate API key:  https://code.google.com/apis/language/translate/v2/getting_started.html
 $googletranslateapikey = '';
 
+/**
+ * characterset (string)
+ * Default character set for file import/export
+ */
+$config['characterset'] = 'auto';
+
 /**
 * This variable defines the total space available to the file upload question across all surveys. If set to 0 then no limit applies.
 *
@@ -621,11 +627,9 @@
 
 $config['publicstyleurl']          = $config['publicurl'].'styles-public/';
 $config['sCKEditorURL']            = $config['third_party'].'ckeditor';
-//$config['sCKEditorURL']            = '/scripts/admin/ckeditor.36';
 $config['usertemplaterooturl']     = $config['uploadurl'].'/templates';     // Location of the user templates
 
-$config['adminimagebaseurl']       = $config['styleurl'].$config['admintheme'].'/images/';     // for the definition of IMAGE_BASE_URL in render_wrapped_template.
-$config['adminimageurl']           = $config['styleurl'].$config['admintheme'].'/images/14/';         // Location of button bar files for admin script
+$config['adminimageurl']           = $config['styleurl'].$config['admintheme'].'/images/';         // Location of button bar files for admin script
 
 
 
@@ -658,6 +662,20 @@
 $config['boxes_by_row'] = '3';
 $config['boxes_offset'] = '3';
 
+// Bounce settings
+$config['bounceaccounthost']='';
+$config['bounceaccounttype']='off';
+$config['bounceencryption']='off';
+$config['bounceaccountuser']='';
+
+// Question selector
+$config['defaultquestionselectormode']='default';
+
+// Template editor mode
+$config['defaulttmplateeditormode']='default';
+
+// Side Menu behaviout
+$config['sideMenuBehaviour']='adaptive';
 
 return $config;
 //settings deleted

application/config/internal.php

@@ -30,6 +30,9 @@
     'defaultController' => 'surveys',
 
     'aliases' => array(
+        // Third party path
+        'third_party' => realpath(__DIR__ . '/../../third_party'),
+
         // yiistrap configuration
         'bootstrap' => realpath(__DIR__ . '/../extensions/bootstrap'),
         'questiontypes' => realpath(__DIR__ . '/../extensions/questionTypes'),
@@ -52,6 +55,7 @@
     'params'=>array(
         'defaultPageSize'=>10	,
         'pageSizeOptions'=>array(5=>5,10=>10,20=>20,50=>50,100=>100),
+        'pageSizeOptionsTokens'=>array(5=>5,10=>10,25=>25,50=>50,100=>100, 250=>250, 500=>500, 1000=>1000, 2500=>2500, 5000=>5000, 10000=>10000),
     ),
 
     'import' => array(
@@ -96,7 +100,8 @@
         'request' => array(
             'class'=>'LSHttpRequest',
             'noCsrfValidationRoutes'=>array(
-                'remotecontrol'
+                'remotecontrol',
+                'plugins/unsecure',
             ),
 
             'enableCsrfValidation'=>true,    // CSRF protection

application/config/third_party.php

@@ -8,17 +8,40 @@
 
     // jQuery
     'jquery' => array(
-        'baseUrl' => 'third_party/jquery/',
+        'basePath' => 'third_party.jquery',
         'js' => array(
-            'jquery-1.12.1.min.js'
+            'jquery-2.2.3.min.js'
+        ),
+    ),
+
+    // Bootstrap
+    // This package replace the Yiistrap register() function
+    // Then instead of using the composer dependency system for templates (will be used for LS3)
+    // We can use the package dependency system (easier for now)
+    'bootstrap' => array(
+        'basePath' => 'bootstrap',
+        'css'=> array(
+            'css/bootstrap.css',
+            'css/yiistrap.css',
+        ),
+        'depends' => array(
+            'jquery',
+        )
+    ),
+
+    'fontawesome' => array(
+        //'basePath' => 'third_party.bootstrap', // Need fix third_party alias
+        'basePath' => 'third_party.fontawesome',
+        'css'=> array(
+            'css/font-awesome.min.css',
         ),
     ),
 
     // jQuery UI
     'jqueryui' => array(
-        'baseUrl' => 'third_party/jqueryui/',
+        'basePath' => 'third_party.jqueryui',
         'js' => array(
-            'js/jquery-ui-1.10.3.custom.min.js'
+            'js/jquery-ui-1.11.4.min.js'
         ),
         'css' => array(
             //'css/jquery-ui.css'
@@ -30,7 +53,7 @@
 
     // jQgrid
     'jqgrid' => array(
-        'baseUrl' => 'third_party/jqgrid/',
+        'basePath' => 'third_party.jqgrid',
         'js' => array(
             'js/jquery.jqGrid.min.js',
             'js/i18n/grid.locale-en.js',
@@ -45,16 +68,8 @@
 
     ),
 
-
-        'jquery-price-format' => array(
-            'baseUrl' => 'third_party/jquery-price-format/',
-            'js' => array(
-                'jquery_price_format.js'
-            ),
-        ),
-
     'jqgrid.addons' => array(
-        'baseUrl' => 'third_party/jqgrid/plugins/',
+        'basePath' => 'third_party.jqgrid.plugins',
         'js' => array(
             'grid.addons.js'
         ),
@@ -66,7 +81,7 @@
 
     // jquery bindWithDelay
     'jquery-bindWithDelay' => array(
-        'baseUrl' => 'third_party/jquery-bindWithDelay',
+        'basePath' => 'third_party.jquery-bindWithDelay',
         'js' => array(
             'bindWithDelay.js'
         ),
@@ -77,7 +92,7 @@
 
     // jQuery Cookie
     'jquery-cookie' => array(
-        'baseUrl' => 'third_party/jquery-cookie',
+        'basePath' => 'third_party.jquery-cookie',
         'js' => array(
             'jquery.cookie.js'
         ),
@@ -88,7 +103,7 @@
 
     // jQuery Superfish
     'jquery-superfish' => array(
-        'baseUrl' => 'third_party/jquery-superfish',
+        'basePath' => 'third_party.jquery-superfish',
         'js' => array(
             'js/superfish.js',
             'js/hoverIntent.js'
@@ -103,7 +118,7 @@
 
     // jQuery json
     'jquery-json' => array(
-        'baseUrl' => 'third_party/jquery-json',
+        'basePath' => 'third_party.jquery-json',
         'js' => array(
             'jquery.json-2.4.min.js'
         ),
@@ -114,7 +129,7 @@
 
     // jQuery blockUI
     'jquery-blockUI' => array(
-        'baseUrl' => 'third_party/jquery-blockui',
+        'basePath' => 'third_party.jquery-json',
         'js' => array(
             'jquery.blockUI.js'
         ),
@@ -125,7 +140,7 @@
 
     // qTip2
     'qTip2' => array(
-        'baseUrl' => 'third_party/qTip2',
+        'basePath' => 'third_party.qTip2',
         'js' => array(
             'dist/jquery.qtip.min.js'
         ),
@@ -140,7 +155,7 @@
 
     // jQuery Table Sorter
     'jquery-tablesorter' => array(
-        'baseUrl' => 'third_party/jquery-tablesorter',
+        'basePath' => 'third_party.jquery-tablesorter',
         'js' => array(
             'jquery.tablesorter.min.js'
         ),
@@ -151,7 +166,7 @@
 
     // jQuery NestedSortable
     'jquery-nestedSortable' => array(
-        'baseUrl' => 'third_party/jquery-nestedSortable',
+        'basePath' => 'third_party.jquery-nestedSortable',
         'js' => array(
             'jquery.mjs.nestedSortable.js'
         ),
@@ -162,7 +177,7 @@
 
     // Bootstrap Multiselect
     'bootstrap-multiselect' => array(
-        'baseUrl' => 'third_party/bootstrap-multiselect',
+        'basePath' => 'third_party.bootstrap-multiselect',
         'js' => array(
             'js/bootstrap-multiselect.js',
         ),
@@ -176,7 +191,7 @@
 
     // Ace
     'ace' => array(
-        'baseUrl' => 'third_party/ace',
+        'basePath' => 'third_party.ace',
         'js' => array(
             'ace.js'
         ),
@@ -187,7 +202,7 @@
 
     // jQuery Ace
      'jquery-ace' => array(
-        'baseUrl' => 'third_party/jquery-ace',
+         'basePath' => 'third_party.jquery-ace',
         'js' => array(
             'jquery.ace.js',
         ),
@@ -198,7 +213,7 @@
 
     // jQuery selectboxes
     'jquery-selectboxes' => array(
-        'baseUrl' => 'third_party/jquery-selectboxes/selectboxes',
+        'basePath' => 'third_party.jquery-selectboxes.selectboxes',
         'js' => array(
             'jquery.selectboxes.js'
         ),
@@ -209,7 +224,7 @@
 
     // jQuery actual
     'jquery-actual' => array(
-        'baseUrl' => 'third_party/jquery-actual/',
+        'basePath' => 'third_party.jquery-actual',
         'js' => array(
             'jquery.actual.min.js'
         ),
@@ -220,7 +235,7 @@
 
     // jQuery touch punch
     'jquery-touch-punch' => array(
-        'baseUrl' => 'third_party/jquery-touch-punch/',
+        'basePath' => 'third_party.jquery-touch-punch',
         'js' => array(
             'jquery.ui.touch-punch.min.js'
         ),
@@ -229,36 +244,14 @@
         )
     ),
 
-    // jQuery timepicker
-    'jqueryui-timepicker' => array(
-        'baseUrl' => 'third_party/jquery-ui-timepicker-addon/',
-        'js' => array(
-            'jquery-ui-timepicker-addon.js'
-        ),
-        'css' => array(
-            'jquery-ui-timepicker-addon.css'
-        ),
-        'depends' => array(
-            'jqueryui'
-        )
-    ),
-
-    // select2
-    'select2' => array(
-        'baseUrl' => 'styles/limebootstrap/assets/',
-        'js' => array('scripts/select2.js'),
-        'depends' => array(
-        ),
-    ),
-
     // leaflet, needed for short text question with map (OSM)
     'leaflet' => array(
-        'baseUrl' => 'third_party/leaflet/',
+        'basePath' => 'third_party.leaflet',
         'js' => array(
             'leaflet.js'
         ),
         'css' => array(
             'leaflet.css'
         ),
-    ),
+    )
 );

application/config/updater_version.php

@@ -17,6 +17,7 @@
 
 $config['updaterversion'] = 6;
 $config['comfort_update_server_url'] = 'comfortupdate.limesurvey.org/';
+//$config['comfort_update_server_url'] = 'web.comfortupdate.org/';
 $config['comfort_update_server_ssl'] = 0;
 return $config;
 ?>