LimeSurvey: master 55b85756

Diff Back to Repository
Author Committer Branch Timestamp Parent
jweberhofer jweberhofer master 2015-12-21 11:55:23 master c41466cd
Changeset

Merge error_on_update_fixKCFinder184
mod - application/commands/InstallCommand.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/updater_version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/PluginsController.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/ExpressionValidate.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
add - application/controllers/admin/databaseupdate.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/limereplacementfields.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/remotecontrol.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/saved.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/controllers/admin/usergroups.php Diff File
mod - application/core/ConsoleApplication.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/db/MysqlSchema.php Diff File
mod - application/core/db/PgsqlSchema.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/plugins/ExportSTATAxml/ExportSTATAxml.php Diff File
rm - application/extensions/ExtendedClientScript/ExtendedClientScript.php Diff File
rm - application/extensions/ExtendedClientScript/cssmin/cssmin.php Diff File
rm - application/extensions/ExtendedClientScript/jsmin/JSMin.php Diff File
mod - application/extensions/Menu/MenuWidget.php Diff File
mod - application/extensions/bootstrap/assets/css/bootstrap.css Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/export/Writer.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/token_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/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/LSjsonRPCServer.php Diff File
mod - application/libraries/PluginManager/AuthPluginBase.php Diff File
mod - application/libraries/PluginManager/Question/QuestionBase.php Diff File
mod - application/models/Condition.php Diff File
mod - application/models/LSActiveRecord.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/Response.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/views/admin/assessments_view.php Diff File
mod - application/views/admin/dataentry/caption_view.php Diff File
mod - application/views/admin/global_settings/_presentation.php Diff File
mod - application/views/admin/global_settings/_security.php Diff File
mod - application/views/admin/htmleditor/pop_editor_view.php Diff File
mod - application/views/admin/htmleditor/pop_nofields_view.php Diff File
mod - application/views/admin/labels/editlabel_view.php Diff File
mod - application/views/admin/labels/labelview_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/participants/importCSV_view.php Diff File
mod - application/views/admin/participants/viewAttribute_view.php Diff File
mod - application/views/admin/quotas/viewquotasrow_view.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/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/token/bounce.php Diff File
mod - application/views/admin/token/emailwarning.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/token/tokenbar.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - application/views/admin/update/_ajaxVariables.php Diff File
mod - application/views/admin/update/_updateContainer.php Diff File
mod - application/views/admin/update/_update_notification.php Diff File
mod - application/views/admin/update/check_updates/_checkButtons.php Diff File
mod - application/views/admin/update/updater/_error.php Diff File
mod - application/views/admin/update/updater/steps/_backup.php Diff File
mod - application/views/admin/update/updater/steps/_change_log.php Diff File
mod - application/views/admin/update/updater/steps/_check_local_errors.php Diff File
mod - application/views/admin/update/updater/steps/textaeras/_existingfiles.php Diff File
mod - application/views/admin/update/updater/steps/textaeras/_modifiedfiles.php Diff File
mod - application/views/admin/update/updater/welcome/_error.php Diff File
mod - application/views/admin/update/updater/welcome/_key_updated.php Diff File
mod - application/views/admin/update/updater/welcome/_subscribe.php Diff File
mod - application/views/admin/update/updater/welcome/_welcome.php Diff File
mod - application/views/installer/precheck_view.php Diff File
mod - application/views/plugins/index.php Diff File
mod - docs/demosurveys/ls205_sample_survey_multilingual.lss Diff File
mod - docs/release_notes.txt Diff File
rm - framework/CHANGELOG Diff File
rm - framework/LICENSE Diff File
rm - framework/README Diff File
rm - framework/UPGRADE Diff File
mod - framework/YiiBase.php Diff File
mod - framework/base/CApplication.php Diff File
mod - framework/base/CComponent.php Diff File
mod - framework/base/CErrorHandler.php Diff File
mod - framework/base/CModel.php Diff File
mod - framework/base/CModule.php Diff File
mod - framework/base/CSecurityManager.php Diff File