LimeSurvey: master 255ba702

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar1 ollehar1 master 2020-03-17 12:50 master bfa3d5af
Changeset

Merge branch 'master' into bug/15943-save-and-save-and-close-buttons-quick-add-conditions
mod - .scrutinizer.yml Diff File
mod - .travis.yml Diff File
mod - application/config/internal.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/core/LSSodium.php Diff File
mod - application/core/plugins/AuditLog/config.xml Diff File
mod - application/core/plugins/AuthLDAP/config.xml Diff File
mod - application/core/plugins/ExportR/config.xml Diff File
mod - application/core/plugins/ExportSTATAxml/config.xml Diff File
mod - application/core/plugins/oldUrlCompat/config.xml Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/sanitize_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/SavedControl.php Diff File
mod - application/models/SurveyActivator.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/Token.php Diff File
mod - docs/PULL_REQUEST_TEMPLATE Diff File
mod - docs/release_notes.txt Diff File
mod - index.php Diff File
mod - locale/de/de.mo Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
add - tests/check_autoloader.php Diff File
mod - tests/unit/models/EncryptAttributesTest.php Diff File
mod - themes/survey/vanilla/views/subviews/messages/warnings.twig Diff File