LimeSurvey: 2.2 f0ae71a4

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa 2.2 2013-01-12 15:34:26 2.2 b8a40ee1
Changeset

Merge branch '2.1' of github.com:LimeSurvey/LimeSurvey into 2.2

Conflicts:
application/views/admin/survey/subview/tabResourceManagement_view.php
add - application/commands/UpdatedbCommand.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/UserIdentity.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/exportresults_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/admin/token_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/helpers/viewHelper.php Diff File
mod - application/models/Assessment.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Survey_dynamic.php Diff File
mod - application/models/User.php Diff File
mod - application/modules/GenderQuestion.php Diff File
mod - application/views/admin/dataentry/insert.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/htmleditor/pop_editor_view.php Diff File
mod - application/views/admin/limeReplacementFields_view.php Diff File
mod - application/views/admin/participants/attributeMapCSV_view.php Diff File
mod - application/views/admin/responses/browseallheader_view.php Diff File
mod - application/views/admin/responses/browseallrow_view.php Diff File
mod - application/views/admin/responses/browsetimeheader_view.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/survey/prepareEditorScript_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/templates/importform_view.php Diff File
mod - application/views/admin/templates/templateeditor_printablesurvey_quesanswer_view.php Diff File
mod - application/views/admin/templates/templateeditor_printoutput_view.php Diff File
mod - application/views/admin/token/emailwarning.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - application/views/admin/translate/translateformheader_view.php Diff File
mod - application/views/admin/translate/translateheader_view.php Diff File
mod - application/views/admin/update/step4.php Diff File
mod - application/views/admin/user/personalsettings.php Diff File
mod - application/views/admin/user/setuserrights.php Diff File
mod - application/views/admin/user/setusertemplates.php Diff File
mod - application/views/admin/usergroup/usergroupbar_view.php Diff File
mod - application/views/statistics_user_view.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/af/LC_MESSAGES/af.mo Diff File
mod - locale/am/LC_MESSAGES/am.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
add - locale/ckb/LC_MESSAGES/ckb.mo Diff File
add - locale/ckb/LC_MESSAGES/index.html Diff File
add - locale/ckb/index.html Diff File
mod - locale/cs-informal/LC_MESSAGES/cs-informal.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-informal/LC_MESSAGES/de-informal.mo Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/el/LC_MESSAGES/el.mo Diff File
mod - locale/en/LC_MESSAGES/en.mo Diff File
mod - locale/es-CL/LC_MESSAGES/es-CL.mo Diff File
mod - locale/es-MX/LC_MESSAGES/es-MX.mo Diff File
mod - locale/es/LC_MESSAGES/es.mo Diff File
mod - locale/et/LC_MESSAGES/et.mo Diff File
mod - locale/eu/LC_MESSAGES/eu.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-informal/LC_MESSAGES/it-informal.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/nn/LC_MESSAGES/nn.mo Diff File
mod - locale/pa/LC_MESSAGES/pa.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/pt-BR/LC_MESSAGES/pt-BR.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-Latn/LC_MESSAGES/sr-Latn.mo Diff File
mod - locale/sr/LC_MESSAGES/sr.mo Diff File
mod - locale/sv/LC_MESSAGES/sv.mo Diff File
mod - locale/swh/LC_MESSAGES/swh.mo Diff File
mod - locale/th/LC_MESSAGES/th.mo Diff File
mod - locale/tr/LC_MESSAGES/tr.mo Diff File
mod - locale/uk/LC_MESSAGES/uk.mo Diff File
mod - locale/ur/LC_MESSAGES/ur.mo Diff File
mod - locale/vi/LC_MESSAGES/vi.mo Diff File
mod - locale/zh-Hans/LC_MESSAGES/zh-Hans.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
rm - scripts/admin/limereplacementfields/lang/de.js Diff File
rm - scripts/admin/limereplacementfields/lang/en.js Diff File
rm - scripts/admin/limereplacementfields/lang/fr.js Diff File
mod - scripts/admin/limereplacementfields/plugin.js Diff File
mod - scripts/admin/listsurvey.js Diff File
mod - scripts/admin/users.js Diff File
mod - styles/adminstyle.css Diff File
mod - styles/blobblueish/adminstyle.css Diff File
add - styles/blobblueish/images/statistics.gif Diff File
add - styles/gartergrey/images/statistics.gif Diff File
mod - styles/gringegreen/adminstyle.css Diff File
add - styles/gringegreen/images/statistics.gif Diff File
mod - styles/gringegreen/jquery-ui/jquery-ui.css Diff File