LimeSurvey: develop 6123e2b0
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| develop | 2017-04-20 16:45 | develop 5b619f22 | ||
| Changeset | Merge branch 'master' into develop Conflicts: |
|||
| mod - application/controllers/admin/questions.php | Diff File | |||
| mod - application/controllers/admin/surveyadmin.php | Diff File | |||
| mod - application/controllers/admin/templates.php | Diff File | |||
| mod - application/core/plugins/AuthLDAP/AuthLDAP.php | Diff File | |||
| mod - application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js | Diff File | |||
| mod - application/extensions/admin/survey/ListSurveysWidget/ListSurveysWidget.php | Diff File | |||
| add - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_expiry_dialog.php | Diff File | |||
| mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php | Diff File | |||
| mod - application/helpers/qanda_helper.php | Diff File | |||
| mod - application/models/Survey.php | Diff File | |||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | |||
| mod - application/views/admin/survey/subview/tabCopy_view.php | Diff File | |||
| mod - scripts/survey_runtime.js | Diff File | |||
