LimeSurvey: master 76aac809

Diff Back to Repository
Author Committer Branch Timestamp Parent
trougakoss trougakoss master 2013-03-05 12:41:01 master 4c84c06e
Changeset

Merge remote-tracking branch 'upstream/master' into Yii
mod - .gitattributes Diff File
mod - .gitignore Diff File
add - application/commands/console.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/checkintegrity.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/export.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/printablesurvey.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/saved.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.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
add - application/core/ConsoleApplication.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/UserIdentity.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/exportresults_helper.php Diff File
mod - application/helpers/admin/htmleditor_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/common_helper.php Diff File
mod - application/helpers/database_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/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/sanitize_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/models/Conditions.php Diff File
mod - application/models/ParticipantAttributeNames.php Diff File
mod - application/models/Participants.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Surveys_languagesettings.php Diff File
mod - application/models/Tokens_dynamic.php Diff File
mod - application/models/User.php Diff File
mod - application/views/admin/dataentry/content_view.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/expressions/test/survey_logic_file.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/labels/labelview_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/participants/sharePanel_view.php Diff File
mod - application/views/admin/responses/browseidheader_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/subview/tabGeneralNewSurvey_view.php Diff File
mod - application/views/admin/survey/subview/tab_view.php Diff File
mod - application/views/admin/survey/surveySummary_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/token/csvupload.php Diff File
mod - application/views/admin/token/emailwarning.php Diff File
mod - application/views/admin/token/managetokenattributes.php Diff File
mod - application/views/admin/token/tokenbar.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - application/views/admin/update/step2.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - application/views/admin/usergroup/viewUserGroup_view.php Diff File
mod - application/views/statistics_user_view.php Diff File
mod - docs/demosurveys/Randomization_Group_Test.lss Diff File
mod - docs/demosurveys/ls2_EM_question_attributes.lss Diff File
mod - docs/demosurveys/ls2_countifop_sumifop.lss Diff File
mod - docs/demosurveys/ls2_em_tailoring.lss Diff File
mod - docs/demosurveys/ls2_em_validation_q.lss Diff File
mod - docs/demosurveys/ls2_self_and_that.lss Diff File
mod - docs/demosurveys/ls2_test_em_sq_validation.lss Diff File
mod - docs/license.txt 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/ckb/LC_MESSAGES/ckb.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/es/LC_MESSAGES/es.mo Diff File
mod - locale/et/LC_MESSAGES/et.mo Diff File
mod - locale/fi/LC_MESSAGES/fi.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/hu/LC_MESSAGES/hu.mo Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File
mod - locale/lt/LC_MESSAGES/lt.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
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/sr-Latn/LC_MESSAGES/sr-Latn.mo Diff File
mod - locale/sr/LC_MESSAGES/sr.mo Diff File
mod - locale/tr/LC_MESSAGES/tr.mo Diff File
mod - locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.mo Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/displayParticipant.js Diff File
mod - scripts/admin/emailtemplates.js Diff File
mod - scripts/admin/limereplacementfields/dialogs/limereplacementfields.js Diff File
mod - scripts/admin/listsurvey.js Diff File
mod - scripts/admin/sharePanel.js Diff File
mod - scripts/admin/surveysettings.js Diff File
mod - scripts/date.js Diff File
add - scripts/dualscale.js Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/ranking.js Diff File
mod - scripts/survey_runtime.js Diff File
mod - styles/gringegreen/jquery-ui/jquery-ui.css Diff File
mod - templates/citronade/template.css Diff File
mod - templates/default/template.css Diff File