LimeSurvey: develop 09af20fd

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2018-10-15 21:07 develop 3020611c
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop

Conflicts:

application/controllers/admin/questions.php

application/helpers/admin/import_helper.php

application/models/QuestionGroup.php

application/models/UserInGroup.php

assets/packages/adminpanel/build/lsadminpanel.js
mod - .gitignore Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/SurveyTimingDynamic.php Diff File
mod - application/models/UserInGroup.php Diff File
mod - application/third_party/pear/OLE/PPS/System.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.css Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.js Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.min.css Diff File
mod - assets/packages/adminpanel/scss/custom.scss Diff File
mod - assets/packages/expressions/em_javascript.js Diff File
mod - assets/scripts/admin/questions.js Diff File
mod - installer/create-database.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/cs-informal/cs-informal.mo Diff File
mod - locale/cs/cs.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - tests/controllers/CreateSurveyTest.php Diff File
add - upload/surveys/.htaccess Diff File