LimeSurvey: 2.1 0674cadc

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz 2.1 2012-10-26 06:00:47 2.1 e347c654
Changeset

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

Conflicts:
application/controllers/Statistics_userController.php
application/controllers/UploaderController.php
application/controllers/admin/database.php
application/controllers/admin/export.php
application/controllers/admin/remotecontrol.php
application/controllers/admin/responses.php
application/controllers/admin/statistics.php
application/controllers/admin/templates.php
application/core/LSYii_Controller.php
application/helpers/SurveyRuntimeHelper.php
application/helpers/admin/activate_helper.php
application/helpers/admin/exportresults_helper.php
application/helpers/admin/statistics_helper.php
application/helpers/admin/token_helper.php
application/helpers/common_helper.php
application/helpers/expressions/em_manager_helper.php
application/helpers/frontend_helper.php
application/helpers/qanda_helper.php
application/libraries/admin/pdf.php
application/models/Survey.php
application/models/Tokens_dynamic.php
mod - application/commands/InstallCommand.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.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/export.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/question.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/templates.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_Controller.php Diff File
mod - application/core/LSYii_Validators.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/activate_helper.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/import_helper.php Diff File
mod - application/helpers/admin/token_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
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/libraries/admin/pdf.php Diff File
mod - application/libraries/jsonRPCClient.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Survey_dynamic.php Diff File
mod - application/models/Survey_links.php Diff File
mod - application/models/Survey_timings.php Diff File
mod - application/models/Surveys_languagesettings.php Diff File
mod - application/models/Tokens_dynamic.php Diff File
rm - application/third_party/tcpdf/extensiontcpdf.php Diff File
rm - application/third_party/tcpdf/mypdf.php Diff File
mod - application/views/admin/expressions/test/survey_logic_file.php Diff File
mod - application/views/admin/expressions/test_view.php Diff File
mod - application/views/admin/limeReplacementFields_view.php Diff File
mod - application/views/admin/participants/attributeControl_view.php Diff File
mod - application/views/admin/participants/blacklist_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/participants/userControl_view.php Diff File
mod - application/views/admin/responses/browseallfiltered_view.php Diff File
mod - application/views/admin/responses/browseallheader_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/addGroup_view.php Diff File
mod - application/views/admin/templates/templatesummary_view.php Diff File
mod - application/views/admin/token/dummytokenform.php Diff File
mod - application/views/admin/token/emailpost.php Diff File
mod - application/views/admin/token/emailwarning.php Diff File
mod - application/views/installer/dbconfig_view.php Diff File
mod - application/views/installer/dbsettings_view.php Diff File
mod - application/views/installer/license_view.php Diff File
mod - application/views/installer/optconfig_view.php Diff File
mod - application/views/installer/precheck_view.php Diff File
mod - application/views/installer/sidebar_view.php Diff File
mod - application/views/installer/success_view.php Diff File
mod - application/views/installer/welcome_view.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/am/LC_MESSAGES/am.mo Diff File
mod - locale/cs/LC_MESSAGES/cs.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/fr/LC_MESSAGES/fr.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/nb/LC_MESSAGES/nb.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/ru/LC_MESSAGES/ru.mo Diff File
mod - locale/sk/LC_MESSAGES/sk.mo Diff File
add - locale/sr-Latn/LC_MESSAGES/index.html Diff File
add - locale/sr-Latn/LC_MESSAGES/sr-Latn.mo Diff File
add - locale/sr-Latn/index.html Diff File
mod - locale/sr/LC_MESSAGES/sr.mo Diff File
mod - locale/tr/LC_MESSAGES/tr.mo Diff File
mod - scripts/admin/attributeControl.js Diff File
mod - scripts/admin/browse.js Diff File
mod - scripts/admin/ckeditor-config.js Diff File
mod - scripts/admin/displayParticipant.js Diff File
mod - scripts/admin/limereplacementfields/dialogs/limereplacementfields.js Diff File
mod - scripts/admin/surveysettings.js Diff File
mod - scripts/admin/tokens.js Diff File
add - scripts/jquery/locale/jquery.ui.datepicker-sr-Latn.js Diff File
mod - scripts/modaldialog.js Diff File
mod - scripts/ranking.js Diff File
mod - styles/blobblueish/adminstyle.css Diff File
mod - styles/blobblueish/jquery-ui/jquery-ui.css Diff File
mod - styles/blobblueish/superfish.css Diff File
mod - styles/gartergrey/jquery-ui/jquery-ui.css Diff File
mod - styles/gringegreen/images/quality_assurance.png Diff File
mod - styles/gringegreen/jquery-ui/jquery-ui.css Diff File
add - third_party/ckeditor/skins/ls-office2003/dialog.css Diff File
add - third_party/ckeditor/skins/ls-office2003/editor.css Diff File
add - third_party/ckeditor/skins/ls-office2003/icons.png Diff File
add - third_party/ckeditor/skins/ls-office2003/icons_rtl.png Diff File
add - third_party/ckeditor/skins/ls-office2003/images/dialog_sides.gif Diff File
add - third_party/ckeditor/skins/ls-office2003/images/dialog_sides.png Diff File
add - third_party/ckeditor/skins/ls-office2003/images/dialog_sides_rtl.png Diff File
add - third_party/ckeditor/skins/ls-office2003/images/mini.gif Diff File
add - third_party/ckeditor/skins/ls-office2003/images/noimage.png Diff File
add - third_party/ckeditor/skins/ls-office2003/images/sprites.png Diff File
add - third_party/ckeditor/skins/ls-office2003/images/sprites_ie6.png Diff File
add - third_party/ckeditor/skins/ls-office2003/skin.js Diff File
add - third_party/ckeditor/skins/ls-office2003/templates.css Diff File