Changesets: LimeSurvey

answers_html 6ccbf0fc

2016-10-18 13:41

DenisChenu


Details Diff
Dev: review core class : add type-array (radio-array for example)
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/arrays/texts/answer.php Diff File
mod - application/views/survey/questions/arrays/texts/columns/col_total.php Diff File
mod - application/views/survey/questions/arrays/texts/rows/cells/answer_td.php Diff File
mod - application/views/survey/questions/arrays/texts/rows/cells/td_grand_total.php Diff File
mod - application/views/survey/questions/arrays/texts/rows/cells/td_total.php Diff File
mod - application/views/survey/questions/list_with_comment/list/answer.php Diff File
mod - application/views/survey/questions/list_with_comment/list/rows/answer_row.php Diff File
mod - application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php Diff File
mod - scripts/array-totalsum.js Diff File
mod - templates/basic/css/template-core.css Diff File

answers_html 9552a1a2

2016-10-18 13:39

DenisChenu


Details Diff
Dev: review core class : add type-array (radio-array for example)
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/arrays/texts/answer.php Diff File
mod - application/views/survey/questions/arrays/texts/columns/col_total.php Diff File
mod - application/views/survey/questions/arrays/texts/rows/cells/answer_td.php Diff File
mod - application/views/survey/questions/arrays/texts/rows/cells/td_grand_total.php Diff File
mod - application/views/survey/questions/arrays/texts/rows/cells/td_total.php Diff File
mod - application/views/survey/questions/list_with_comment/list/answer.php Diff File
mod - application/views/survey/questions/list_with_comment/list/rows/answer_row.php Diff File
mod - application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php Diff File
mod - scripts/array-totalsum.js Diff File
mod - templates/basic/css/template-core.css Diff File

cint 2fa0da40

2016-10-18 13:19

ollehar


Details Diff
Merge remote-tracking branch 'origin/master' into cint

Conflicts:
application/config/internal.php
application/config/third_party.php
application/config/version.php
application/controllers/admin/PluginHelper.php
application/core/LSUserIdentity.php
application/core/LSYii_Application.php
application/libraries/PluginManager/LimesurveyApi.php
application/libraries/PluginManager/PluginManager.php
add - .bowerrc Diff File
mod - application/Psr4AutoloaderClass.php Diff File
mod - application/config/config-defaults.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/PluginsController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/NotificationController.php Diff File
mod - application/controllers/admin/PluginHelper.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/databaseupdate.php Diff File
mod - application/controllers/admin/dataentry.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/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/responses.php Diff File
mod - application/controllers/admin/saved.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/translate.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSUserIdentity.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LSYii_Controller.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/extensions/PannelBoxWidget/PannelBoxWidget.php Diff File
mod - application/extensions/PannelBoxWidget/views/box.php Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
mod - application/extensions/SettingsWidget/assets/settingswidget.css Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/MassiveActionsWidget.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js Diff File
add - application/extensions/admin/grid/MassiveActionsWidget/views/modals/empty.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/views/selector.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/assets/reload.js Diff File
mod - application/extensions/bootstrap/assets/css/bootstrap.css Diff File
mod - application/extensions/yiiwheels/widgets/switch/WhSwitch.php Diff File
mod - application/helpers/ClassFactory.php Diff File
mod - application/helpers/Hash.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/Zend/Exception.php Diff File
mod - application/helpers/Zend/Server/Abstract.php Diff File
mod - application/helpers/Zend/Server/Definition.php Diff File
mod - application/helpers/Zend/Server/Interface.php Diff File
mod - application/helpers/Zend/Server/Method/Definition.php Diff File
mod - application/helpers/Zend/Server/Method/Parameter.php Diff File
mod - application/helpers/Zend/Server/Method/Prototype.php Diff File
mod - application/helpers/Zend/Server/Reflection/Function/Abstract.php Diff File
mod - application/helpers/Zend/XmlRpc/Client.php Diff File
mod - application/helpers/Zend/XmlRpc/Client/ServerIntrospection.php Diff File
mod - application/helpers/Zend/XmlRpc/Client/ServerProxy.php Diff File
mod - application/helpers/Zend/XmlRpc/Server.php Diff File
mod - application/helpers/Zend/XmlRpc/Value/Base64.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
add - application/helpers/admin/ajax_helper.php Diff File
mod - application/helpers/admin/export/HtmlWriter.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/admin/export/Translator.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/adodb/adodb-time.inc_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/database_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/ldap_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/sanitize_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/helpers/viewHelper.php Diff File
mod - application/libraries/BigData.php Diff File
mod - application/libraries/LSjsonRPCServer.php Diff File
mod - application/libraries/MersenneTwister.php Diff File
mod - application/libraries/PluginManager/AuthPluginBase.php Diff File
mod - application/libraries/PluginManager/PluginBase.php Diff File
mod - application/libraries/PluginManager/PluginEvent.php Diff File
mod - application/libraries/PluginManager/PluginEventContent.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/libraries/PluginManager/Question/QuestionBase.php Diff File
mod - application/libraries/PluginManager/Question/QuestionPluginBase.php Diff File
mod - application/libraries/PluginManager/Question/iQuestion.php Diff File
mod - application/libraries/admin/Services_JSON.php Diff File
mod - application/libraries/admin/http/httpRequestIt.php Diff File
mod - application/libraries/admin/pclzip/pclzip.php Diff File
mod - application/libraries/admin/pdf.php Diff File
mod - application/libraries/admin/progressbar.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/Answer.php Diff File
mod - application/models/Assessment.php Diff File
mod - application/models/Condition.php Diff File
mod - application/models/DefaultValue.php Diff File
mod - application/models/Dynamic.php Diff File
mod - application/models/ExpressionError.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/Label.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/ParticipantAttribute.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/PluginDynamic.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/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/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/models/User.php Diff File
mod - application/models/UserInGroup.php Diff File
mod - application/third_party/phpmailer/.gitignore Diff File
mod - application/third_party/phpmailer/README.md Diff File
mod - application/third_party/phpmailer/VERSION Diff File
mod - application/third_party/phpmailer/changelog.md Diff File
mod - application/third_party/phpmailer/class.phpmailer.php Diff File
mod - application/third_party/phpmailer/class.phpmaileroauthgoogle.php Diff File
mod - application/third_party/phpmailer/class.pop3.php Diff File
mod - application/third_party/phpmailer/class.smtp.php Diff File
mod - application/third_party/phpmailer/composer.json Diff File
mod - application/third_party/phpmailer/composer.lock Diff File
mod - application/third_party/phpmailer/get_oauth_token.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ka.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-pl.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ru.php Diff File
mod - application/third_party/xlsx_writer/xlsxwriter.class.php Diff File
add - application/views/admin/authentication/ajaxLogin.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/conditionslist_view.php Diff File
add - application/views/admin/conditions/deleteAllConditions.php Diff File
add - 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/conditions_scenario.php Diff File
add - application/views/admin/conditions/includes/copyform.php Diff File
mod - application/views/admin/conditions/includes/form_editconditions_header.php Diff File
add - application/views/admin/conditions/includes/navigator.php Diff File
add - application/views/admin/databaseupdate/verify.php Diff File
mod - application/views/admin/dataentry/active_html_view.php Diff File
mod - application/views/admin/dataentry/caption_view.php Diff File
mod - application/views/admin/dataentry/content_view.php Diff File
mod - application/views/admin/dataentry/includes/editdata/editdata.php Diff File
mod - application/views/admin/dataentry/insert.php Diff File
mod - application/views/admin/export/spss_view.php Diff File
mod - application/views/admin/homepagesettings/index.php Diff File
mod - application/views/admin/participants/attributeControl_view.php Diff File
mod - application/views/admin/participants/attributeMap_view.php Diff File
mod - application/views/admin/participants/blacklist_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
add - application/views/admin/participants/massive_actions/_selector.php Diff File
add - application/views/admin/participants/massive_actions/_selector_attribute.php Diff File
add - application/views/admin/participants/massive_actions/_selector_share.php Diff File
add - application/views/admin/participants/modal_subviews/_addToSurvey.php Diff File
add - application/views/admin/participants/modal_subviews/_deleteParticipant.php Diff File
add - application/views/admin/participants/modal_subviews/_editAttribute.php Diff File
add - application/views/admin/participants/modal_subviews/_editParticipant.php Diff File
add - application/views/admin/participants/modal_subviews/_exportCSV.php Diff File
add - application/views/admin/participants/modal_subviews/_shareParticipant.php Diff File
add - application/views/admin/participants/modal_subviews/_showParticipantSurveys.php Diff File
add - application/views/admin/participants/modal_subviews/attributes/date.php Diff File
add - application/views/admin/participants/modal_subviews/attributes/dropdown.php Diff File
add - 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/participants/sharePanel_view.php Diff File
rm - application/views/admin/participants/userControl_view.php Diff
mod - application/views/admin/pluginmanager/configure.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/_configuration_menu.php Diff File
mod - application/views/admin/super/admin_notifications.php Diff File
mod - application/views/admin/super/footer.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/listquestions.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
rm - application/views/admin/survey/editSurvey_view.php Diff
mod - application/views/admin/survey/listSurveys_view.php Diff File
mod - application/views/admin/survey/subview/tabCreate_view.php Diff File
rm - application/views/admin/survey/subview/tabPluginSettings_view.php Diff
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/massive_actions/_selector.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - application/views/installer/optconfig_view.php Diff File
mod - application/views/statistics_user_view.php Diff File
mod - application/views/survey/questions/arrays/array/no_dropdown/rows/answer_row.php Diff File
mod - application/views/survey/questions/date/selector/answer.php Diff File
mod - application/views/survey/questions/gender/buttons/answer.php Diff File
mod - application/views/survey/questions/gender/radio/answer.php Diff File
mod - application/views/survey/questions/list_dropdown/answer.php Diff File
mod - application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php Diff File
mod - docs/release_notes.txt Diff File
mod - framework/zii/widgets/assets/gridview/jquery.yiigridview.js Diff File
mod - locale/_template/limesurvey.pot Diff File
add - locale/bn/bn.mo Diff File
add - locale/bn/index.html Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/da/da.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/fi/fi.mo Diff File
mod - locale/fr/fr.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
mod - locale/ja/ja.mo Diff File
mod - locale/ky/ky.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - locale/sk/sk.mo Diff File
mod - locale/sq/sq.mo Diff File
mod - locale/sv/sv.mo Diff File
mod - locale/th/th.mo Diff File
mod - locale/zh-Hant-HK/zh-Hant-HK.mo Diff File
mod - plugins/AuditLog/AuditLog.php Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/attributeMap.js Diff File
mod - scripts/admin/conditions.js Diff File
mod - scripts/admin/homepagesettings.js Diff File
mod - scripts/admin/listresponse.js Diff File
mod - scripts/admin/participantdisplay.js Diff File
mod - scripts/admin/participantpanel.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - scripts/array-totalsum.js Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/star-rating.js Diff File
mod - styles-public/browse.css Diff File
mod - styles-public/ranking.css Diff File
mod - styles-public/star-rating.css 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

master eb40eeb1

2016-10-18 12:50

ollehar


Details Diff
Dev: Remove superfluous addcslashes (already escaped by ls_json_encode)
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/views/admin/conditions/includes/form_editconditions_header.php Diff File

master 36924e60

2016-10-18 12:30

c_schmitz

Committer: GitHub


Details Diff
Merge pull request #563 from LimeSurvey/scrutinizer-patch-1

Scrutinizer Auto-Fixes
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/controllers/admin/useraction.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/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/userstatistics_helper.php Diff File
mod - application/libraries/MersenneTwister.php Diff File
mod - application/libraries/admin/http/httpRequestIt.php Diff File
mod - application/libraries/admin/pclzip/pclzip.php Diff File
mod - application/libraries/admin/progressbar.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/UpdateForm.php Diff File

scrutinizer-patch-1 5fe9e2eb

2016-10-18 12:30

Scrutinizer Auto-Fixer


Details Diff
Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/controllers/admin/useraction.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/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/userstatistics_helper.php Diff File
mod - application/libraries/MersenneTwister.php Diff File
mod - application/libraries/admin/http/httpRequestIt.php Diff File
mod - application/libraries/admin/pclzip/pclzip.php Diff File
mod - application/libraries/admin/progressbar.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/UpdateForm.php Diff File

master 3036abbd

2016-10-18 12:13

ollehar


Details Diff
Fixed issue 11806: Blank page in conditions Affected Issues
11806
mod - application/controllers/admin/conditionsaction.php Diff File

master 72b29866

2016-10-18 12:13

ollehar


Details Diff
Fixed issue 11806: Blank page in conditions Affected Issues
11806
mod - application/controllers/admin/conditionsaction.php Diff File

answers_html 63c88969

2016-10-18 11:42

DenisChenu


Details Diff
Dev: asterisk typo
mod - application/views/survey/question_help/asterisk.php Diff File
mod - templates/basic/css/template.css Diff File

answers_html 33a3e4c6

2016-10-18 04:26

DenisChenu


Details Diff
New feature 11743: add empty option to column width
Dev: needed for default
Dev: must be removed to array : sometimes width set columln, and sometime size
Affected Issues
11743
mod - application/core/packages/limesurvey/survey.css Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File

answers_html f1882096

2016-10-18 04:02

DenisChenu


Details Diff
Fixed issue 11500: asterisk for srennreader
Dev: improve sentence : adding bracket in translation ? Unsure
Affected Issues
11500
mod - application/views/survey/question_help/asterisk.php Diff File

answers_html 528db42d

2016-10-18 03:51

DenisChenu


Details Diff
Dev: remove unused var
mod - application/helpers/frontend_helper.php Diff File

answers_html 3d21e0b9

2016-10-18 03:40

DenisChenu


Details Diff
New feature 11797: allow update HTML of core message and core form in template
Dev: Adding 2 pstpl file for form and message
Dev: adding a lot of views : some call another, can be improved
Dev: the 2 pstpl file can be easily added (from default) when update (BD)
Dev: or added when import template
Affected Issues
11500, 11797
mod - application/controllers/RegisterController.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/libraries/Load_answers.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/views/layouts/survey.php Diff File
rm - application/views/register/display.php Diff
rm - application/views/register/registerForm.php Diff
add - application/views/survey/frontpage/captchaForm/error.php Diff File
add - application/views/survey/frontpage/captchaForm/form.php Diff File
add - application/views/survey/frontpage/captchaForm/heading.php Diff File
add - application/views/survey/frontpage/captchaForm/message.php Diff File
rm - application/views/survey/frontpage/enterCaptcha.php Diff
rm - application/views/survey/frontpage/enterToken.php Diff
add - application/views/survey/frontpage/loadForm/error.php Diff File
add - application/views/survey/frontpage/registerForm/form.php Diff File
add - application/views/survey/frontpage/registerForm/heading.php Diff File
add - application/views/survey/frontpage/registerForm/message.php Diff File
add - application/views/survey/frontpage/saveForm/error.php Diff File
add - application/views/survey/frontpage/tokenForm/error.php Diff File
add - application/views/survey/frontpage/tokenForm/form.php Diff File
add - application/views/survey/frontpage/tokenForm/heading.php Diff File
add - application/views/survey/frontpage/tokenForm/message.php Diff File
mod - application/views/survey/question_help/asterisk.php Diff File
add - application/views/survey/system/formItem/captcha.php Diff File
rm - application/views/survey/system/loadForm/error.php Diff
mod - application/views/survey/system/message.php Diff File
add - application/views/survey/system/required.php Diff File
add - templates/basic/pstpl/form.pstpl Diff File
mod - templates/basic/pstpl/register.pstpl Diff File
add - templates/default/views/form.pstpl Diff File
add - templates/test/pstpl/form.pstpl Diff File

questionobject_prototype1 c7b542e9

2016-10-18 03:08

ollehar1


Details Diff
Dev: Render edit page for question module (WIP)
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/questions/ArrayQuestionModule/controllers/AdminController.php Diff File
mod - application/core/questions/common/controllers/AdminBaseController.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File

questionobject_prototype1 d19daa46

2016-10-18 02:37

ollehar1


Details Diff
Dev: Missing view variable
mod - application/controllers/admin/questions.php Diff File

questionobject_prototype1 19137cd8

2016-10-18 02:32

ollehar1


Details Diff
Dev: Rename from 'object' to 'module'
mod - application/config/internal.php Diff File
add - application/core/questions/ArrayQuestionModule/ArrayQuestionModule.php Diff File
rm - application/core/questions/ArrayQuestionObject/ArrayQuestionObjectModule.php Diff
mod - application/core/questions/common/controllers/AdminBaseController.php Diff File
mod - application/helpers/QuestionObjectHelper.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File

questionobject_prototype1 13367f1e

2016-10-18 02:05

ollehar1


Details Diff
Dev: Small fix
mod - application/core/questions/common/controllers/AdminBaseController.php Diff File

questionobject_prototype1 28cac581

2016-10-18 02:03

ollehar1


Details Diff
Dev: Better config naming
mod - application/core/questions/ArrayQuestionObject/config.json Diff File
mod - application/core/questions/common/controllers/AdminBaseController.php Diff File

questionobject_prototype1 93da9412

2016-10-18 02:00

ollehar1


Details Diff
Merge remote-tracking branch 'origin/master' into questionobject_prototype1
mod - application/Psr4AutoloaderClass.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/admin/PluginHelper.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/export.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/labels.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/saved.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/translate.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LSYii_Controller.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/ClassFactory.php Diff File
mod - application/helpers/Hash.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/Zend/Exception.php Diff File
mod - application/helpers/Zend/Server/Abstract.php Diff File
mod - application/helpers/Zend/Server/Definition.php Diff File
mod - application/helpers/Zend/Server/Interface.php Diff File
mod - application/helpers/Zend/Server/Method/Definition.php Diff File
mod - application/helpers/Zend/Server/Method/Parameter.php Diff File
mod - application/helpers/Zend/Server/Method/Prototype.php Diff File
mod - application/helpers/Zend/Server/Reflection/Function/Abstract.php Diff File
mod - application/helpers/Zend/XmlRpc/Client.php Diff File
mod - application/helpers/Zend/XmlRpc/Client/ServerIntrospection.php Diff File
mod - application/helpers/Zend/XmlRpc/Client/ServerProxy.php Diff File
mod - application/helpers/Zend/XmlRpc/Server.php Diff File
mod - application/helpers/Zend/XmlRpc/Value/Base64.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/ajax_helper.php Diff File
mod - application/helpers/admin/export/HtmlWriter.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/admin/export/Translator.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/adodb/adodb-time.inc_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/database_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/ldap_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/sanitize_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/helpers/viewHelper.php Diff File
mod - application/libraries/BigData.php Diff File
mod - application/libraries/LSjsonRPCServer.php Diff File
mod - application/libraries/MersenneTwister.php Diff File
mod - application/libraries/PluginManager/AuthPluginBase.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/libraries/PluginManager/PluginBase.php Diff File
mod - application/libraries/PluginManager/PluginEvent.php Diff File
mod - application/libraries/PluginManager/PluginEventContent.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/libraries/PluginManager/Question/QuestionBase.php Diff File
mod - application/libraries/PluginManager/Question/QuestionPluginBase.php Diff File
mod - application/libraries/PluginManager/Question/iQuestion.php Diff File
mod - application/libraries/admin/Services_JSON.php Diff File
mod - application/libraries/admin/http/httpRequestIt.php Diff File
mod - application/libraries/admin/pclzip/pclzip.php Diff File
mod - application/libraries/admin/pdf.php Diff File
mod - application/libraries/admin/progressbar.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/Answer.php Diff File
mod - application/models/Assessment.php Diff File
mod - application/models/DefaultValue.php Diff File
mod - application/models/Dynamic.php Diff File
mod - application/models/ExpressionError.php Diff File
mod - application/models/Label.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/PluginDynamic.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionGroup.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/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/models/User.php Diff File
mod - application/models/UserInGroup.php Diff File
add - application/views/admin/super/dummy.php Diff File
rm - application/views/admin/survey/editSurvey_view.php Diff
rm - application/views/admin/survey/subview/tabPluginSettings_view.php Diff

master 62fb6279

2016-10-17 21:05

LouisGac


Details Diff
Dev: authentication, added comments to untangle the "spaghettis alle plugin salsa".
mod - application/controllers/admin/authentication.php Diff File

answers_html dfcd0be0

2016-10-17 19:37

DenisChenu


Details Diff
Dev: remove unused secerror global var
mod - application/core/packages/limesurvey/survey.css Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/views/survey/frontpage/enterToken.php Diff File
mod - scripts/date.js Diff File

answers_html ecdcf740

2016-10-17 18:50

DenisChenu


Details Diff
Dev: move message error out of alert, just text-danger
Dev: 2 error type errorALert (for form) and errorWarning
mod - application/controllers/SurveyController.php Diff File
mod - application/controllers/survey/index.php Diff File
add - application/views/survey/system/errorWarning.php Diff File

master affbf6ec

2016-10-17 14:47

c_schmitz

Committer: GitHub


Details Diff
Merge pull request #562 from LimeSurvey/scrutinizer-patch-1

Scrutinizer Auto-Fixes
mod - application/Psr4AutoloaderClass.php Diff File
mod - application/controllers/InstallerController.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/export.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/labels.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/saved.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/translate.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LSYii_Controller.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/ClassFactory.php Diff File
mod - application/helpers/Hash.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/Zend/Exception.php Diff File
mod - application/helpers/Zend/Server/Abstract.php Diff File
mod - application/helpers/Zend/Server/Definition.php Diff File
mod - application/helpers/Zend/Server/Interface.php Diff File
mod - application/helpers/Zend/Server/Method/Definition.php Diff File
mod - application/helpers/Zend/Server/Method/Parameter.php Diff File
mod - application/helpers/Zend/Server/Method/Prototype.php Diff File
mod - application/helpers/Zend/Server/Reflection/Function/Abstract.php Diff File
mod - application/helpers/Zend/XmlRpc/Client.php Diff File
mod - application/helpers/Zend/XmlRpc/Client/ServerIntrospection.php Diff File
mod - application/helpers/Zend/XmlRpc/Client/ServerProxy.php Diff File
mod - application/helpers/Zend/XmlRpc/Server.php Diff File
mod - application/helpers/Zend/XmlRpc/Value/Base64.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/ajax_helper.php Diff File
mod - application/helpers/admin/export/HtmlWriter.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/admin/export/Translator.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/adodb/adodb-time.inc_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/database_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/ldap_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/sanitize_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/helpers/viewHelper.php Diff File
mod - application/libraries/BigData.php Diff File
mod - application/libraries/LSjsonRPCServer.php Diff File
mod - application/libraries/MersenneTwister.php Diff File
mod - application/libraries/PluginManager/AuthPluginBase.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/libraries/PluginManager/PluginBase.php Diff File
mod - application/libraries/PluginManager/PluginEvent.php Diff File
mod - application/libraries/PluginManager/PluginEventContent.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/libraries/PluginManager/Question/QuestionBase.php Diff File
mod - application/libraries/PluginManager/Question/QuestionPluginBase.php Diff File
mod - application/libraries/PluginManager/Question/iQuestion.php Diff File
mod - application/libraries/admin/Services_JSON.php Diff File
mod - application/libraries/admin/http/httpRequestIt.php Diff File
mod - application/libraries/admin/pclzip/pclzip.php Diff File
mod - application/libraries/admin/pdf.php Diff File
mod - application/libraries/admin/progressbar.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/Answer.php Diff File
mod - application/models/Assessment.php Diff File
mod - application/models/DefaultValue.php Diff File
mod - application/models/Dynamic.php Diff File
mod - application/models/ExpressionError.php Diff File
mod - application/models/Label.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/PluginDynamic.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionGroup.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/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/models/User.php Diff File
mod - application/models/UserInGroup.php Diff File

scrutinizer-patch-1 b156d345

2016-10-17 14:41

Scrutinizer Auto-Fixer


Details Diff
Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
mod - application/Psr4AutoloaderClass.php Diff File
mod - application/controllers/InstallerController.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/export.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/labels.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/saved.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/translate.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LSYii_Controller.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/ClassFactory.php Diff File
mod - application/helpers/Hash.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/Zend/Exception.php Diff File
mod - application/helpers/Zend/Server/Abstract.php Diff File
mod - application/helpers/Zend/Server/Definition.php Diff File
mod - application/helpers/Zend/Server/Interface.php Diff File
mod - application/helpers/Zend/Server/Method/Definition.php Diff File
mod - application/helpers/Zend/Server/Method/Parameter.php Diff File
mod - application/helpers/Zend/Server/Method/Prototype.php Diff File
mod - application/helpers/Zend/Server/Reflection/Function/Abstract.php Diff File
mod - application/helpers/Zend/XmlRpc/Client.php Diff File
mod - application/helpers/Zend/XmlRpc/Client/ServerIntrospection.php Diff File
mod - application/helpers/Zend/XmlRpc/Client/ServerProxy.php Diff File
mod - application/helpers/Zend/XmlRpc/Server.php Diff File
mod - application/helpers/Zend/XmlRpc/Value/Base64.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/ajax_helper.php Diff File
mod - application/helpers/admin/export/HtmlWriter.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/admin/export/Translator.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/adodb/adodb-time.inc_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/database_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/ldap_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/sanitize_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/helpers/viewHelper.php Diff File
mod - application/libraries/BigData.php Diff File
mod - application/libraries/LSjsonRPCServer.php Diff File
mod - application/libraries/MersenneTwister.php Diff File
mod - application/libraries/PluginManager/AuthPluginBase.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/libraries/PluginManager/PluginBase.php Diff File
mod - application/libraries/PluginManager/PluginEvent.php Diff File
mod - application/libraries/PluginManager/PluginEventContent.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/libraries/PluginManager/Question/QuestionBase.php Diff File
mod - application/libraries/PluginManager/Question/QuestionPluginBase.php Diff File
mod - application/libraries/PluginManager/Question/iQuestion.php Diff File
mod - application/libraries/admin/Services_JSON.php Diff File
mod - application/libraries/admin/http/httpRequestIt.php Diff File
mod - application/libraries/admin/pclzip/pclzip.php Diff File
mod - application/libraries/admin/pdf.php Diff File
mod - application/libraries/admin/progressbar.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/Answer.php Diff File
mod - application/models/Assessment.php Diff File
mod - application/models/DefaultValue.php Diff File
mod - application/models/Dynamic.php Diff File
mod - application/models/ExpressionError.php Diff File
mod - application/models/Label.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/PluginDynamic.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionGroup.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/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/models/User.php Diff File
mod - application/models/UserInGroup.php Diff File

master b087edb1

2016-10-17 13:23

ollehar


Details Diff
Fixed issue 11802: Remove unused files Affected Issues
11802
rm - application/views/admin/survey/editSurvey_view.php Diff
rm - application/views/admin/survey/subview/tabPluginSettings_view.php Diff
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 616 617 618 619 620 621 622 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1465 1466 1467  Next  Last