LimeSurvey: develop 628349ba

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz develop 2018-02-27 13:57:01 develop 360e5853
Changeset

Dev Merge branch 'master' into develop

Conflicts:

application/controllers/admin/responses.php

application/models/Response.php
mod - application/controllers/admin/responses.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/SurveysGroups.php Diff File
mod - application/models/User.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/BIFFwriter.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/Format.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/Parser.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/Validator.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/Workbook.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/Worksheet.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Xlswriter.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/surveymenu_entries/create.php Diff File
mod - application/views/admin/surveysgroups/_form.php Diff File
mod - application/views/admin/themeoptions/update.php Diff File
mod - application/views/admin/tutorialEntry/_form.php Diff File
mod - application/views/admin/tutorials/_form.php Diff File
mod - application/views/survey/questions/answer/ranking/answer.twig Diff File
mod - assets/packages/questions/ranking/scripts/ranking.js 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/fr/fr.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/sv/sv.mo Diff File