LimeSurvey: 2.1 29ae6bec

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz 2.1 2012-10-16 08:56 2.1 2ecc3e29
Changeset

Merge remote-tracking branch 'origin/master' into 2.1

Conflicts:
application/config/config-sample.php
application/controllers/Statistics_userController.php
application/controllers/UploaderController.php
application/controllers/admin/conditionsaction.php
application/controllers/admin/database.php
application/controllers/admin/dataentry.php
application/controllers/admin/printablesurvey.php
application/controllers/admin/remotecontrol.php
application/controllers/admin/tokens.php
application/controllers/admin/translate.php
application/controllers/survey/index.php
application/core/Survey_Common_Action.php
application/helpers/admin/exportresults_helper.php
application/helpers/admin/import_helper.php
application/helpers/admin/statistics_helper.php
application/helpers/export_helper.php
application/helpers/expressions/em_manager_helper.php
application/helpers/frontend_helper.php
application/helpers/qanda_helper.php
application/models/Groups.php
application/models/InstallerConfigForm.php
application/models/Questions.php
application/models/Survey_url_parameters.php
application/models/Tokens_dynamic.php
application/models/User_groups.php
application/models/User_in_groups.php
application/views/admin/export/exportresults_view.php
application/views/admin/token/actions.php
installer/sql/create-mssql.sql
installer/sql/create-mysql.sql
installer/sql/create-pgsql.sql
add - application/commands/InstallCommand.php Diff File
add - application/commands/starter.php Diff File
mod - application/config/config-sample.php Diff File
mod - application/config/routes.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/UploaderController.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/dumpdb.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/printablesurvey.php Diff File
mod - application/controllers/admin/question.php Diff File
mod - application/controllers/admin/questiongroup.php Diff File
mod - application/controllers/admin/remotecontrol.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/tokens.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSYii_Application.php Diff File
add - 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/backupdb_helper.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_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/models/Groups.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/ParticipantAttributeNames.php Diff File
mod - application/models/Participants.php Diff File
mod - application/models/Questions.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Survey_permissions.php Diff File
mod - application/models/Survey_url_parameters.php Diff File
mod - application/models/Tokens_dynamic.php Diff File
mod - application/models/User_groups.php Diff File
mod - application/models/User_in_groups.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/htmleditor/pop_editor_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/editQuestion_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/editGroup_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/import_view.php Diff File
mod - application/views/admin/survey/listSurveys_view.php Diff File
mod - application/views/admin/survey/subview/tabResourceManagement_view.php Diff File
mod - application/views/admin/templates/importuploaded_view.php Diff File
mod - application/views/admin/templates/templateeditor_navigator_view.php Diff File
mod - application/views/admin/templates/templateeditor_question_answer_view.php Diff File
mod - application/views/admin/token/actions.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/email.php Diff File
mod - application/views/statistics_user_view.php Diff File
mod - docs/release_notes.txt Diff File
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - installer/sql/create-pgsql.sql 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/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/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-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/lv/LC_MESSAGES/lv.mo Diff File
mod - locale/ms/LC_MESSAGES/ms.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/nl/LC_MESSAGES/nl.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.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 - scripts/admin/globalsettings.js Diff File
mod - scripts/admin/listsurvey.js Diff File
add - scripts/admin/questions.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - scripts/date.js Diff File
add - scripts/statistics_user.js Diff File
mod - styles/blobblueish/adminstyle.css Diff File
mod - styles/blobblueish/superfish.css Diff File
mod - styles/gartergrey/adminstyle.css Diff File
mod - styles/gringegreen/adminstyle.css Diff File
mod - styles/gringegreen/superfish.css Diff File
mod - third_party/kcfinder/core/browser.php Diff File
mod - third_party/kcfinder/core/uploader.php Diff File