LimeSurvey: develop 0f69c26b

Author Committer Branch Timestamp Parent
c_schmitz c_schmitz develop 2018-02-12 13:00:56 develop 910153f1
Changeset

Dev Merge branch 'master' into develop

mod - application/config/version.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/models/SettingGlobal.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/views/admin/global_settings/_general.php Diff File
mod - application/views/admin/super/footer.php Diff File
mod - application/views/admin/token/massive_actions/_update.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - assets/scripts/multiplechoice_withcomments.js Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/el/el.mo Diff File
mod - locale/es/es.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/nb/nb.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ro/ro.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - tests/LimeSurveyWebDriver.php Diff File
mod - tests/TestBaseClassWeb.php Diff File
mod - tests/TestHelper.php Diff File
add - tests/data/surveys/limesurvey_survey_479717.lss Diff File
add - tests/data/surveys/survey_archive_426848.lsa Diff File
add - tests/questions/MultipleChoiceMandatoryWithCommentTest.php Diff File
mod - tests/surveys/LanguageChangerTest.php Diff File
add - tests/surveys/TokenAttributeInDescriptionTest.php Diff File