LimeSurvey: master 5ee6fc6e

Diff Back to Repository
Author Committer Branch Timestamp Parent
p_teichmann p_teichmann master 2023-07-17 16:07 master 0c2c0d9e
Changeset

Merge branch 'ls6_surveytheme'

Conflicts:

application/config/version.php
mod - application/config/config-defaults.php Diff File
mod - application/config/fonts.php Diff File
mod - application/config/packages.php Diff File
mod - application/config/questiontypes.php Diff File
mod - application/config/vendor.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/ThemeOptionsController.php Diff File
mod - application/controllers/admin/Themes.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/core/QuestionTypes/MultipleNumericalQuestion/RenderMultipleNumerical.php Diff File
mod - application/core/QuestionTypes/RankingStyle/RenderRanking.php Diff File
mod - application/extensions/ButtonWidget/README.md Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/README.md Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/views/modals/unkown_modal_type.php Diff File
mod - application/helpers/LayoutHelper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
add - application/helpers/update/updates/Update_608.php Diff File
add - application/helpers/update/updates/Update_609.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/ExtensionConfig.php Diff File
mod - application/models/SurveyDynamic.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/views/admin/globalsettings/surveySettings.php Diff File
mod - application/views/admin/super/footer.php Diff File
mod - application/views/admin/super/layout_main.php Diff File
mod - application/views/admin/survey/Question/subquestionsAndAnswers/_subquestion.twig Diff File
mod - application/views/admin/survey/subview/accordion/_generaloptions_panel.php Diff File
rm - application/views/admin/themes/templateeditor_surveylist_view.php Diff
mod - application/views/layouts/layout_questioneditor.php Diff File
mod - application/views/questionAdministration/answerOptionRow.twig Diff File
mod - application/views/questionAdministration/answerOptions.twig Diff File
mod - application/views/questionAdministration/subquestionRow.twig Diff File
mod - application/views/questionAdministration/subquestions.twig Diff File
rm - application/views/survey/frontpage/captchaForm/error.php Diff
rm - application/views/survey/frontpage/captchaForm/form.php Diff
rm - application/views/survey/frontpage/captchaForm/heading.php Diff
rm - application/views/survey/frontpage/captchaForm/message.php Diff
rm - application/views/survey/frontpage/clearallForm/form.php Diff
rm - application/views/survey/frontpage/clearallForm/heading.php Diff
rm - application/views/survey/frontpage/clearallForm/message.php Diff
rm - application/views/survey/frontpage/loadForm/error.php Diff
rm - application/views/survey/frontpage/loadForm/form.php Diff
rm - application/views/survey/frontpage/loadForm/heading.php Diff
rm - application/views/survey/frontpage/loadForm/message.php Diff
rm - application/views/survey/frontpage/registerForm/error.php Diff
rm - application/views/survey/frontpage/registerForm/form.php Diff
rm - application/views/survey/frontpage/registerForm/heading.php Diff
rm - application/views/survey/frontpage/registerForm/message.php Diff
rm - application/views/survey/frontpage/saveForm/anonymized.php Diff
rm - application/views/survey/frontpage/saveForm/error.php Diff
rm - application/views/survey/frontpage/saveForm/form.php Diff
rm - application/views/survey/frontpage/saveForm/heading.php Diff
rm - application/views/survey/frontpage/saveForm/message.php Diff
rm - application/views/survey/frontpage/tokenForm/error.php Diff
rm - application/views/survey/frontpage/tokenForm/form.php Diff
rm - application/views/survey/frontpage/tokenForm/heading.php Diff
rm - application/views/survey/frontpage/tokenForm/message.php Diff
mod - application/views/survey/questions/answer/arrays/multiflexi/rows/cells/answer_td.twig Diff File
mod - application/views/survey/questions/answer/date/dropdown/answer.twig Diff File
mod - application/views/survey/questions/answer/date/selector/answer.twig Diff File
mod - application/views/survey/questions/answer/file_upload/answer.twig Diff File
mod - application/views/survey/questions/answer/gender/buttons/answer.twig Diff File
mod - application/views/survey/questions/answer/multiplechoice/rows/answer_row_other.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/dynamic.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/dynamic_slider.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/sliders/answer_row.twig Diff File
add - application/views/survey/questions/answer/multiplenumeric/rows/sliders/horizontal_slider.twig Diff File
add - application/views/survey/questions/answer/multiplenumeric/rows/sliders/vertical_slider.twig Diff File
mod - application/views/survey/questions/answer/ranking/answer.twig Diff File
mod - application/views/survey/questions/answer/shortfreetext/location_mapservice/item_100.twig Diff File
mod - application/views/survey/questions/answer/shortfreetext/text/item.twig Diff File
mod - application/views/survey/questions/answer/shortfreetext/textarea/item.twig Diff File
mod - application/views/survey/questions/answer/yesno/buttons/item.twig Diff File
mod - application/views/survey/questions/question_help/asterisk.twig Diff File
mod - application/views/survey/questions/question_help/em_tip.twig Diff File
rm - application/views/survey/questions/question_help/error.php Diff
mod - application/views/survey/questions/question_help/error_tip.twig Diff File
mod - application/views/survey/questions/question_help/help.twig Diff File
mod - application/views/survey/questions/question_help/mandatory_tip.twig Diff File
rm - application/views/survey/system/actionButton/clearAll.php Diff
rm - application/views/survey/system/actionButton/saveLoad.php Diff
rm - application/views/survey/system/actionButton/saveSave.php Diff
rm - application/views/survey/system/actionLink/clearAll.php Diff
rm - application/views/survey/system/actionLink/saveLoad.php Diff
rm - application/views/survey/system/actionLink/saveSave.php Diff
rm - application/views/survey/system/formItem/captcha.php Diff
rm - application/views/survey/system/surveyIndex/groupIndex.php Diff
rm - application/views/survey/system/surveyIndex/groupIndexMenuLink.php Diff
rm - application/views/survey/system/surveyIndex/questionIndex.php Diff
rm - application/views/survey/system/surveyIndex/questionIndexMenuLink.php Diff
mod - application/views/themeOptions/index.php Diff File
mod - application/views/themeOptions/surveythemelist.php Diff File
mod - assets/admin_themes/Sea_Green/admin_customizations.scss Diff File
mod - assets/admin_themes/Sea_Green/buttons/help-button-dropup.scss Diff File
mod - assets/admin_themes/Sea_Green/footer/footer.scss Diff File
mod - assets/admin_themes/Sea_Green/sea_green_variables.scss Diff File
mod - assets/admin_themes/Sea_Green/tables/tables.scss Diff File
mod - assets/admin_themes/adminbasics_temporary/000-lime-admin-common.scss Diff File
mod - assets/bootstrap_5/build/js/bootstrap_5.js Diff File
mod - assets/bootstrap_5/build/js/bootstrap_5.min.js Diff File
mod - assets/bootstrap_5/js/bootstrap_5.js Diff File
add - assets/fonts/font-src/remix/index.html Diff File
mod - assets/fonts/font-src/remix/remixicon.css Diff File
mod - assets/fonts/font-src/remix/remixicon.eot Diff File
mod - assets/fonts/font-src/remix/remixicon.glyph.json Diff File
mod - assets/fonts/font-src/remix/remixicon.less Diff File
add - assets/fonts/font-src/remix/remixicon.module.less Diff File
add - assets/fonts/font-src/remix/remixicon.scss Diff File
add - assets/fonts/font-src/remix/remixicon.styl Diff File
mod - assets/fonts/font-src/remix/remixicon.svg Diff File
mod - assets/fonts/font-src/remix/remixicon.symbol.svg Diff File
mod - assets/fonts/font-src/remix/remixicon.ttf Diff File
mod - assets/fonts/font-src/remix/remixicon.woff Diff File
mod - assets/fonts/font-src/remix/remixicon.woff2 Diff File
add - assets/fonts/font-src/remix/symbol.html Diff File
add - assets/fonts/font-src/remix/unicode.html Diff File
mod - assets/fonts/ibm-plex-sans/ibm-sans.css Diff File
add - assets/fonts/ibm-plex-serif/IBMPlexSerif-Bold.ttf Diff File
add - assets/fonts/ibm-plex-serif/IBMPlexSerif-BoldItalic.ttf Diff File
add - assets/fonts/ibm-plex-serif/IBMPlexSerif-ExtraLight.ttf Diff File
add - assets/fonts/ibm-plex-serif/IBMPlexSerif-ExtraLightItalic.ttf Diff File
add - assets/fonts/ibm-plex-serif/IBMPlexSerif-Italic.ttf Diff File
add - assets/fonts/ibm-plex-serif/IBMPlexSerif-Light.ttf Diff File
add - assets/fonts/ibm-plex-serif/IBMPlexSerif-LightItalic.ttf Diff File
add - assets/fonts/ibm-plex-serif/IBMPlexSerif-Medium.ttf Diff File
add - assets/fonts/ibm-plex-serif/IBMPlexSerif-MediumItalic.ttf Diff File
add - assets/fonts/ibm-plex-serif/IBMPlexSerif-Regular.ttf Diff File
add - assets/fonts/ibm-plex-serif/IBMPlexSerif-SemiBold.ttf Diff File
add - assets/fonts/ibm-plex-serif/IBMPlexSerif-SemiBoldItalic.ttf Diff File
add - assets/fonts/ibm-plex-serif/IBMPlexSerif-Thin.ttf Diff File
add - assets/fonts/ibm-plex-serif/IBMPlexSerif-ThinItalic.ttf Diff File
add - assets/fonts/ibm-plex-serif/OFL.txt Diff File
add - assets/fonts/ibm-plex-serif/ibm-serif.css Diff File
mod - assets/packages/adminsidepanel/src/components/subcomponents/_dropdown.vue Diff File
mod - assets/packages/adminsidepanel/src/components/subcomponents/_questionsgroups.vue Diff File
mod - assets/packages/globalsidepanel/build.min/js/globalsidepanel.js.map Diff File
mod - assets/packages/globalsidepanel/build/js/globalsidepanel.js Diff File
mod - assets/packages/globalsidepanel/src/components/subcomponents/_submenu.vue Diff File
mod - assets/packages/limesurvey/survey.css Diff File
mod - assets/packages/questions/5pointchoice/scripts/slider-rating.js Diff File
mod - assets/packages/questions/5pointchoice/scripts/star-rating.js Diff File
mod - assets/packages/questions/numeric-slider/css/numeric-slider.css Diff File
mod - assets/packages/questions/ranking/scripts/ranking.js Diff File
rm - assets/packages/questions/ranking/scripts/sortable.min.js Diff
mod - assets/packages/questions/upload/build/uploadquestion.js Diff File
mod - assets/packages/questions/upload/src/uploader.js Diff File
add - assets/packages/sortablejs/sortable.js Diff File
add - assets/packages/sortablejs/sortable.min.js Diff File
mod - assets/packages/surveymenufunctions/surveymenufunctionswrapper.js Diff File
mod - assets/packages/surveymenufunctions/surveymenufunctionswrapper.min.js Diff File
mod - assets/packages/template-core/template-core.css Diff File
mod - assets/packages/themeoptions-core/themeoptions-core.js Diff File
mod - assets/scripts/admin/attributeMap.js Diff File
mod - assets/scripts/admin/attributeMapCSV.js Diff File
mod - assets/scripts/uploader.js Diff File
add - assets/survey_themes/fruity_twentythree/alert/alert.scss Diff File
add - assets/survey_themes/fruity_twentythree/buttons/button-group.scss Diff File
add - assets/survey_themes/fruity_twentythree/buttons/buttons.scss Diff File
add - assets/survey_themes/fruity_twentythree/buttons/buttons_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/completed/completed.scss Diff File
add - assets/survey_themes/fruity_twentythree/completed/completed_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/core/old_core_theme.js Diff File
add - assets/survey_themes/fruity_twentythree/core/old_template_core_class.js Diff File
add - assets/survey_themes/fruity_twentythree/core/old_template_core_class.scss Diff File
add - assets/survey_themes/fruity_twentythree/core/old_template_core_pre.js Diff File
add - assets/survey_themes/fruity_twentythree/darkmode/darkmode_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/datetimepicker/datetimepicker.scss Diff File
add - assets/survey_themes/fruity_twentythree/datetimepicker/datetimepicker_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/error/error.scss Diff File
add - assets/survey_themes/fruity_twentythree/forms/checkboxes/checkboxes.scss Diff File
add - assets/survey_themes/fruity_twentythree/forms/checkboxes/checkboxes_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/forms/forms.scss Diff File
add - assets/survey_themes/fruity_twentythree/forms/forms_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/forms/radio/radio_item.scss Diff File
add - assets/survey_themes/fruity_twentythree/forms/radio/radio_item_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/forms/radio/radio_list.scss Diff File
add - assets/survey_themes/fruity_twentythree/group/group.scss Diff File
add - assets/survey_themes/fruity_twentythree/icons/icons.scss Diff File
add - assets/survey_themes/fruity_twentythree/language-changer/language-changer.scss Diff File
add - assets/survey_themes/fruity_twentythree/language-changer/language-changer_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/list-group/list-group.scss Diff File
add - assets/survey_themes/fruity_twentythree/list-group/list-group_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/ls-color-mixins.scss Diff File
add - assets/survey_themes/fruity_twentythree/ls-mixins.scss Diff File
add - assets/survey_themes/fruity_twentythree/modal/modal.scss Diff File
add - assets/survey_themes/fruity_twentythree/modal/modal_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/navbar/navbar.js Diff File
add - assets/survey_themes/fruity_twentythree/navbar/navbar.scss Diff File
add - assets/survey_themes/fruity_twentythree/navbar/navbar_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/old_fruity.scss Diff File
add - assets/survey_themes/fruity_twentythree/participant/captcha/captcha.scss Diff File
add - assets/survey_themes/fruity_twentythree/participant/captcha/captcha_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/participant/load_save/load_save.scss Diff File
add - assets/survey_themes/fruity_twentythree/participant/load_save/load_save_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/participant/participant-color-mixins.scss Diff File
add - assets/survey_themes/fruity_twentythree/participant/participant-mixins.scss Diff File
add - assets/survey_themes/fruity_twentythree/participant/registration/registration.scss Diff File
add - assets/survey_themes/fruity_twentythree/participant/token/token.scss Diff File
add - assets/survey_themes/fruity_twentythree/printanswers/printanswers.scss Diff File
add - assets/survey_themes/fruity_twentythree/progressbar/progressbar.scss Diff File
add - assets/survey_themes/fruity_twentythree/progressbar/progressbar_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/question/question.scss Diff File
add - assets/survey_themes/fruity_twentythree/question/question_states.scss Diff File
add - assets/survey_themes/fruity_twentythree/questiontypes/5pointchoice/5pointchoice.scss Diff File
add - assets/survey_themes/fruity_twentythree/questiontypes/array/array.js Diff File
add - assets/survey_themes/fruity_twentythree/questiontypes/array/array_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/questiontypes/bootstrap_select/bootstrap_select.scss Diff File
add - assets/survey_themes/fruity_twentythree/questiontypes/bootstrap_select/bootstrap_select_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/questiontypes/file_upload/file_upload.scss Diff File
add - assets/survey_themes/fruity_twentythree/questiontypes/imageselect/imageselect.scss Diff File
add - assets/survey_themes/fruity_twentythree/questiontypes/imageselect/imageselect_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/questiontypes/multiple_numerical_input/multiple_numerical_input.scss Diff File
add - assets/survey_themes/fruity_twentythree/questiontypes/multiple_numerical_input/multiple_numerical_input_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/questiontypes/ranking/ranking.scss Diff File
add - assets/survey_themes/fruity_twentythree/questiontypes/ranking/ranking_advanced.scss Diff File
add - assets/survey_themes/fruity_twentythree/questiontypes/ranking/ranking_advanced_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/questiontypes/ranking/ranking_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/questiontypes/shortfreetext/shortfreetext.scss Diff File
add - assets/survey_themes/fruity_twentythree/quotas/quotas.scss Diff File
add - assets/survey_themes/fruity_twentythree/quotas/quotas_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/slider/slider.scss Diff File
add - assets/survey_themes/fruity_twentythree/spacing/spacing.scss Diff File
add - assets/survey_themes/fruity_twentythree/src/colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/src/definitions.scss Diff File
add - assets/survey_themes/fruity_twentythree/src/extensions.scss Diff File
add - assets/survey_themes/fruity_twentythree/statistics/statistics.scss Diff File
add - assets/survey_themes/fruity_twentythree/statistics/statistics_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/surveylist/surveylist.scss Diff File
add - assets/survey_themes/fruity_twentythree/surveylist/surveylist_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/tables/tables.scss Diff File
add - assets/survey_themes/fruity_twentythree/tables/tables_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/theme_color_variables.scss Diff File
add - assets/survey_themes/fruity_twentythree/theme_js_disclaimer.js Diff File
add - assets/survey_themes/fruity_twentythree/theme_js_modules.js Diff File
add - assets/survey_themes/fruity_twentythree/theme_template.scss Diff File
add - assets/survey_themes/fruity_twentythree/theme_variables.scss Diff File
add - assets/survey_themes/fruity_twentythree/typography/typography-color-mixins.scss Diff File
add - assets/survey_themes/fruity_twentythree/typography/typography-mixins.scss Diff File
add - assets/survey_themes/fruity_twentythree/typography/typography.scss Diff File
add - assets/survey_themes/fruity_twentythree/typography/typography_colors.scss Diff File
add - assets/survey_themes/fruity_twentythree/welcome/welcome.scss Diff File
add - assets/survey_themes/fruity_twentythree/welcome/welcome_colors.scss Diff File
add - docs/demosurveys/ls6_sample_survey_multilingual_fr_de_en_it.lss Diff File
mod - gulpfile.js Diff File
mod - installer/create-database.php Diff File
mod - modules/admin/globalsettings/views/globalSettings_view.php Diff File
mod - package.json Diff File
mod - tests/LimeSurveyWebDriver.php Diff File
mod - tests/TestBaseClassWeb.php Diff File
mod - tests/functional/acceptance/15246-fixed-em-function/FixedFunctionExpressionPluginTest.php Diff File
mod - tests/functional/acceptance/15997-ip-anonymize/IpAddressAnonymizeTest.php Diff File
mod - tests/functional/backend/InstallationControllerTest.php Diff File
mod - tests/functional/backend/UserManagementTest.php Diff File
mod - tests/functional/frontend/MandatorySoftTest.php Diff File
mod - tests/functional/frontend/SurveyIndexNavigationTest.php Diff File
mod - tests/functional/frontend/SurveyNavigationTest.php Diff File
mod - themes/admin/Sea_Green/config.xml Diff File
mod - themes/admin/Sea_Green/css/sea_green-rtl.css Diff File
mod - themes/admin/Sea_Green/css/sea_green.css Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/answer.twig Diff File
mod - themes/question/bootstrap_dropdown/survey/questions/answer/list_dropdown/answer.twig Diff File
mod - themes/question/image_select-listradio/survey/questions/answer/listradio/rows/answer_row.twig Diff File
mod - themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/rows/answer_row.twig Diff File
mod - themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/rows/answer_row_other.twig Diff File
mod - themes/question/inputondemand/survey/questions/answer/multipleshorttext/answer.twig Diff File
mod - themes/question/inputondemand/survey/questions/answer/multipleshorttext/config.xml Diff File
mod - themes/question/ranking_advanced/survey/questions/answer/ranking/answer.twig Diff File
mod - themes/question/ranking_advanced/survey/questions/answer/ranking/assets/scripts/advanced_ranking.js Diff File
mod - themes/question/ranking_advanced/survey/questions/answer/ranking/config.xml Diff File
mod - themes/question/ranking_advanced/views/blocks.twig Diff File
mod - themes/question/ranking_advanced/views/bubbles.twig Diff File
mod - themes/question/ranking_advanced/views/buttons.twig Diff File
mod - themes/question/ranking_advanced/views/list.twig Diff File
mod - themes/survey/bootswatch/config.xml Diff File
mod - themes/survey/bootswatch/css/theme.css Diff File
mod - themes/survey/fruity/config.xml Diff File
mod - themes/survey/fruity/css/theme.css Diff File
mod - themes/survey/fruity/css/variations/apple_blossom.css Diff File
mod - themes/survey/fruity/css/variations/bay_of_many.css Diff File
mod - themes/survey/fruity/css/variations/black_pearl.css Diff File
mod - themes/survey/fruity/css/variations/free_magenta.css Diff File
mod - themes/survey/fruity/css/variations/purple_tentacle.css Diff File
mod - themes/survey/fruity/css/variations/sea_green.css Diff File
mod - themes/survey/fruity/css/variations/skyline_blue.css Diff File
mod - themes/survey/fruity/css/variations/sunset_orange.css Diff File
add - themes/survey/fruity_twentythree/config.xml Diff File
add - themes/survey/fruity_twentythree/css/ajaxify.css Diff File
add - themes/survey/fruity_twentythree/css/background-image.css Diff File
add - themes/survey/fruity_twentythree/css/base.css Diff File
add - themes/survey/fruity_twentythree/css/custom.css Diff File
add - themes/survey/fruity_twentythree/css/index.html Diff File
add - themes/survey/fruity_twentythree/css/maintenance.css Diff File
add - themes/survey/fruity_twentythree/css/survey-list.css Diff File
add - themes/survey/fruity_twentythree/css/variations/theme_apple-rtl.css Diff File