LimeSurvey: develop 2121cfed

Author Committer Branch Timestamp Parent
ollehar ollehar develop 2017-11-22 14:04:27 develop 85800b5b
Changeset

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

mod - application/commands/console.php Diff File
mod - application/commands/starter.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/InstallerController.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/UploaderController.php Diff File
mod - application/controllers/admin/ExpressionValidate.php Diff File
mod - application/controllers/admin/SurveymenuController.php Diff File
mod - application/controllers/admin/SurveymenuEntryController.php Diff File
mod - application/controllers/admin/TutorialEntryController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/conditionsaction.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/labels.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/printablesurvey.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.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/admin/usergroups.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSCGettextMessageSource.php Diff File
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/core/LSHttpRequest.php Diff File
mod - application/core/LSYii_ClientScript.php Diff File
mod - application/core/LSYii_CompareInsensitiveValidator.php Diff File
mod - application/core/LSYii_Controller.php Diff File
mod - application/core/LSYii_EmailIDNAValidator.php Diff File
mod - application/core/LSYii_Validators.php Diff File
mod - application/core/UserIdentity.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/Authwebserver/Authwebserver.php Diff File
mod - application/core/web/DbHttpSession.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/Server/Reflection/Function/Abstract.php Diff File
mod - application/helpers/admin/backupdb_helper.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/admin/export/Writer.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/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/export_helper.php Diff File
mod - application/helpers/expressions/em_core_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/questionIndexHelper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/sanitize_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/Date_Time_Converter.php Diff File
mod - application/libraries/LSjsonRPCServer.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/libraries/admin/http/httpRequestIt.php Diff File
mod - application/libraries/admin/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/libraries/jsonRPCClient.php Diff File
mod - application/libraries/jsonRPCServer.php Diff File
mod - application/models/ExpressionError.php Diff File
mod - application/models/FailedLoginAttempt.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/Label.php Diff File
mod - application/models/LabelSet.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/ParticipantAttributeNameLang.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/Quota.php Diff File
mod - application/models/SavedControl.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/SurveyTimingDynamic.php Diff File
mod - application/models/Surveymenu.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/TemplateConfig.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/models/TutorialEntry.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/tests/unit/ExpressionManagerTest.php Diff File