LimeSurvey: master 1d33f125

Diff Back to Repository
Author Committer Branch Timestamp Parent
encuestabizdevgit encuestabizdevgit master 2021-07-15 16:19:15 master fb70f9af
Changeset

Merge branch 'master' into bug/17378--Missing-button--can-not-set-permissions-for-survey-group to resolve conflicts
mod - .htaccess Diff File
mod - application/config/third_party.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/HomepageSettingsController.php Diff File
mod - application/controllers/QuestionAdministrationController.php Diff File
mod - application/controllers/QuestionGroupsAdministrationController.php Diff File
mod - application/controllers/SurveyAdministrationController.php Diff File
mod - application/controllers/SurveysGroupsPermissionController.php Diff File
mod - application/controllers/ThemeOptionsController.php Diff File
mod - application/controllers/UserGroupController.php Diff File
mod - application/controllers/UserManagementController.php Diff File
mod - application/controllers/admin/PermissiontemplatesController.php Diff File
mod - application/controllers/admin/PluginManagerController.php Diff File
mod - application/controllers/admin/SurveymenuController.php Diff File
mod - application/controllers/admin/SurveymenuEntryController.php Diff File
mod - application/controllers/admin/SurveysGroupsController.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/core/TopbarConfiguration.php Diff File
mod - application/core/plugins/Authdb/Authdb.php Diff File
add - application/datavalueobjects/CopyQuestionTextValues.php Diff File
mod - application/datavalueobjects/CopyQuestionValues.php Diff File
mod - application/extensions/AdvancedSettingWidget/AdvancedSettingWidget.php Diff File
mod - application/extensions/TopbarWidget/views/baseTopbar_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/addGroupTopbarRight_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/conditionDesignerTopbarLeft_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/copyQuestionTopbarRight_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/editQuestionTopbarRight_view.php Diff File
add - application/extensions/TopbarWidget/views/includes/questionSummaryTopbarRight_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/questionTopbarLeft_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/questionTopbarRight_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/surveyTopbarRight_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/tokensTopbarRight_view.php Diff File
mod - application/extensions/TopbarWidget/views/questionTopbar_view.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/extensions/admin/survey/ListSurveysWidget/views/searchBox.php Diff File
mod - application/extensions/bootstrap/widgets/TbGridView.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/models/Box.php Diff File
mod - application/models/LabelSet.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/Permissiontemplates.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/SurveysGroups.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/models/User.php Diff File
mod - application/models/UserGroup.php Diff File
mod - application/models/services/CopyQuestion.php Diff File
mod - application/models/services/FilterImportedResources.php Diff File
mod - application/views/SurveysGroupsPermission/subviews/currentUsersList.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/globalsettings/_overview.php Diff File
mod - application/views/admin/labels/_labelviewtabcontent_view.php Diff File
mod - application/views/admin/labels/exportmulti_view.php Diff File
mod - application/views/admin/labels/labelsets_view.php Diff File
mod - application/views/admin/labels/labelsetsbar_view.php Diff File
mod - application/views/admin/labels/labelview_view.php Diff File
mod - application/views/admin/participants/attributeControl_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/participants/massive_actions/_selector_attribute.php Diff File
mod - application/views/admin/participants/massive_actions/_selector_share.php Diff File
mod - application/views/admin/participants/participantsPanel_view.php Diff File
mod - application/views/admin/permissiontemplates/index.php Diff File
mod - application/views/admin/permissiontemplates/partials/_menubar.php Diff File
mod - application/views/admin/super/_configuration_menu.php Diff File
mod - application/views/admin/super/fullpagebar_view.php Diff File
mod - application/views/admin/surveymenu/index.php Diff File
mod - application/views/admin/surveymenu_entries/index.php Diff File
mod - application/views/admin/surveysgroups/update.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - application/views/admin/user/personalsettings.php Diff File
mod - application/views/homepageSettings/index.php Diff File
mod - application/views/layouts/fullpagebar_view.php Diff File
mod - application/views/questionAdministration/_copyQuestionTabsLanguages.php Diff File
mod - application/views/questionAdministration/copyQuestionForm.php Diff File
mod - application/views/questionAdministration/create.php Diff File
mod - application/views/questionAdministration/questionCode.php Diff File
mod - application/views/questionAdministration/summary.php Diff File
mod - application/views/survey/questions/answer/arrays/multiflexi/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/texts/config.xml Diff File
mod - application/views/survey/questions/answer/hugefreetext/config.xml Diff File
mod - application/views/survey/questions/answer/longfreetext/config.xml Diff File
mod - application/views/survey/questions/answer/multiplechoice/config.xml Diff File
mod - application/views/survey/questions/answer/multiplenumeric/config.xml Diff File
mod - application/views/survey/questions/answer/multipleshorttext/config.xml Diff File
mod - application/views/survey/questions/answer/numerical/config.xml Diff File
mod - application/views/surveyAdministration/importSurveyResources_view.php Diff File
mod - application/views/surveyAdministration/listSurveys_view.php Diff File
rm - application/views/surveyAdministration/token_bar.php Diff File
mod - application/views/themeOptions/index.php Diff File
mod - application/views/themeOptions/surveythememenu.php Diff File
mod - application/views/userGroup/addUserGroup_view.php Diff File
mod - application/views/userGroup/mailUserGroup_view.php Diff File
mod - application/views/userGroup/usergroupbar_view.php Diff File
mod - application/views/userGroup/usergroups_view.php Diff File
mod - application/views/userGroup/viewUserGroup_view.php Diff File
mod - application/views/userManagement/index.php Diff File
mod - application/views/userManagement/massiveAction/_selector.php Diff File
mod - application/views/userManagement/partial/_menubar.php Diff File
mod - assets/packages/adminbasics/build/adminbasics.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.js Diff File
mod - assets/packages/adminbasics/build/adminbasics.min.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.min.js Diff File
mod - assets/packages/adminbasics/build/adminbasics.rtl.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.rtl.min.css Diff File
mod - assets/packages/adminbasics/scss/000-lime-admin-common.scss Diff File
mod - assets/packages/adminbasics/src/parts/confirmationModal.js Diff File
mod - assets/scripts/admin/questionEditor.js Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/az/az.mo Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/cs-informal/cs-informal.mo Diff File
mod - locale/cs/cs.mo Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/hr/hr.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/pl-informal/pl-informal.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/pt/pt.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - modules/admin/globalsettings/views/_overview.php Diff File
mod - themes/admin/Noto_All_Languages/css/lime-admin-colors.css Diff File