LimeSurvey: develop 43a58d9e

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-08-27 12:27 develop 503b0c7c
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/version.php
application/controllers/survey/index.php
application/helpers/admin/import_helper.php
application/helpers/frontend_helper.php
application/models/DefaultValue.php
application/models/Question.php
application/views/admin/survey/Question/massive_actions/_set_questions_mandatory.php
application/views/admin/survey/Question/massive_actions/_set_subquestansw_order.php
mod - application/config/internal.php Diff File
mod - application/config/packages.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/SurveyController.php Diff File
mod - application/controllers/VerificationController.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/homepagesettings.php Diff File
mod - application/controllers/admin/labels.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/admin/themeoptions.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LSYii_ClientScript.php Diff File
mod - application/core/LS_Twig_Extension.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/plugins/Authdb/Authdb.php Diff File
mod - application/core/plugins/ExportSTATAxml/STATAxmlWriter.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/globalsettings_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/Assessment.php Diff File
mod - application/models/Notification.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
mod - application/models/ParticipantShare.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/QuotaLanguageSetting.php Diff File
mod - application/models/Session.php Diff File
mod - application/models/SettingsUser.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/SurveyLanguageSetting.php Diff File
mod - application/models/SurveyLink.php Diff File
mod - application/models/SurveyTimingDynamic.php Diff File
mod - application/models/Surveymenu.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/Template.php Diff File
mod - application/models/TemplateConfig.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/TemplateManifest.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/models/Tutorial.php Diff File
mod - application/models/UniqueNotification.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/models/User.php Diff File
mod - application/models/UserGroup.php Diff File
mod - application/models/index.html Diff File
mod - application/third_party/pclzip/pclzip.lib.php Diff File
mod - application/views/admin/conditions/includes/condition.php Diff File
mod - application/views/admin/emailtemplates/email_language_tab.php Diff File
mod - application/views/admin/emailtemplates/email_language_template_tab.php Diff File
mod - application/views/admin/participants/attributeMap_view.php Diff File
mod - application/views/admin/participants/modal_subviews/attributes/date.php Diff File
mod - application/views/admin/participants/modal_subviews/attributes/dropdown.php Diff File
mod - application/views/admin/participants/modal_subviews/attributes/textbox.php Diff File
mod - application/views/admin/responses/massive_actions/_selector.php Diff File
mod - application/views/admin/super/sidemenu.php Diff File
mod - application/views/admin/survey/Question/editdefaultvalues_view.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_set_questions_mandatory.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_set_subquestansw_order.php Diff File
mod - application/views/admin/survey/Question/question_subviews/_accordion_container.php Diff File
mod - application/views/admin/survey/importSurvey_view.php Diff File
mod - application/views/admin/token/massive_actions/_update.php Diff File
mod - application/views/admin/update/updater/welcome/_subscribe.php Diff File
mod - assets/fonts/roboto.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.debug.js Diff File
mod - assets/packages/adminbasics/build/adminbasics.js Diff File
mod - assets/packages/adminbasics/build/adminbasics.min.js Diff File
mod - assets/packages/adminbasics/css/lime-admin-common.css Diff File
mod - assets/packages/adminbasics/package.json Diff File
mod - assets/packages/adminbasics/webpack.config.js 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/sidebar.vue Diff File
mod - assets/packages/adminpanel/webpack.config.js Diff File
add - assets/packages/decimalcustom/decimalcustom.js Diff File
mod - assets/scripts/admin/statistics.js Diff File
mod - docs/release_notes.txt Diff File
mod - framework/web/CUrlManager.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ar/ar.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/es/es.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/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/pt-BR/pt-BR.mo Diff File
mod - locale/ro/ro.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - locale/th/th.mo Diff File
mod - locale/vi/vi.mo Diff File
mod - locale/zh-Hans/zh-Hans.mo Diff File
mod - tests/questions/DateTimeDefaultAnswerExpressionTest.php Diff File
mod - themes/question/browserdetect/survey/questions/answer/shortfreetext/text/item.twig Diff File
mod - themes/survey/bootswatch/config.xml Diff File
rm - themes/survey/bootswatch/css/ajaxify.css Diff
mod - themes/survey/fruity/config.xml Diff File
mod - themes/survey/fruity/views/subviews/header/custom_header.twig Diff File
mod - themes/survey/vanilla/config.xml Diff File
mod - themes/survey/vanilla/scripts/theme.js Diff File
mod - themes/survey/vanilla/views/layout_printanswers.twig Diff File
mod - themes/survey/vanilla/views/subviews/content/userforms.twig Diff File
mod - themes/survey/vanilla/views/subviews/navigation/navigator_complement.twig Diff File
mod - third_party/kcfinder/core/bootstrap.php Diff File