LimeSurvey: 2.1 f86fda4d

Diff Back to Repository
Author Committer Branch Timestamp Parent
user16774 user16774 2.1 2012-08-18 16:12 2.1 c50a42d2
Changeset

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

Conflicts:
application/config/version.php
application/controllers/survey/index.php
application/helpers/admin/import_helper.php
application/helpers/frontend_helper.php
application/models/Conditions.php
mod - application/config/version.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/libraries/admin/excel/excel_reader2.php Diff File
mod - application/models/Conditions.php Diff File
mod - application/views/admin/checkintegrity/check_view.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/participants/participantsPanel_view.php Diff File
mod - application/views/installer/success_view.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/th/LC_MESSAGES/th.mo Diff File
mod - tmp/.gitignore Diff File