LimeSurvey: 2.1 0ae37bec

Diff Back to Repository
Author Committer Branch Timestamp Parent
user16774 user16774 2.1 2012-08-23 04:40:40 2.1 7fb6bbb5
Changeset

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

Conflicts:
application/controllers/admin/export.php
application/controllers/admin/question.php
application/controllers/admin/responses.php
application/helpers/SurveyRuntimeHelper.php
application/helpers/admin/import_helper.php
application/helpers/export_helper.php
application/helpers/expressions/em_manager_helper.php
application/helpers/qanda_helper.php
application/views/admin/responses/browseallrow_view.php
mod - application/config/email.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/question.php Diff File
mod - application/controllers/admin/quotas.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/export_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/surveytranslator_helper.php Diff File
mod - application/libraries/admin/pclzip/pclzip.php Diff File
mod - application/models/Participants.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Tokens_dynamic.php Diff File
mod - application/modules/CheckQuestion.php Diff File
mod - application/modules/FileQuestion.php Diff File
mod - application/modules/GenderQuestion.php Diff File
mod - application/modules/IDRadioArrayQuestion.php Diff File
mod - application/modules/QuestionModule.php Diff File
mod - application/modules/YNQuestion.php Diff File
mod - application/modules/YNRadioArrayQuestion.php Diff File
mod - application/views/admin/emailtemplates/emailtemplates_view.php Diff File
mod - application/views/admin/quotas/editquota_view.php Diff File
mod - application/views/admin/quotas/editquotalang_view.php Diff File
mod - application/views/admin/responses/browseallrow_view.php Diff File
mod - application/views/admin/survey/subview/tabImport_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
rm - images/cut.gif Diff File
add - images/delete.png Diff File
add - images/edit.png Diff File
mod - images/placeholder.png Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/de-informal/LC_MESSAGES/de-informal.mo Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.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/pt/LC_MESSAGES/pt.mo Diff File
add - locale/swh/LC_MESSAGES/index.html Diff File
add - locale/swh/LC_MESSAGES/swh.mo Diff File
add - locale/swh/index.html Diff File
add - scripts/admin/tokenbounce.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - scripts/modaldialog.js Diff File
rm - tmp/uploads/index.html Diff File