LimeSurvey: 2.06 feedf7ee

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa 2.06 2015-01-13 16:24 2.06 c7eb2c3f
Changeset

Merge branch '2.06' of github.com:LimeSurvey/LimeSurvey into 2.06temp

Conflicts:
application/core/db/SmartColumnTypeTrait.php
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/core/db/DbConnection.php Diff File
mod - application/core/db/MssqlSchema.php Diff File
mod - application/core/db/MysqlSchema.php Diff File
mod - application/core/db/PgsqlSchema.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveyLanguageSetting.php Diff File
mod - application/views/admin/survey/editSurvey_view.php Diff File
mod - application/views/admin/survey/newSurvey_view.php Diff File
mod - scripts/admin/surveysettings.js Diff File