LimeSurvey: develop 589cf5f6
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | develop | 2018-05-30 17:46:43 | develop 7e167a1e |
| Changeset | Merge branch 'master' into develop Conflicts: |
|||
| mod - application/config/internal.php | Diff File | |||
| mod - application/controllers/SurveysController.php | Diff File | |||
| mod - application/controllers/admin/questions.php | Diff File | |||
| mod - application/controllers/survey/index.php | Diff File | |||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | |||
| mod - application/helpers/frontend_helper.php | Diff File | |||
| mod - application/helpers/replacements_helper.php | Diff File | |||
| mod - application/models/Participant.php | Diff File | |||
| mod - application/models/Question.php | Diff File | |||
| mod - application/models/TemplateConfiguration.php | Diff File | |||
| mod - application/views/admin/participants/attributeMap_view.php | Diff File | |||
| mod - application/views/admin/survey/editLocalSettings_view.php | Diff File | |||
| mod - assets/scripts/admin/participantpanel.js | Diff File | |||
| mod - docs/release_notes.txt | Diff File | |||
| mod - locale/_template/limesurvey.pot | Diff File | |||
| mod - locale/de/de.mo | Diff File | |||
| mod - locale/hr/hr.mo | Diff File | |||
| mod - locale/ja/ja.mo | Diff File | |||
| mod - themes/survey/fruity/options/options.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/messages/assessments.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/messages/warnings.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/privacy/privacy_modal.twig | Diff File | |||
