LimeSurvey: cint 4f743dcf

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar cint 2016-12-08 14:04 cint 2fa0da40
Changeset

Merge branch 'master' into cint

Conflicts:
application/config/version.php
application/libraries/PluginManager/LimesurveyApi.php
mod - .gitignore 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/admin/authentication.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/pluginmanager.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/quotas.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/core/LSUserIdentity.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/plugins/Authdb/Authdb.php Diff File
mod - application/extensions/PannelBoxWidget/views/box.php Diff File
mod - application/extensions/PannelBoxWidget/views/row_header.php Diff File
mod - application/helpers/admin/export/SurveyDao.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/common_helper.php Diff File
mod - application/helpers/export_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/qanda_helper.php Diff File
mod - application/libraries/Date_Time_Converter.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/ParticipantAttributeName.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/Session.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/SurveyURLParameter.php Diff File
mod - application/models/Timing.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/views/admin/assessments_view.php Diff File
mod - application/views/admin/authentication/forgotpassword.php Diff File
mod - application/views/admin/authentication/login.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/conditions/includes/conditions_scenario.php Diff File
mod - application/views/admin/conditions/includes/form_editconditions_header.php Diff File
add - application/views/admin/conditions/includes/quickAddConditionForm.php Diff File
mod - application/views/admin/dataentry/vvimport.php Diff File
add - application/views/admin/export/generatestats/_statisticsoutput_footer.php Diff File
mod - application/views/admin/export/generatestats/_statisticsoutput_graphs.php Diff File
mod - application/views/admin/export/generatestats/_statisticsoutput_header.php Diff File
mod - application/views/admin/export/generatestats/simplestats/_statisticsoutput_graphs.php Diff File
mod - application/views/admin/export/generatestats/simplestats/_statisticsoutput_header.php Diff File
mod - application/views/admin/export/statistics_subviews/_dataselection.php Diff File
mod - application/views/admin/export/statistics_subviews/_outputoptions.php Diff File
mod - application/views/admin/export/statistics_subviews/_response_filter_choice.php Diff File
mod - application/views/admin/export/statistics_subviews/_statistics_view_scripts.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/global_settings/_general.php Diff File
mod - application/views/admin/homepagesettings/update.php Diff File
mod - application/views/admin/labels/labelsetsbar_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/pluginmanager/index.php Diff File
mod - application/views/admin/quotas/viewquotasrowsub_view.php Diff File
mod - application/views/admin/responses/browseidrow_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/saved/savedlist_view.php Diff File
mod - application/views/admin/super/_question_explorer.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/survey/Question/import_view.php Diff File
mod - application/views/admin/survey/Question/listquestions.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_set_css_class.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_set_question_group_position.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_set_questions_other.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_set_statistics_options.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/yesNo_defaultvalue_widget.php Diff File
mod - application/views/admin/survey/QuestionGroups/addGroup_view.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/editLocalSettings_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_integration_panel.php Diff File
mod - application/views/admin/survey/subview/accordion/_notification_panel.php Diff File
mod - application/views/admin/survey/surveySummary_view.php Diff File
mod - application/views/admin/templates/templatesummary_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/admin/update/_ajaxVariables.php Diff File
add - application/views/admin/update/manage/manage_key.php Diff File
add - application/views/admin/update/manage/subscribe.php Diff File
mod - application/views/admin/update/updater/steps/_backup.php Diff File
mod - application/views/admin/update/updater/welcome/_subscribe.php Diff File
mod - application/views/survey/questions/arrays/dualscale/answer.php Diff File
mod - application/views/survey/questions/date/selector/answer.php Diff File
mod - docs/license.txt Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ar/ar.mo Diff File
mod - locale/ca/ca.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/el/el.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/gu/gu.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/id/id.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/ja/ja.mo Diff File
mod - locale/ky/ky.mo Diff File
mod - locale/ms/ms.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 - locale/prs/prs.mo Diff File
mod - locale/pt-BR/pt-BR.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - locale/sv/sv.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 - scripts/admin/admin_core.js Diff File
mod - scripts/admin/attributeControl.js Diff File
mod - scripts/admin/conditions.js Diff File
mod - scripts/admin/participantdisplay.js Diff File
mod - scripts/admin/questiongroup.js Diff File
rm - scripts/admin/sharePanel.js Diff
mod - scripts/admin/statistics.js Diff File
mod - scripts/admin/surveysettings.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - scripts/date.js Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/survey_runtime.js 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/Apple_Blossom/scripts/sidemenu.js 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/Bay_of_Many/scripts/sidemenu.js 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/Black_Pearl/scripts/sidemenu.js 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/Dark_Sky/scripts/sidemenu.js 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/Free_Magenta/scripts/sidemenu.js 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/Noto_All_Languages/scripts/sidemenu.js 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/Purple_Tentacle/scripts/sidemenu.js Diff File
mod - styles/Sea_Green/config.xml Diff File
mod - styles/Sea_Green/css/lime-admin-common-rtl.css Diff File
add - third_party/dom-to-image/.gitattributes Diff File
add - third_party/dom-to-image/.gitignore Diff File
add - third_party/dom-to-image/.jsbeautifyrc Diff File
add - third_party/dom-to-image/.jshintrc Diff File
add - third_party/dom-to-image/.stylelintrc Diff File
add - third_party/dom-to-image/Gruntfile.js Diff File
add - third_party/dom-to-image/LICENSE Diff File
add - third_party/dom-to-image/README.md Diff File
add - third_party/dom-to-image/bower.json Diff File
add - third_party/dom-to-image/dist/dom-to-image.min.js Diff File
add - third_party/dom-to-image/karma.conf.js Diff File
add - third_party/dom-to-image/package.json Diff File
add - third_party/dom-to-image/spec/dom-to-image.spec.js Diff File
add - third_party/dom-to-image/spec/resources/bgcolor/control-image Diff File
add - third_party/dom-to-image/spec/resources/bgcolor/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/bgcolor/style.css Diff File
add - third_party/dom-to-image/spec/resources/big/control-image Diff File
add - third_party/dom-to-image/spec/resources/bigger/control-image Diff File
add - third_party/dom-to-image/spec/resources/bigger/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/bigger/style.css Diff File
add - third_party/dom-to-image/spec/resources/border/control-image Diff File
add - third_party/dom-to-image/spec/resources/border/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/border/style.css Diff File
add - third_party/dom-to-image/spec/resources/canvas/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/canvas/style.css Diff File
add - third_party/dom-to-image/spec/resources/css-bg/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/css-bg/style.css Diff File
add - third_party/dom-to-image/spec/resources/dimensions/control-image Diff File
add - third_party/dom-to-image/spec/resources/dimensions/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/dimensions/style.css Diff File
add - third_party/dom-to-image/spec/resources/ext-css/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/ext-css/style.css Diff File
add - third_party/dom-to-image/spec/resources/filter/control-image Diff File
add - third_party/dom-to-image/spec/resources/filter/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/filter/style.css Diff File
add - third_party/dom-to-image/spec/resources/fonts/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/fonts/style.css Diff File
add - third_party/dom-to-image/spec/resources/fonts/web-fonts/embedded.css Diff File
add - third_party/dom-to-image/spec/resources/fonts/web-fonts/empty.html Diff File
add - third_party/dom-to-image/spec/resources/fonts/web-fonts/remote.css Diff File
add - third_party/dom-to-image/spec/resources/fonts/web-fonts/rules-relative.css Diff File
add - third_party/dom-to-image/spec/resources/fonts/web-fonts/rules-relative.html Diff File
add - third_party/dom-to-image/spec/resources/fonts/web-fonts/rules.css Diff File
add - third_party/dom-to-image/spec/resources/fonts/web-fonts/with-query.css Diff File
add - third_party/dom-to-image/spec/resources/hash/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/hash/style.css Diff File
add - third_party/dom-to-image/spec/resources/images/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/images/image.jpeg Diff File
add - third_party/dom-to-image/spec/resources/images/image.png Diff File
add - third_party/dom-to-image/spec/resources/images/style.css Diff File
add - third_party/dom-to-image/spec/resources/input/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/input/style.css Diff File
add - third_party/dom-to-image/spec/resources/page.html Diff File
add - third_party/dom-to-image/spec/resources/pixeldata/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/pixeldata/style.css Diff File
add - third_party/dom-to-image/spec/resources/pseudo/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/pseudo/style.css Diff File
add - third_party/dom-to-image/spec/resources/scale/control-image Diff File
add - third_party/dom-to-image/spec/resources/scale/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/scale/style.css Diff File
add - third_party/dom-to-image/spec/resources/scroll/control-image Diff File
add - third_party/dom-to-image/spec/resources/scroll/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/scroll/style.css Diff File
add - third_party/dom-to-image/spec/resources/sheet/control-image Diff File
add - third_party/dom-to-image/spec/resources/sheet/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/sheet/sheet.css Diff File
add - third_party/dom-to-image/spec/resources/sheet/style.css Diff File
add - third_party/dom-to-image/spec/resources/small/control-image Diff File
add - third_party/dom-to-image/spec/resources/small/control-image-jpeg Diff File
add - third_party/dom-to-image/spec/resources/small/control-image-jpeg-low Diff File
add - third_party/dom-to-image/spec/resources/small/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/small/style.css Diff File
add - third_party/dom-to-image/spec/resources/style/control-image Diff File
add - third_party/dom-to-image/spec/resources/style/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/style/style.css Diff File
add - third_party/dom-to-image/spec/resources/svg-ns/control-image Diff File
add - third_party/dom-to-image/spec/resources/svg-ns/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/svg-ns/style.css Diff File
add - third_party/dom-to-image/spec/resources/svg-rect/control-image Diff File
add - third_party/dom-to-image/spec/resources/svg-rect/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/svg-rect/style.css Diff File
add - third_party/dom-to-image/spec/resources/text/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/text/style.css Diff File
add - third_party/dom-to-image/spec/resources/textarea/dom-node.html Diff File
add - third_party/dom-to-image/spec/resources/textarea/style.css Diff File
add - third_party/dom-to-image/spec/resources/util/fontawesome.base64 Diff File
add - third_party/dom-to-image/spec/resources/util/fontawesome.woff2 Diff File
add - third_party/dom-to-image/src/dom-to-image.js Diff File
add - third_party/es6promise/es6-promise.auto.min.js Diff File
rm - third_party/jqgrid/css/ellipsis-xbl.xml Diff
rm - third_party/jqgrid/css/ui.jqgrid.css Diff
rm - third_party/jqgrid/js/Changes.txt Diff
rm - third_party/jqgrid/js/i18n/grid.locale-ar.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-bg.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-bg1251.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-cat.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-cn.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-cs.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-da.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-de.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-dk.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-el.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-en.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-es.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-fa.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-fi.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-fr.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-gl.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-he.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-hr.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-hr1250.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-hu.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-id.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-is.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-it.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-ja.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-kr.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-lt.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-mne.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-nl.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-no.js Diff
rm - third_party/jqgrid/js/i18n/grid.locale-pl.js Diff