LimeSurvey: master 1c797ff2

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu master 2016-07-27 16:26 master 57b9e318
Changeset

Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git into master_QuestionAttributeForPlugin_2
mod - .gitignore Diff File
mod - application/config/config-sample-mysql.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/third_party.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/admin/database.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/statistics.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/core/LSHttpRequest.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/extensions/questionTypes/listRadio/listRadio.php Diff File
mod - application/extensions/yiiwheels/widgets/buttongroup/WhButtonGroup.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/expressions/em_manager_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/update/update_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/PluginManager/PluginBase.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/ParticipantShare.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/third_party/ar-php/Arabic/Date.php Diff File
mod - application/views/admin/export/statistics_subviews/_dataselection.php Diff File
mod - application/views/admin/export/statistics_user_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/adminmenu.php Diff File
mod - application/views/admin/super/header.php 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/massive_actions/_selector.php Diff File
mod - application/views/admin/survey/deleteSurvey_view.php Diff File
mod - application/views/admin/survey/editLocalSettings_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_notification_panel.php Diff File
mod - application/views/admin/templates/templateeditor_question_answer_view.php Diff File
mod - application/views/admin/token/managetokenattributes.php Diff File
mod - application/views/admin/user/personalsettings.php Diff File
mod - application/views/survey/questions/listradio/rows/answer_row_noanswer.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/af/af.mo Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/el/el.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/id/id.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/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - plugins/AuditLog/AuditLog.php Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/listresponse.js Diff File
mod - scripts/admin/statistics.js Diff File
mod - scripts/admin/subquestions.js Diff File
add - scripts/admin/survey_edit_notificationpanel.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - scripts/array-totalsum.js Diff File
add - scripts/deactivatedebug.js Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/map.js Diff File
mod - scripts/survey_runtime.js Diff File
mod - styles/Apple_Blossom/css/lime-admin-colors.css Diff File
mod - styles/Apple_Blossom/css/lime-admin-common-rtl.css Diff File
mod - styles/Apple_Blossom/css/lime-admin-common.css Diff File
mod - styles/Bay_of_Many/css/lime-admin-colors.css Diff File
mod - styles/Bay_of_Many/css/lime-admin-common-rtl.css Diff File
mod - styles/Bay_of_Many/css/lime-admin-common.css Diff File
mod - styles/Black_Pearl/css/lime-admin-colors.css Diff File
mod - styles/Black_Pearl/css/lime-admin-common-rtl.css Diff File
mod - styles/Black_Pearl/css/lime-admin-common.css Diff File
mod - styles/Dark_Sky/css/lime-admin-colors.css Diff File
mod - styles/Dark_Sky/css/lime-admin-common-rtl.css Diff File
mod - styles/Dark_Sky/css/lime-admin-common.css Diff File
mod - styles/Free_Magenta/css/lime-admin-colors.css Diff File
mod - styles/Free_Magenta/css/lime-admin-common-rtl.css Diff File
mod - styles/Free_Magenta/css/lime-admin-common.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-colors.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-common-rtl.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-common.css Diff File
mod - styles/Purple_Tentacle/css/lime-admin-colors.css Diff File
mod - styles/Purple_Tentacle/css/lime-admin-common-rtl.css Diff File
mod - styles/Purple_Tentacle/css/lime-admin-common.css Diff File
mod - styles/Sea_Green/css/lime-admin-colors.css Diff File
mod - styles/Sea_Green/css/lime-admin-common-rtl.css Diff File
mod - styles/Sea_Green/css/lime-admin-common.css Diff File
mod - styles/Sunset_Orange/css/lime-admin-colors.css Diff File
mod - styles/Sunset_Orange/css/lime-admin-common-rtl.css Diff File
mod - styles/Sunset_Orange/css/lime-admin-common.css Diff File
mod - templates/minimal-config.xml Diff File
mod - third_party/jquery-blockui/jquery.blockUI.js Diff File