LimeSurvey: master 576b168c

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu master 2015-11-18 15:11 master 4d80388e
Changeset

Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git into master_fix-10001
mod - application/config/third_party.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/ExpressionValidate.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
add - application/controllers/admin/databaseupdate.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/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/ConsoleApplication.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/extensions/Menu/MenuWidget.php Diff File
mod - application/helpers/admin/activate_helper.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_manager_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/libraries/LSjsonRPCServer.php Diff File
mod - application/libraries/PluginManager/Question/QuestionBase.php Diff File
mod - application/models/Condition.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Response.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/participants/importCSV_view.php Diff File
mod - application/views/admin/quotas/viewquotasrow_view.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/tabPresentation_view.php Diff File
mod - application/views/admin/token/bounce.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/update/_ajaxVariables.php Diff File
mod - application/views/admin/update/_updateContainer.php Diff File
mod - application/views/admin/update/updater/_error.php Diff File
mod - application/views/admin/update/updater/steps/_change_log.php Diff File
mod - application/views/admin/update/updater/welcome/_error.php Diff File
mod - docs/release_notes.txt Diff File
rm - framework/CHANGELOG Diff
rm - framework/LICENSE Diff
rm - framework/README Diff
rm - framework/UPGRADE Diff
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
mod - framework/base/interfaces.php Diff File
mod - framework/caching/CApcCache.php Diff File
mod - framework/caching/CFileCache.php Diff File
mod - framework/caching/CRedisCache.php Diff File
mod - framework/cli/commands/MessageCommand.php Diff File
mod - framework/cli/commands/MigrateCommand.php Diff File
mod - framework/cli/commands/ShellCommand.php Diff File
mod - framework/cli/views/shell/crud/view.php Diff File
mod - framework/cli/views/webapp/protected/config/console.php Diff File
mod - framework/cli/views/webapp/protected/config/main.php Diff File
mod - framework/cli/views/webapp/protected/views/layouts/main.php Diff File
mod - framework/console/CConsoleApplication.php Diff File
mod - framework/console/CConsoleCommand.php Diff File
mod - framework/db/CDbCommand.php Diff File
mod - framework/db/CDbConnection.php Diff File
mod - framework/db/CDbMigration.php Diff File
mod - framework/db/ar/CActiveFinder.php Diff File
mod - framework/db/ar/CActiveRecord.php Diff File
mod - framework/db/ar/CActiveRecordBehavior.php Diff File
mod - framework/db/schema/CDbCommandBuilder.php Diff File
mod - framework/db/schema/CDbCriteria.php Diff File
mod - framework/db/schema/CDbSchema.php Diff File
mod - framework/db/schema/mssql/CMssqlCommandBuilder.php Diff File
mod - framework/db/schema/mssql/CMssqlSchema.php Diff File
mod - framework/db/schema/mysql/CMysqlCommandBuilder.php Diff File
mod - framework/db/schema/mysql/CMysqlSchema.php Diff File
mod - framework/db/schema/oci/COciCommandBuilder.php Diff File
mod - framework/db/schema/oci/COciSchema.php Diff File
mod - framework/db/schema/pgsql/CPgsqlColumnSchema.php Diff File
mod - framework/db/schema/pgsql/CPgsqlSchema.php Diff File
mod - framework/db/schema/sqlite/CSqliteSchema.php Diff File
mod - framework/gii/CCodeGenerator.php Diff File
mod - framework/gii/assets/js/tooltip.js Diff File
mod - framework/gii/components/Pear/Text/Diff.php Diff File
mod - framework/gii/components/Pear/Text/Diff/Mapped.php Diff File
mod - framework/gii/generators/controller/ControllerCode.php Diff File
mod - framework/gii/generators/crud/CrudCode.php Diff File
mod - framework/gii/generators/model/ModelCode.php Diff File
mod - framework/gii/generators/model/templates/default/model.php Diff File
mod - framework/gii/generators/module/ModuleCode.php Diff File
mod - framework/gii/views/common/code.php Diff File
mod - framework/i18n/CDateFormatter.php Diff File
mod - framework/i18n/CDbMessageSource.php Diff File
mod - framework/i18n/CGettextMessageSource.php Diff File
mod - framework/i18n/CLocale.php Diff File
mod - framework/i18n/data/README.txt Diff File
mod - framework/i18n/data/aa.php Diff File
mod - framework/i18n/data/aa_dj.php Diff File
mod - framework/i18n/data/aa_er.php Diff File
mod - framework/i18n/data/aa_et.php Diff File
mod - framework/i18n/data/af.php Diff File
mod - framework/i18n/data/af_na.php Diff File
mod - framework/i18n/data/af_za.php Diff File
mod - framework/i18n/data/agq.php Diff File
mod - framework/i18n/data/agq_cm.php Diff File
mod - framework/i18n/data/ak.php Diff File
mod - framework/i18n/data/ak_gh.php Diff File
mod - framework/i18n/data/am.php Diff File
mod - framework/i18n/data/am_et.php Diff File
mod - framework/i18n/data/ar.php Diff File
mod - framework/i18n/data/ar_001.php Diff File
mod - framework/i18n/data/ar_ae.php Diff File