LimeSurvey: develop 74f610cd
Author | Committer | Branch | Timestamp | Parent |
---|---|---|---|---|
ollehar | ollehar | develop | 2018-07-19 12:55 | develop 693dabcc |
Changeset | Merge branch 'master' into develop Conflicts: |
|||
mod - application/config/packages.php | Diff File | |||
mod - application/controllers/admin/database.php | Diff File | |||
mod - application/controllers/admin/questions.php | Diff File | |||
mod - application/core/LSYii_ClientScript.php | Diff File | |||
mod - application/extensions/admin/survey/ListSurveysWidget/ListSurveysWidget.php | Diff File | |||
mod - application/helpers/admin/import_helper.php | Diff File | |||
mod - application/helpers/admin/template_helper.php | Diff File | |||
mod - application/helpers/expressions/em_manager_helper.php | Diff File | |||
mod - application/models/Survey.php | Diff File | |||
mod - application/models/Template.php | Diff File | |||
mod - application/models/TemplateConfiguration.php | Diff File | |||
mod - application/views/admin/super/welcome.php | Diff File | |||
mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | |||
mod - application/views/admin/survey/Question/questionJavascript_view.php | Diff File | |||
mod - application/views/admin/survey/editLocalSettings_view.php | Diff File | |||
mod - application/views/admin/survey/subview/accordion/_presentation_panel.php | Diff File | |||
mod - application/views/admin/survey/surveybar_displayexport.php | Diff File | |||
mod - assets/packages/adminpanel/build/lsadminpanel.debug.js | Diff File | |||
mod - assets/packages/adminpanel/build/lsadminpanel.js | Diff File | |||
mod - assets/packages/adminpanel/build/lsadminpanel.min.js | Diff File | |||
mod - assets/packages/adminpanel/src/components/subcomponents/_submenu.vue | Diff File | |||
mod - assets/packages/adminpanel/src/main.js | Diff File | |||
mod - assets/scripts/admin/questions.js | Diff File | |||
mod - locale/_template/limesurvey.pot | Diff File | |||
mod - locale/ca/ca.mo | Diff File | |||
mod - locale/de-informal/de-informal.mo | Diff File | |||
mod - locale/de/de.mo | Diff File | |||
mod - locale/hu/hu.mo | Diff File | |||
mod - locale/it-informal/it-informal.mo | Diff File | |||
mod - locale/it/it.mo | Diff File | |||
mod - locale/ja/ja.mo | Diff File | |||
mod - locale/nb/nb.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 - locale/ro/ro.mo | Diff File | |||
mod - locale/th/th.mo | Diff File |