LimeSurvey: develop 2ea4fae5

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-06-21 13:02 develop 6227411a
Changeset

Merge branch 'master' into develop
mod - .travis.yml Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/views/admin/themeoptions/update.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/af/af.mo Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/ms/ms.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/ro/ro.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - locale/zh-Hant-TW/zh-Hant-TW.mo Diff File
mod - phpunit.xml Diff File
mod - tests/LimeSurveyWebDriver.php Diff File
mod - tests/TestBaseClass.php Diff File
mod - tests/surveys/LanguageChangerTest.php Diff File
mod - themes/survey/fruity/options/options.twig Diff File
mod - themes/survey/vanilla/config.xml Diff File
mod - themes/survey/vanilla/views/subviews/navigation/navigator_complement.twig Diff File