LimeSurvey: 2.1 1f117b6a

Diff Back to Repository
Author Committer Branch Timestamp Parent
user16774 user16774 2.1 2012-08-15 14:41:25 2.1 5b6d1cc9
Changeset

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

Conflicts:
application/controllers/admin/dataentry.php
application/helpers/common_helper.php
application/helpers/expressions/em_manager_helper.php
application/helpers/qanda_helper.php
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/models/ParticipantAttributeNames.php Diff File
mod - application/modules/RankingQuestion.php Diff File
mod - application/views/admin/participants/attributeMapToken_view.php Diff File
mod - application/views/admin/participants/attributeMap_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/responses/browseallheader_view.php Diff File
mod - application/views/admin/survey/subview/tabGeneralNewSurvey_view.php Diff File
mod - application/views/admin/translate/translatetabs_view.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/af/LC_MESSAGES/af.mo Diff File
mod - locale/ar/LC_MESSAGES/ar.mo Diff File
mod - locale/be/LC_MESSAGES/be.mo Diff File
mod - locale/bg/LC_MESSAGES/bg.mo Diff File
mod - locale/bs/LC_MESSAGES/bs.mo Diff File
mod - locale/ca/LC_MESSAGES/ca.mo Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/cy/LC_MESSAGES/cy.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/es/LC_MESSAGES/es.mo Diff File
mod - locale/et/LC_MESSAGES/et.mo Diff File
mod - locale/fa/LC_MESSAGES/fa.mo Diff File
mod - locale/fi/LC_MESSAGES/fi.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/ga/LC_MESSAGES/ga.mo Diff File
mod - locale/gl/LC_MESSAGES/gl.mo Diff File
mod - locale/he/LC_MESSAGES/he.mo Diff File
mod - locale/hi/LC_MESSAGES/hi.mo Diff File
mod - locale/hr/LC_MESSAGES/hr.mo Diff File
mod - locale/hu/LC_MESSAGES/hu.mo Diff File
mod - locale/id/LC_MESSAGES/id.mo Diff File
mod - locale/is/LC_MESSAGES/is.mo Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File
mod - locale/ko/LC_MESSAGES/ko.mo Diff File
mod - locale/lt/LC_MESSAGES/lt.mo Diff File
mod - locale/lv/LC_MESSAGES/lv.mo Diff File
mod - locale/mk/LC_MESSAGES/mk.mo Diff File
mod - locale/ms/LC_MESSAGES/ms.mo Diff File
mod - locale/mt/LC_MESSAGES/mt.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/nl-informal/LC_MESSAGES/nl-informal.mo Diff File
mod - locale/nl/LC_MESSAGES/nl.mo Diff File
mod - locale/pa/LC_MESSAGES/pa.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/pt/LC_MESSAGES/pt.mo Diff File
mod - locale/ro/LC_MESSAGES/ro.mo Diff File
mod - locale/ru/LC_MESSAGES/ru.mo Diff File
mod - locale/si/LC_MESSAGES/si.mo Diff File
mod - locale/sk/LC_MESSAGES/sk.mo Diff File
mod - locale/sl/LC_MESSAGES/sl.mo Diff File
mod - locale/sq/LC_MESSAGES/sq.mo Diff File
mod - locale/sr/LC_MESSAGES/sr.mo Diff File
mod - locale/sv/LC_MESSAGES/sv.mo Diff File
mod - locale/th/LC_MESSAGES/th.mo Diff File
mod - locale/tr/LC_MESSAGES/tr.mo Diff File
mod - locale/ur/LC_MESSAGES/ur.mo Diff File
mod - locale/vi/LC_MESSAGES/vi.mo Diff File
mod - locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.mo Diff File
mod - locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.mo Diff File
add - scripts/jquery/jquery.actual/LICENSE.txt Diff File
add - scripts/jquery/jquery.actual/jquery.actual.js Diff File
add - scripts/jquery/jquery.actual/jquery.actual.min.js Diff File
mod - scripts/ranking.js Diff File