LimeSurvey: 2.1 63d5e33c

Diff Back to Repository
Author Committer Branch Timestamp Parent
user16774 user16774 2.1 2012-09-11 12:12 2.1 dba8b8ae
Changeset

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

Conflicts:
application/controllers/admin/remotecontrol.php
application/views/admin/quotas/newanswererror_view.php
application/views/admin/survey/importSurvey_view.php
mod - .gitignore Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/models/Participants.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/participants/importCSV_view.php Diff File
mod - application/views/admin/quotas/newanswererror_view.php Diff File
mod - application/views/admin/survey/copySurvey_view.php Diff File
mod - application/views/admin/survey/importSurvey_view.php Diff File
mod - locale/_template/limesurvey.pot Diff File
add - locale/cs-informal/LC_MESSAGES/cs-informal.mo Diff File
add - locale/cs-informal/LC_MESSAGES/index.html Diff File
add - locale/cs-informal/index.html Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/da/LC_MESSAGES/da.mo Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/el/LC_MESSAGES/el.mo Diff File
mod - locale/et/LC_MESSAGES/et.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/hu/LC_MESSAGES/hu.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/ru/LC_MESSAGES/ru.mo Diff File
mod - locale/sr/LC_MESSAGES/sr.mo Diff File
mod - locale/swh/LC_MESSAGES/swh.mo Diff File
mod - locale/tr/LC_MESSAGES/tr.mo Diff File
mod - scripts/modaldialog.js Diff File