LimeSurvey: master 350a0f4a

Author Committer Branch Timestamp Parent
mdekker mdekker master 2013-05-27 13:20:50 master d6b50f70
Changeset

Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git

add - application/commands/ResetPasswordCommand.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/printablesurvey.php Diff File
mod - application/controllers/admin/questiongroup.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LSYii_Validators.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/exportresults_helper.php Diff File
mod - application/helpers/admin/statistics_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_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
add - application/helpers/pdfHelper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/viewHelper.php Diff File
add - application/libraries/LSjsonRPCServer.php Diff File
mod - application/libraries/admin/pdf.php Diff File
mod - application/models/Tokens_dynamic.php Diff File
mod - application/models/User.php Diff File
mod - application/views/admin/dataentry/iteratesurvey.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/responses/browseallheader_view.php Diff File
mod - application/views/admin/responses/browsemenubar_view.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/subQuestion_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/csvpost.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ar/LC_MESSAGES/ar.mo Diff File
mod - locale/bg/LC_MESSAGES/bg.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/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/es-AR-informal/LC_MESSAGES/es-AR-informal.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/fi/LC_MESSAGES/fi.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/gl/LC_MESSAGES/gl.mo Diff File
mod - locale/hr/LC_MESSAGES/hr.mo Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File
mod - locale/lv/LC_MESSAGES/lv.mo Diff File
mod - locale/mn/LC_MESSAGES/mn.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
add - locale/oc/LC_MESSAGES/index.html Diff File
add - locale/oc/LC_MESSAGES/oc.mo Diff File
add - locale/oc/index.html 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/sk/LC_MESSAGES/sk.mo Diff File
mod - locale/sl/LC_MESSAGES/sl.mo Diff File
mod - locale/sr/LC_MESSAGES/sr.mo Diff File
mod - locale/sv/LC_MESSAGES/sv.mo Diff File
mod - locale/tr/LC_MESSAGES/tr.mo Diff File
mod - locale/uk/LC_MESSAGES/uk.mo Diff File
mod - locale/zh-Hans/LC_MESSAGES/zh-Hans.mo Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/jquery/lime-conditions-tabs.js Diff File
mod - scripts/ranking.js Diff File
mod - styles-public/ranking.css Diff File
add - styles/blobblueish/images/iterate_disabled.png Diff File
add - styles/blobblueish/images/takeownership.png Diff File
add - styles/gartergrey/images/iterate_disabled.png Diff File
add - styles/gartergrey/images/takeownership.png Diff File
add - styles/gringegreen/images/iterate_disabled.png Diff File
mod - templates/basic/ie_fix_7.css Diff File
mod - templates/basic/template.css Diff File
mod - templates/bluengrey/ie_fix_7.css Diff File
mod - templates/bluengrey/template.css Diff File
mod - templates/clear_logo/ie_fix_7.css Diff File
mod - templates/clear_logo/template.css Diff File
mod - templates/default/ie_fix_7.css Diff File
mod - templates/default/template.css Diff File
mod - templates/eirenicon/ie_fix_7.css Diff File
mod - templates/eirenicon/template.css Diff File
mod - templates/limespired/ie_fix_7.css Diff File
mod - templates/limespired/template.css Diff File
mod - templates/mint_idea/ie_fix_7.css Diff File
mod - templates/mint_idea/template.css Diff File
mod - templates/sherpa/ie_fix_7.css Diff File
mod - templates/sherpa/template.css Diff File
mod - templates/vallendar/ie_fix_7.css Diff File
mod - templates/vallendar/template.css Diff File