LimeSurvey: develop 4b139bb1

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa develop 2015-06-16 08:35:28 develop 653f7017
Changeset

Merge branch 'feature-test-merge' into develop
mod - .scrutinizer.yml Diff File
mod - application/commands/InstallCommand.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/internal.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/authentication.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/labels.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/quotas.php Diff File
rm - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/templates.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
add - application/core/AuthPluginBase.php Diff File
mod - application/core/LSYii_Validators.php Diff File
add - application/core/PluginBase.php Diff File
add - application/core/PluginManager.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/WebApplication.php Diff File
mod - application/core/db/MssqlSchema.php Diff File
mod - application/core/db/SmartColumnTypeTrait.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/core/plugins/Authwebserver/AuthWebServer.php Diff File
mod - application/core/plugins/ExportR/ExportR.php Diff File
mod - application/core/plugins/ExportR/RDataWriter.php Diff File
mod - application/core/plugins/ExportSTATAxml/ExportSTATAxml.php Diff File
mod - application/core/plugins/ExportSTATAxml/STATAxmlWriter.php Diff File
mod - application/extensions/LimeScript/assets/script.js Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
mod - application/extensions/SettingsWidget/assets/settingswidget.css Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/activate_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/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/globals.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/surveytranslator_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/helpers/viewHelper.php Diff File
mod - application/libraries/BigData.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/libraries/PluginManager/PluginEvent.php Diff File
mod - application/libraries/PluginManager/Storage/DbStorage.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/libraries/admin/pdf.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
mod - application/models/ParticipantAttributeNameLang.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/Token.php Diff File
mod - application/tests/bootstrap.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/export/spss_view.php Diff File
mod - application/views/admin/labels/labelbar_view.php Diff File
mod - application/views/admin/labels/labelsetsbar_view.php Diff File
mod - application/views/admin/quotas/viewquotasrow_view.php Diff File
mod - application/views/admin/responses/browseidheader_view.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/editdefaultvalues_view.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
mod - application/views/admin/survey/Question/subQuestion_view.php Diff File
mod - application/views/admin/survey/Question/yesNo_defaultvalue_widget.php Diff File
mod - application/views/admin/survey/activateSurvey_view.php Diff File
mod - application/views/admin/survey/listSurveys_view.php Diff File
mod - application/views/admin/survey/subview/tabGeneralEditSurvey_view.php Diff File
mod - application/views/admin/survey/subview/tabNotification_view.php Diff File
mod - application/views/admin/survey/subview/tabPresentation_view.php Diff File
mod - application/views/admin/survey/subview/tabTokens_view.php Diff File
mod - application/views/admin/token/bounce.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/emailpost.php Diff File
mod - application/views/admin/token/invite.php Diff File
mod - application/views/admin/token/remind.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - application/views/admin/user/setuserpermissions.php Diff File
mod - application/views/admin/usergroup/editUserGroup_view.php Diff File
mod - application/views/register/registerForm.php Diff File
mod - docs/release_notes.txt Diff File
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - installer/sql/create-pgsql.sql Diff File
add - locale/_template/limesurvey.pot 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/es/es.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
rm - locale/kk/LC_MESSAGES/kk.mo Diff File
add - locale/ky/index.html Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
add - locale/pl-informal/index.html Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ru/ru.mo Diff File
rm - plugins/AuditLog/config.php Diff File
add - plugins/ModulePlugin/ModulePlugin.php Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/expression.js Diff File
mod - scripts/admin/listresponse.js Diff File
mod - scripts/admin/listsurvey.js Diff File
mod - scripts/admin/questions.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/admin/surveypermissions.js Diff File
mod - scripts/admin/surveysettings.js Diff File
add - scripts/admin/tokenbounce.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - scripts/admin/users.js Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/modaldialog.js Diff File
mod - scripts/survey_runtime.js Diff File
mod - scripts/uploader.js Diff File
add - styles-public/uploader-files.css Diff File
mod - styles-public/uploader.css Diff File
mod - styles/blobblueish/adminstyle-rtl.css Diff File
mod - styles/darkblue/adminstyle-rtl.css Diff File
mod - styles/darkblue/displayParticipants.css Diff File
mod - styles/expressions.css Diff File
mod - styles/gringegreen/adminstyle-rtl.css Diff File
mod - templates/limespired/template.css Diff File