LimeSurvey: develop 859ccd0d

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-06-05 13:30 develop 20ea56e5
Changeset

Merge branch 'master' into develop

Conflicts:
.travis.yml
application/config/version.php
application/helpers/expressions/em_manager_helper.php
application/helpers/remotecontrol/remotecontrol_handle.php
application/views/admin/survey/importSurvey_view.php
mod - .travis.yml Diff File
mod - application/config/internal.php Diff File
mod - application/controllers/admin/themeoptions.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LSYii_AssetManager.php Diff File
mod - application/extensions/PanelBoxWidget/views/box.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/globalsettings_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
add - application/models/AssetVersion.php Diff File
mod - application/models/Template.php Diff File
mod - application/views/admin/survey/importSurvey_view.php Diff File
mod - docs/release_notes.txt 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/fr/fr.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - tests/controllers/CreateSurveyTest.php Diff File