LimeSurvey: develop b4290ef0

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz develop 2018-09-12 14:47 develop 1b9fa2ce
Changeset

Dev Merged branch 'master' into develop
Dev # Conflicts resolved:
Dev # application/config/version.php
Dev # application/core/LSHttpRequest.php
Dev # application/helpers/admin/export/SurveyDao.php
mod - .htaccess Diff File
mod - README.md Diff File
mod - application/config/internal.php Diff File
mod - application/config/packages.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/admin/SurveysGroupsController.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/themeoptions.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/core/LSHttpRequest.php Diff File
mod - application/core/LSYii_Controller.php Diff File
mod - application/helpers/admin/export/CsvWriter.php Diff File
mod - application/helpers/admin/export/FormattingOptions.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/admin/exportresults_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/questionHelper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/SettingGlobal.php Diff File
mod - application/models/SurveymenuEntries.php Diff File
mod - application/models/SurveymenuEntryData.php Diff File
mod - application/models/SurveysGroups.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/views/admin/conditions/includes/condition.php Diff File
mod - application/views/admin/export/exportresult_panels/_format.php Diff File
mod - application/views/admin/export/exportresult_panels/_headings.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/participants/massive_actions/_selector.php Diff File
add - application/views/admin/participants/massive_actions/_update.php Diff File
add - application/views/admin/participants/massive_actions/_update_results.php Diff File
mod - application/views/admin/participants/modal_subviews/_editParticipant.php Diff File
mod - application/views/admin/responses/browsemenubar_view.php Diff File
mod - application/views/admin/super/welcome.php Diff File
mod - application/views/admin/survey/Question/advanced_settings_view.php Diff File
mod - application/views/admin/survey/breadcrumb.php Diff File
mod - application/views/admin/surveymenu_entries/_form.php Diff File
mod - application/views/admin/surveysgroups/update.php Diff File
mod - application/views/admin/themeoptions/index.php Diff File
mod - application/views/admin/themeoptions/surveythemelist.php Diff File
mod - application/views/admin/token/dummytokenform.php Diff File
mod - application/views/admin/token/massive_actions/_selector.php Diff File
mod - application/views/admin/token/massive_actions/_update.php Diff File
mod - application/views/survey/questions/answer/arrays/multiflexi/rows/cells/answer_td.twig Diff File
mod - application/views/survey/questions/question_help/em-tip.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/surveymenufunctions/package.json Diff File
add - assets/packages/surveymenufunctions/surveymenuentryfunctions.js Diff File
add - assets/packages/surveymenufunctions/surveymenuentryfunctions.min.js Diff File
mod - assets/packages/surveymenufunctions/surveymenufunctionswrapper.min.js Diff File
add - docs/contributions/browserstack-logo.png Diff File
add - docs/contributions/scrutinizer-logo.png Diff File
add - docs/contributions/travisci-logo.png Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
add - locale/cnr/cnr.mo Diff File
add - locale/cnr/index.html Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/hr/hr.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/ja/ja.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
mod - locale/zh-Hans/zh-Hans.mo Diff File
mod - tests/controllers/ThemeControllerTest.php Diff File
add - upload/themes/survey/index.html Diff File