LimeSurvey: cint eb3476ff
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | cint | 2016-08-25 12:17 | cint 21ce22ea |
| Changeset | Merge remote-tracking branch 'origin/master' into cint Conflicts: |
|||
| mod - application/config/version.php | Diff File | |||
| mod - application/controllers/admin/questions.php | Diff File | |||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | |||
| mod - application/helpers/admin/import_helper.php | Diff File | |||
| mod - application/helpers/export_helper.php | Diff File | |||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | |||
| mod - application/helpers/update/updatedb_helper.php | Diff File | |||
| mod - application/views/admin/export/spss_view.php | Diff File | |||
| mod - application/views/admin/survey/Question/importQuestion_view.php | Diff File | |||
| mod - application/views/survey/frontpage/enterCaptcha.php | Diff File | |||
| mod - application/views/survey/frontpage/enterToken.php | Diff File | |||
| mod - installer/sql/create-mssql.sql | Diff File | |||
| mod - installer/sql/create-mysql.sql | Diff File | |||
| mod - installer/sql/create-pgsql.sql | Diff File | |||
| mod - scripts/survey_runtime.js | Diff File | |||
