LimeSurvey: develop d86f838a

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-07-24 10:09:55 develop 74f610cd
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/version.php
application/controllers/admin/questions.php
application/core/LSYii_Application.php
application/core/LsDefaultDataSets.php
mod - application/config/packages.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/admin/ExpressionValidate.php Diff File
mod - application/controllers/admin/SurveymenuController.php Diff File
mod - application/controllers/admin/SurveymenuEntryController.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/ListSurveysWidget.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/listSurveys.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Surveymenu.php Diff File
mod - application/models/SurveymenuEntries.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/views/admin/conditions/includes/copyform.php Diff File
mod - application/views/admin/dataentry/content_view.php Diff File
mod - application/views/admin/emailtemplates/email_language_template_tab.php Diff File
mod - application/views/admin/export/statistics_subviews/_question.php Diff File
mod - application/views/admin/export/statistics_subviews/_responseid.php Diff File
mod - application/views/admin/labels/_labelviewrightcontent_view.php Diff File
mod - application/views/admin/participants/modal_subviews/_editAttribute.php Diff File
mod - application/views/admin/quotas/viewquotas_quota_actions.php Diff File
mod - application/views/admin/responses/browsemenubar_view.php Diff File
mod - application/views/admin/responses/browsetimerow_view.php Diff File
mod - application/views/admin/responses/massive_actions/_selector.php Diff File
mod - application/views/admin/super/header.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/importQuestion_view.php Diff File
mod - application/views/admin/survey/Question/questionJavascript_view.php Diff File
mod - application/views/admin/survey/Question/subquestionsAndAnswers/_answer_option.twig Diff File
mod - application/views/admin/survey/QuestionGroups/importGroup_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_presentation_panel.php Diff File
mod - application/views/admin/survey/subview/accordion/_tokens_panel.php Diff File
mod - application/views/admin/survey/subview/import_ressources_modal.php Diff File
mod - application/views/admin/survey/subview/tabImport_view.php Diff File
mod - application/views/admin/surveymenu/_form.php Diff File
mod - application/views/admin/surveymenu_entries/_form.php Diff File
mod - application/views/admin/surveymenu_entries/index.php Diff File
mod - application/views/admin/themeoptions/import_modal.php Diff File
mod - application/views/admin/themes/importform_view.php Diff File
mod - application/views/admin/themes/templateeditorbar_view.php Diff File
mod - application/views/admin/token/token_bar.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - application/views/layouts/popup.php Diff File
add - assets/packages/adminbasics/build/adminbasics.css Diff File
add - assets/packages/adminbasics/build/adminbasics.debug.js Diff File
add - assets/packages/adminbasics/build/adminbasics.js Diff File
add - assets/packages/adminbasics/build/adminbasics.min.css Diff File
add - assets/packages/adminbasics/build/adminbasics.min.js Diff File
add - assets/packages/adminbasics/gulpfile.js Diff File
add - assets/packages/adminbasics/js_old/confirmdeletemodal.js Diff File
add - assets/packages/adminbasics/package.json Diff File
add - assets/packages/adminbasics/scss/main.scss Diff File
add - assets/packages/adminbasics/src/components/bootstrap-remote-modals.js Diff File
add - assets/packages/adminbasics/src/components/lslog.js Diff File
add - assets/packages/adminbasics/src/components/notifications.js Diff File
add - assets/packages/adminbasics/src/components/panelclickable.js Diff File
add - assets/packages/adminbasics/src/components/panelsanimation.js Diff File
add - assets/packages/adminbasics/src/jqueryAdditions/center.js Diff File
add - assets/packages/adminbasics/src/jqueryAdditions/isEmpty.js Diff File
add - assets/packages/adminbasics/src/main.js Diff File
add - assets/packages/adminbasics/src/pages/questionEditing.js Diff File
add - assets/packages/adminbasics/src/pages/quickaction.js Diff File
add - assets/packages/adminbasics/src/pages/subquestionandanswers.js Diff File
add - assets/packages/adminbasics/src/pages/surveyGrid.js Diff File
add - assets/packages/adminbasics/src/parts/ajaxHelper.js Diff File
add - assets/packages/adminbasics/src/parts/confirmationModal.js Diff File
add - assets/packages/adminbasics/src/parts/globalMethods.js Diff File
add - assets/packages/adminbasics/src/parts/notifyFader.js Diff File
add - assets/packages/adminbasics/src/parts/prototypeDefinition.js Diff File
add - assets/packages/adminbasics/src/parts/save.js Diff File
add - assets/packages/adminbasics/webpack.config.js Diff File
add - assets/packages/adminbasics/yarn.lock Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.css 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.css Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.min.js Diff File
mod - assets/packages/adminpanel/scss/custom.scss Diff File
mod - assets/packages/adminpanel/src/components/sidebar.vue Diff File
mod - assets/packages/adminpanel/src/components/subcomponents/_quickmenu.vue Diff File
mod - assets/packages/adminpanel/src/components/subcomponents/_sidemenu.vue Diff File
mod - assets/packages/emailtemplates/emailtemplates.min.js Diff File
mod - assets/packages/surveymenufunctions/surveymenufunctionswrapper.js Diff File
mod - assets/packages/surveymenufunctions/surveymenufunctionswrapper.min.js Diff File
mod - assets/scripts/admin/answers.js Diff File
mod - assets/scripts/admin/labels.js Diff File
mod - assets/scripts/admin/participantpanel.js Diff File
mod - assets/scripts/admin/questions.js Diff File
mod - assets/scripts/admin/subquestions.js Diff File
mod - assets/styles-public/browse.css 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/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/fa/fa.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - themes/survey/vanilla/views/layout_errors.twig Diff File