Changesets: LimeSurvey

Search Browse Back to Index

master 7da9c32d

2018-10-17 14:14:54

c_schmitz

Details Diff 		Dev Small text change
Attach Issues:
mod - application/views/admin/participants/importCSV_view.php Diff File

master 97d71eef

2018-10-17 14:14:10

sem schilder


Committer: c_schmitz Details Diff 		Dev Remove obsolete deactivedebugging.js (#999)

Not sure why this is.
Attach Issues:
rm - assets/scripts/deactivatedebug.js Diff File

master e3cda818

2018-10-17 10:06:37

c_schmitz

Details Diff 		Dev Small text change
Attach Issues:
mod - application/views/admin/token/csvupload.php Diff File

develop f897177f

2018-10-17 09:53:55

DenisChenu

Details Diff 		Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop

# Conflicts:
# application/helpers/common_helper.php
# application/views/admin/survey/Question/editQuestion_view.php
Attach Issues:
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Question.php Diff File
mod - application/third_party/pchart/pChart.class.php Diff File
mod - application/views/admin/survey/Question/advanced_settings_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/token/token_bar.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/cs-informal/cs-informal.mo Diff File
mod - locale/cs/cs.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/hu/hu.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File

develop 26684c1d

2018-10-17 09:47:59

DenisChenu


Committer: GitHub Details Diff 		Revert "Develop merge 20181017 (#1146)" (#1147)

This reverts commit aea888330762ab9ad8d2ef176ed1530d2ffc04b8.
Attach Issues:
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Question.php Diff File
mod - application/third_party/pchart/pChart.class.php Diff File
mod - application/views/admin/survey/Question/advanced_settings_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/token/token_bar.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/cs-informal/cs-informal.mo Diff File
mod - locale/cs/cs.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/hu/hu.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File

revert-1146-develop_merge_20181017 806a0a4e

2018-10-17 09:47:29

DenisChenu


Committer: GitHub Details Diff 		Revert "Develop merge 20181017 (#1146)"

This reverts commit aea888330762ab9ad8d2ef176ed1530d2ffc04b8.
Attach Issues:
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Question.php Diff File
mod - application/third_party/pchart/pChart.class.php Diff File
mod - application/views/admin/survey/Question/advanced_settings_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/token/token_bar.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/cs-informal/cs-informal.mo Diff File
mod - locale/cs/cs.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/hu/hu.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File

develop aea88833

2018-10-17 09:11:18

DenisChenu


Committer: GitHub Details Diff 		Develop merge 20181017 (#1146)

Dev: confirm : can't click on tooltip ;)
Dev: previous data-help show nothing
Dev: remove "leave it", but put information about condition editor (with a link)
Attach Issues:
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Question.php Diff File
mod - application/third_party/pchart/pChart.class.php Diff File
mod - application/views/admin/survey/Question/advanced_settings_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/token/token_bar.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/cs-informal/cs-informal.mo Diff File
mod - locale/cs/cs.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/hu/hu.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File

develop_merge_20181017 2970dfc8

2018-10-17 08:47:45

DenisChenu

Details Diff 		Dev: remove "leave it", but put information about condition editor (with a link)
Attach Issues:
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File

develop_merge_20181017 060cb813

2018-10-17 08:31:02

DenisChenu

Details Diff 		Dev : remove unneeded br
Dev: confirm : can't click on tooltip ;)
Dev: previous data-help show nothing
Attach Issues:
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File

develop_merge_20181017 a6b3ee00

2018-10-17 08:25:06

DenisChenu

Details Diff 		Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop
Attach Issues:
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Question.php Diff File
mod - application/third_party/pchart/pChart.class.php Diff File
mod - application/views/admin/survey/Question/advanced_settings_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/token/token_bar.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/cs-informal/cs-informal.mo Diff File
mod - locale/cs/cs.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/hu/hu.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File

develop 5cf53b76

2018-10-17 07:52:48

DenisChenu

Details Diff 		Dev: fixed issue PHP warning array_merge(): Argument #1 is not an array
Attach Issues:
mod - application/helpers/expressions/em_manager_helper.php Diff File

master 5eb2efe2

2018-10-17 07:40:59

DenisChenu


Committer: GitHub Details Diff 		Dev: Add a button to show help inline (#1014)

Dev: same help for core question settings
Dev: fix label for switch
Attach Issues:
mod - application/views/admin/survey/Question/advanced_settings_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File

master_advHelp 8ae487c7

2018-10-17 01:16:05

DenisChenu

Details Diff 		Dev: same help for core question settings
Dev: fix label for switch
Attach Issues:
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File

master_advHelp 326d6ec4

2018-10-17 00:43:18

DenisChenu

Details Diff 		Merge branch 'master' into master_advHelp
Attach Issues:
mod - .gitignore Diff File
mod - .htaccess Diff File
mod - .travis.yml Diff File
mod - README.md Diff File
mod - application/commands/DemomodeCommand.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/config-sample-dblib.php Diff File
mod - application/config/config-sample-mysql.php Diff File
mod - application/config/config-sample-pgsql.php Diff File
mod - application/config/config-sample-sqlsrv.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/packages.php Diff File
mod - application/config/questiontypes.php Diff File
mod - application/config/third_party.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/SurveyController.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/VerificationController.php Diff File
mod - application/controllers/admin/ExpressionValidate.php Diff File
mod - application/controllers/admin/PluginHelper.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/authentication.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/homepagesettings.php Diff File
mod - application/controllers/admin/index.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/printablesurvey.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/statistics.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/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/core/LSHttpRequest.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LSYii_AssetManager.php Diff File
mod - application/core/LSYii_ClientScript.php Diff File
mod - application/core/LSYii_Controller.php Diff File
add - application/core/LSYii_ImageValidator.php Diff File
mod - application/core/LSYii_Validators.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/db/MssqlSchema.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/core/plugins/Authdb/Authdb.php Diff File
mod - application/core/plugins/ExportR/RSyntaxWriter.php Diff File
mod - application/core/plugins/ExportSTATAxml/STATAxmlWriter.php Diff File
add - application/core/web/LSYii_SecurityManager.php Diff File
mod - application/extensions/LimeScript/LimeScript.php Diff File
mod - application/extensions/PanelBoxWidget/views/box.php Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
add - application/extensions/admin/PreviewModalWidget/PreviewModalWidget.php Diff File
add - application/extensions/admin/PreviewModalWidget/assets/.babelrc Diff File
add - application/extensions/admin/PreviewModalWidget/assets/build.sh Diff File
add - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.dist.css Diff File
add - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.dist.js Diff File
add - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.src.js Diff File
add - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.src.scss Diff File
add - application/extensions/admin/PreviewModalWidget/views/grouped_select_modal.php Diff File
add - application/extensions/admin/PreviewModalWidget/views/open_modal_button.php Diff File
add - application/extensions/admin/PreviewModalWidget/views/select_modal.php Diff File
add - application/extensions/admin/PreviewModalWidget/views/simple_grouped_select.php Diff File
add - application/extensions/admin/PreviewModalWidget/views/simple_select.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js 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/massive_actions/_expiry_dialog.php Diff File
add - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_select_survey_theme.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/searchBox.php Diff File
mod - application/extensions/bootstrap/assets/css/limesurvey-theme.css Diff File
mod - application/extensions/bootstrap/css/bootstrap.css Diff File
mod - application/extensions/bootstrap/css/bootstrap.min.css Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/activate_helper.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/admin/htmleditor_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/admin/template_helper.php Diff File
mod - application/helpers/admin/token_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/globalsettings_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/update/update_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/helpers/userstatistics_helper.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/Assessment.php Diff File
add - application/models/AssetVersion.php Diff File
mod - application/models/Boxes.php Diff File
mod - application/models/DefaultValue.php Diff File
mod - application/models/Dynamic.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/Permission.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/QuestionTemplate.php Diff File
mod - application/models/QuotaLanguageSetting.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/Session.php Diff File
mod - application/models/SettingGlobal.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/Timing.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/UserInGroup.php Diff File
mod - application/models/behaviors/PluginEventBehavior.php Diff File
mod - application/models/index.html Diff File
mod - application/third_party/gtranslate-api/GTranslate.php Diff File
mod - application/third_party/pchart/pChart.class.php Diff File
mod - application/third_party/pclzip/pclzip.lib.php Diff File
mod - application/third_party/pear/OLE/OLE.php Diff File
mod - application/third_party/pear/OLE/PPS.php Diff File
mod - application/third_party/pear/OLE/PPS/File.php Diff File
mod - application/third_party/pear/OLE/PPS/Root.php Diff File
add - application/third_party/pear/OLE/PPS/System.php Diff File
mod - application/third_party/pear/PEAR.php Diff File
add - application/third_party/pear/Spreadsheet/Excel/Writer.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/BIFFwriter.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/Format.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/Parser.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/Validator.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/Workbook.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/Worksheet.php Diff File
rm - application/third_party/pear/Spreadsheet/Excel/Xlswriter.php Diff File
mod - application/views/admin/assessments/assessments_edit.php Diff File
mod - application/views/admin/checkintegrity/check_view.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/conditions/includes/condition.php Diff File
mod - application/views/admin/conditions/includes/conditions_edit.php Diff File
mod - application/views/admin/conditions/includes/copyform.php Diff File
mod - application/views/admin/conditions/includes/form_editconditions_header.php Diff File
mod - application/views/admin/dataentry/content_view.php Diff File
mod - application/views/admin/dataentry/import.php Diff File
mod - application/views/admin/dataentry/vvimport.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/emailtemplates/emailtemplates_view.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/export/generatestats/_statisticsoutput_header.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/export/statistics_view.php Diff File
mod - application/views/admin/expressions/test/functions.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/global_settings/_security.php Diff File
mod - application/views/admin/homepagesettings/index.php Diff File
mod - application/views/admin/labels/_labelviewquickadd_view.php Diff File
mod - application/views/admin/labels/_labelviewrightcontent_view.php Diff File
mod - application/views/admin/participants/attributeControl_view.php Diff File
mod - application/views/admin/participants/attributeMapToken_view.php Diff File
mod - application/views/admin/participants/attributeMap_view.php Diff File
mod - application/views/admin/participants/massive_actions/_selector.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
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/_editAttribute.php Diff File
mod - application/views/admin/participants/modal_subviews/_editParticipant.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/participants/participantsPanel_view.php Diff File
mod - application/views/admin/quotas/viewquotas_quota_actions.php Diff File
mod - application/views/admin/quotas/viewquotas_quota_members.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/listResponses_view.php Diff File
mod - application/views/admin/responses/massive_actions/_selector.php Diff File
mod - application/views/admin/super/_tutorial_menu.php Diff File
mod - application/views/admin/super/fullpagebar_view.php Diff File
mod - application/views/admin/super/header.php Diff File
mod - application/views/admin/super/sidemenu.php Diff File
mod - application/views/admin/super/welcome.php Diff File
mod - application/views/admin/survey/Question/_subQuestionsAndAnwsersJsVariables.php Diff File
mod - application/views/admin/survey/Question/advanced_settings_view.php Diff File
add - application/views/admin/survey/Question/answerOptionsEdit_view.twig Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/editdefaultvalues_view.php Diff File
mod - application/views/admin/survey/Question/importQuestion_view.php Diff File
mod - application/views/admin/survey/Question/import_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/Question/question_subviews/_ajax_variables.php Diff File
rm - application/views/admin/survey/Question/question_subviews/_modals.php Diff File
add - application/views/admin/survey/Question/question_subviews/_modals.twig Diff File
mod - application/views/admin/survey/Question/question_subviews/_question_type_select.php Diff File
mod - application/views/admin/survey/Question/question_subviews/_tabs.php Diff File
mod - application/views/admin/survey/Question/question_view.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
rm - application/views/admin/survey/Question/subquestionsAndAnswers/_answer_option.php Diff File
add - application/views/admin/survey/Question/subquestionsAndAnswers/_answer_option.twig Diff File
rm - application/views/admin/survey/Question/subquestionsAndAnswers/_subquestion.php Diff File
add - application/views/admin/survey/Question/subquestionsAndAnswers/_subquestion.twig Diff File
mod - application/views/admin/survey/QuestionGroups/importGroup_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/import_view.php Diff File
mod - application/views/admin/survey/_activation_feedback.php Diff File
mod - application/views/admin/survey/activateSurvey_view.php Diff File
mod - application/views/admin/survey/breadcrumb.php Diff File
mod - application/views/admin/survey/deactivateSurvey_view.php Diff File
add - application/views/admin/survey/editDataSecurityLocalSettings_view.php Diff File
mod - application/views/admin/survey/editLocalSettings_main_view.php Diff File
mod - application/views/admin/survey/editLocalSettings_view.php Diff File
mod - application/views/admin/survey/importSurvey_view.php Diff File
mod - application/views/admin/survey/prepareEditorScript_view.php Diff File
mod - application/views/admin/survey/queXMLSurvey_view.php Diff File
mod - application/views/admin/survey/subview/_create_survey_text.php Diff File
mod - application/views/admin/survey/subview/accordion/_generaloptions_panel.php Diff File
mod - application/views/admin/survey/subview/accordion/_integration_panel.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/survey/subview/tab_edit_view.php Diff File
add - application/views/admin/survey/subview/tab_edit_view_datasecurity.php Diff File
mod - application/views/admin/survey/surveySummary_view.php Diff File
mod - application/views/admin/survey/surveybar_activation.php Diff File
mod - application/views/admin/survey/surveybar_displayexport.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/surveysgroups/_form.php Diff File
mod - application/views/admin/surveysgroups/update.php Diff File
add - application/views/admin/themeoptions/import_modal.php Diff File
mod - application/views/admin/themeoptions/index.php Diff File
mod - application/views/admin/themeoptions/surveythemelist.php Diff File
add - application/views/admin/themeoptions/surveythememenu.php Diff File
mod - application/views/admin/themeoptions/update.php Diff File
mod - application/views/admin/themes/importform_view.php Diff File
mod - application/views/admin/themes/importuploaded_view.php Diff File
mod - application/views/admin/themes/templateeditor_navigator_view.php Diff File
mod - application/views/admin/themes/templateeditor_question_answerlist_view.php Diff File
mod - application/views/admin/themes/templateeditor_question_answertext_view.php Diff File
mod - application/views/admin/themes/templateeditorbar_view.php Diff File
mod - application/views/admin/themes/templatesummary_view.php Diff File
mod - application/views/admin/token/actions.php Diff File
mod - application/views/admin/token/csvupload.php Diff File
mod - application/views/admin/token/dummytokenform.php Diff File

develop 2a7490b5

2018-10-16 17:06:56

DenisChenu


Committer: GitHub Details Diff 		New feature 13513 : allow plugins to add expresssion manager function (#1081)

Dev: fix call_user_func_array not call_user_func
Dev: fixed issue with any number of arguments function
Dev: PHP function receive a big array with argument : call_user_function
Dev: add doHtmlList in example
Dev: rename event to ExpressionManagerStart : this is the real event
Dev: idea to add too a way to update knowVars of EM
Dev: add config.xml for plugin
Dev: fix js not loaded (strangely : Em is not initialized)
Dev: register expression-extend just after done
Dev: add sayHello function		 Affected Issues
13513
mod - application/config/packages.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
add - plugins/Demo/demoAddEmFunction/assets/demoAddEmFunction.js Diff File
add - plugins/Demo/demoAddEmFunction/config.xml Diff File
add - plugins/Demo/demoAddEmFunction/demo/limesurvey_survey_demo.lss Diff File
add - plugins/Demo/demoAddEmFunction/demoAddEmFunction.php Diff File
add - plugins/Demo/demoAddEmFunction/exampleFunctions.php Diff File

master d15b9b59

2018-10-16 17:05:38

markusfluer

Details Diff 		Dev: failsave for lonely attributes in template manifest
Attach Issues:
mod - application/models/TemplateManifest.php Diff File

master 586b8f0a

2018-10-16 16:03:50

c_schmitz

Details Diff 		Fixed issue 14122: Missing translation for question type labels/dialog/buttons Affected Issues
14122
mod - application/helpers/common_helper.php Diff File
mod - application/models/Question.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/token/token_bar.php Diff File

master 62c144c3

2018-10-16 15:37:47

Dominik Vitt

Details Diff 		Fixed issue 14146: Graphs in pdf not correctly displayed Affected Issues
14146
mod - application/third_party/pchart/pChart.class.php Diff File

master 49510585

2018-10-16 15:08:08

Anton Victorson


Committer: markusfluer Details Diff 		Fixed issue: {SID} placeholder does not work in email templates (#1139)
Attach Issues:
mod - application/controllers/admin/tokens.php Diff File

master dcfd5e9a

2018-10-16 14:23:29

LimeSurvey Translations Bot

Details Diff 		Updated translation: German (Informal) by c_schmitz
Attach Issues:
mod - locale/de-informal/de-informal.mo Diff File

master decb118b

2018-10-16 14:21:28

LimeSurvey Translations Bot

Details Diff 		Updated translation: Czech (Informal) by jelen1
Updated translation: German (Informal) by c_schmitz
Attach Issues:
mod - locale/cs-informal/cs-informal.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File

master d6992951

2018-10-16 14:19:05

LimeSurvey Translations Bot

Details Diff 		Updated translation: Czech by jelen1
Updated translation: German by c_schmitz
Attach Issues:
mod - locale/cs/cs.mo Diff File
mod - locale/de/de.mo Diff File

master 31920eb0

2018-10-16 13:31:32

LimeSurvey Translations Bot

Details Diff 		Updated translation: Spanish (Spain) by c_schmitz, aesteban
Updated translation: Hungarian by kkd
Updated translation: Italian by lfanfoni
Updated translation: Italian (Informal) by lfanfoni
Attach Issues:
mod - locale/_template/limesurvey.pot Diff File
mod - locale/es/es.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File

develop f3f41faf

2018-10-15 19:08:23

DenisChenu

Details Diff 		Merge branch 'develop' of github.com:LimeSurvey/LimeSurvey into develop

# Conflicts:
# application/helpers/questionHelper.php
Attach Issues:
mod - application/controllers/PluginsController.php Diff File
mod - application/controllers/admin/themeoptions.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/views/admin/themeoptions/update.php Diff File
mod - themes/survey/bootswatch/options/options.js Diff File
mod - themes/survey/bootswatch/options/options.twig Diff File
mod - themes/survey/fruity/options/options.js Diff File
mod - themes/survey/fruity/options/options.twig Diff File
mod - themes/survey/vanilla/options/options.js Diff File
mod - themes/survey/vanilla/options/options.twig Diff File

develop 09af20fd

2018-10-15 19:07:08

DenisChenu

Details Diff 		Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop

# Conflicts:
# application/controllers/admin/questions.php
# application/helpers/admin/import_helper.php
# application/models/QuestionGroup.php
# application/models/UserInGroup.php
# assets/packages/adminpanel/build/lsadminpanel.js
Attach Issues:
mod - .gitignore Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/SurveyTimingDynamic.php Diff File
mod - application/models/UserInGroup.php Diff File
mod - application/third_party/pear/OLE/PPS/System.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.css 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/scss/custom.scss Diff File
mod - assets/packages/expressions/em_javascript.js Diff File
mod - assets/scripts/admin/questions.js 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/cs-informal/cs-informal.mo Diff File
mod - locale/cs/cs.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/hu/hu.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 - tests/controllers/CreateSurveyTest.php Diff File
add - upload/surveys/.htaccess Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 316 317 318 319 320 321 322 ... 450 ... 600 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1451 1452 1453  Next  Last