LimeSurvey: 2.1 056a5bf0

Diff Back to Repository
Author Committer Branch Timestamp Parent
Aaron Schmitz Aaron Schmitz 2.1 2012-06-08 08:47:50 2.1 a0353d12
Changeset

Merge branch 'Yii' of github.com:LimeSurvey/LimeSurvey into Yii

Conflicts:
application/helpers/common_helper.php
application/helpers/qanda_helper.php
application/helpers/update/updatedb_helper.php
installer/sql/create-mssql.sql
installer/sql/create-mysql.sql
installer/sql/create-pgsql.sql

There's a bug in this merge somewhere. I'm gonna figure this out :p
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/participantsaction.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/qanda_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/modules/CheckQuestion.php Diff File
mod - application/modules/CommentCheckQuestion.php Diff File
mod - application/modules/DualRadioArrayQuestion.php Diff File
mod - application/modules/EquationQuestion.php Diff File
mod - application/modules/FileQuestion.php Diff File
mod - application/modules/FiveRadioArrayQuestion.php Diff File
mod - application/modules/IDRadioArrayQuestion.php Diff File
mod - application/modules/ListQuestion.php Diff File
mod - application/modules/MultinumericalQuestion.php Diff File
mod - application/modules/MultitextQuestion.php Diff File
mod - application/modules/NumberArrayQuestion.php Diff File
mod - application/modules/RadioArrayQuestion.php Diff File
mod - application/modules/SelectQuestion.php Diff File
mod - application/modules/TenRadioArrayQuestion.php Diff File
mod - application/modules/TextArrayQuestion.php Diff File
mod - application/modules/YNRadioArrayQuestion.php Diff File
mod - framework/db/schema/pgsql/CPgsqlSchema.php 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
mod - locale/_template/limesurvey.pot Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/cs/LC_MESSAGES/cs.po Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/it/LC_MESSAGES/it.po Diff File
mod - scripts/modaldialog.js Diff File