LimeSurvey: 2.06 b5142e78

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz 2.06 2014-10-24 01:50 2.06 b74d0f68
Changeset

Merge branch 'master' into 2.06

Conflicts:
application/config/internal.php
application/controllers/InstallerController.php
application/controllers/OptoutController.php
application/controllers/admin/checkintegrity.php
application/controllers/admin/conditionsaction.php
application/controllers/admin/globalsettings.php
application/controllers/admin/labels.php
application/controllers/admin/participantsaction.php
application/controllers/admin/printablesurvey.php
application/controllers/admin/surveyadmin.php
application/controllers/admin/tokens.php
application/controllers/admin/translate.php
application/controllers/admin/update.php
application/controllers/admin/useraction.php
application/extensions/SettingsWidget/SettingsWidget.php
application/helpers/admin/import_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/models/Token.php
application/models/TokenDynamic.php
application/views/admin/checkintegrity/check_view.php
application/views/admin/emailtemplates/email_language_template_tab.php
application/views/admin/export/exportresults_view.php
application/views/admin/labels/labelbar_view.php
application/views/admin/labels/labelsetsbar_view.php
application/views/admin/labels/labelview_view.php
application/views/admin/participants/attributeControl_view.php
application/views/admin/participants/displayParticipants_view.php
application/views/admin/survey/Question/answerOptions_view.php
application/views/admin/survey/Question/subQuestion_view.php
application/views/admin/survey/deactivateSurvey_view.php
application/views/admin/survey/editSurvey_view.php
application/views/admin/survey/subview/tabNotification_view.php
application/views/admin/survey/subview/tabTokens_view.php
application/views/admin/token/csvpost.php
application/views/admin/token/email.php
application/views/admin/token/tokenbar.php
application/views/admin/token/tokenform.php
application/views/admin/token/tokensummary.php
application/views/admin/translate/translateformheader_view.php
application/views/admin/translate/translatetabs_view.php
application/views/installer/dbconfig_view.php
application/views/installer/precheck_view.php
application/views/surveys/publicSurveyList.php
installer/sql/create-mssql.sql
locale/_template/limesurvey.pot
locale/ar/LC_MESSAGES/ar.mo
locale/cs-informal/LC_MESSAGES/cs-informal.mo
locale/cs/LC_MESSAGES/cs.mo
locale/de-informal/LC_MESSAGES/de-informal.mo
locale/de/LC_MESSAGES/de.mo
locale/el/LC_MESSAGES/el.mo
locale/es-MX/LC_MESSAGES/es-MX.mo
locale/es/LC_MESSAGES/es.mo
locale/et/LC_MESSAGES/et.mo
locale/fi/LC_MESSAGES/fi.mo
locale/fr/LC_MESSAGES/fr.mo
locale/hr/LC_MESSAGES/hr.mo
locale/hu/LC_MESSAGES/hu.mo
locale/id/LC_MESSAGES/id.mo
locale/it-informal/LC_MESSAGES/it-informal.mo
locale/it/LC_MESSAGES/it.mo
locale/ja/LC_MESSAGES/ja.mo
locale/ka/LC_MESSAGES/ka.mo
locale/lt/LC_MESSAGES/lt.mo
locale/lv/LC_MESSAGES/lv.mo
locale/ms/LC_MESSAGES/ms.mo
locale/nb/LC_MESSAGES/nb.mo
locale/nl-informal/LC_MESSAGES/nl-informal.mo
locale/nl/LC_MESSAGES/nl.mo
locale/nn/LC_MESSAGES/nn.mo
locale/pl/LC_MESSAGES/pl.mo
locale/pt/LC_MESSAGES/pt.mo
locale/ru/LC_MESSAGES/ru.mo
locale/sv/LC_MESSAGES/sv.mo
locale/th/LC_MESSAGES/th.mo
locale/tr/LC_MESSAGES/tr.mo
locale/uk/LC_MESSAGES/uk.mo
locale/zh-Hans/LC_MESSAGES/zh-Hans.mo
locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.mo
locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.mo
mod - .gitignore Diff File
mod - application/commands/InstallCommand.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/config-sample-mysql.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/tcpdf.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/OptoutController.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/export.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/printablesurvey.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/translate.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/LSYii_CaseValidator.php Diff File
mod - application/core/LSYii_EmailIDNAValidator.php Diff File
mod - application/core/LSYii_Validators.php Diff File
mod - application/core/plugins/Authwebserver/Authwebserver.php Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.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/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/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/remotecontrol/remotecontrol_handle.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/pdf.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/Session.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/tests/unit/ExpressionManagerTest.php Diff File
rm - application/third_party/tcpdf/2dbarcodes.php Diff
mod - application/third_party/tcpdf/CHANGELOG.TXT Diff File
mod - application/third_party/tcpdf/LICENSE.TXT Diff File
mod - application/third_party/tcpdf/README.TXT Diff File
rm - application/third_party/tcpdf/barcodes.php Diff
rm - application/third_party/tcpdf/cache/chapter_demo_1.txt Diff
rm - application/third_party/tcpdf/cache/chapter_demo_2.txt Diff
rm - application/third_party/tcpdf/cache/table_data_demo.txt Diff
rm - application/third_party/tcpdf/cache/utf8test.txt Diff
add - application/third_party/tcpdf/composer.json Diff File
rm - application/third_party/tcpdf/config/lang/afr.php Diff
rm - application/third_party/tcpdf/config/lang/ara.php Diff
rm - application/third_party/tcpdf/config/lang/aze.php Diff
rm - application/third_party/tcpdf/config/lang/bel.php Diff
rm - application/third_party/tcpdf/config/lang/bra.php Diff
rm - application/third_party/tcpdf/config/lang/cat.php Diff
rm - application/third_party/tcpdf/config/lang/ces.php Diff
rm - application/third_party/tcpdf/config/lang/chi.php Diff
rm - application/third_party/tcpdf/config/lang/cym.php Diff
rm - application/third_party/tcpdf/config/lang/dan.php Diff
rm - application/third_party/tcpdf/config/lang/eng.php Diff
rm - application/third_party/tcpdf/config/lang/est.php Diff
rm - application/third_party/tcpdf/config/lang/eus.php Diff
rm - application/third_party/tcpdf/config/lang/far.php Diff
rm - application/third_party/tcpdf/config/lang/fra.php Diff
rm - application/third_party/tcpdf/config/lang/ger.php Diff
rm - application/third_party/tcpdf/config/lang/gle.php Diff
rm - application/third_party/tcpdf/config/lang/glg.php Diff
rm - application/third_party/tcpdf/config/lang/hat.php Diff
rm - application/third_party/tcpdf/config/lang/heb.php Diff
rm - application/third_party/tcpdf/config/lang/hrv.php Diff
rm - application/third_party/tcpdf/config/lang/hun.php Diff
rm - application/third_party/tcpdf/config/lang/hye.php Diff
rm - application/third_party/tcpdf/config/lang/ind.php Diff
rm - application/third_party/tcpdf/config/lang/ita.php Diff
rm - application/third_party/tcpdf/config/lang/kat.php Diff
rm - application/third_party/tcpdf/config/lang/kor.php Diff
rm - application/third_party/tcpdf/config/lang/mkd.php Diff
rm - application/third_party/tcpdf/config/lang/mlt.php Diff
rm - application/third_party/tcpdf/config/lang/msa.php Diff
rm - application/third_party/tcpdf/config/lang/nld.php Diff
rm - application/third_party/tcpdf/config/lang/nob.php Diff
rm - application/third_party/tcpdf/config/lang/pol.php Diff
rm - application/third_party/tcpdf/config/lang/por.php Diff
rm - application/third_party/tcpdf/config/lang/ron.php Diff
rm - application/third_party/tcpdf/config/lang/rus.php Diff
rm - application/third_party/tcpdf/config/lang/slv.php Diff
rm - application/third_party/tcpdf/config/lang/spa.php Diff
rm - application/third_party/tcpdf/config/lang/sqi.php Diff
rm - application/third_party/tcpdf/config/lang/srp.php Diff
rm - application/third_party/tcpdf/config/lang/swa.php Diff
rm - application/third_party/tcpdf/config/lang/swe.php Diff
rm - application/third_party/tcpdf/config/lang/urd.php Diff
rm - application/third_party/tcpdf/config/lang/yid.php Diff
rm - application/third_party/tcpdf/config/lang/zho.php Diff
mod - application/third_party/tcpdf/config/tcpdf_config.php Diff File
rm - application/third_party/tcpdf/config/tcpdf_config_alt.php Diff
rm - application/third_party/tcpdf/datamatrix.php Diff
rm - application/third_party/tcpdf/encodings_maps.php Diff
rm - application/third_party/tcpdf/fonts/README.TXT Diff
rm - application/third_party/tcpdf/fonts/ZarBold.ctg.z Diff
rm - application/third_party/tcpdf/fonts/ZarBold.z Diff
add - application/third_party/tcpdf/fonts/ae_fonts_2.0/ChangeLog Diff File
add - application/third_party/tcpdf/fonts/ae_fonts_2.0/README Diff File
mod - application/third_party/tcpdf/fonts/aealarabiya.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/aealarabiya.php Diff File
mod - application/third_party/tcpdf/fonts/aealarabiya.z Diff File
mod - application/third_party/tcpdf/fonts/aefurat.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/aefurat.php Diff File
mod - application/third_party/tcpdf/fonts/aefurat.z Diff File
rm - application/third_party/tcpdf/fonts/almohanad.ctg.z Diff
rm - application/third_party/tcpdf/fonts/almohanad.php Diff
rm - application/third_party/tcpdf/fonts/almohanad.z Diff
rm - application/third_party/tcpdf/fonts/arialunicid0.php Diff
rm - application/third_party/tcpdf/fonts/chinese.php Diff
mod - application/third_party/tcpdf/fonts/cid0cs.php Diff File
mod - application/third_party/tcpdf/fonts/cid0ct.php Diff File
mod - application/third_party/tcpdf/fonts/cid0jp.php Diff File
mod - application/third_party/tcpdf/fonts/cid0kr.php Diff File
rm - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.27/AUTHORS Diff
rm - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.27/BUGS Diff
rm - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.27/LICENSE Diff
rm - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.27/NEWS Diff
rm - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.27/README Diff
rm - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.27/langcover.txt Diff
rm - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.27/status.txt Diff
rm - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.27/unicover.txt Diff
rm - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.30/AUTHORS Diff
rm - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.30/BUGS Diff
rm - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.30/LICENSE Diff
rm - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.30/NEWS Diff
rm - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.30/README Diff
rm - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.30/langcover.txt Diff
rm - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.30/status.txt Diff
rm - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.30/unicover.txt Diff
mod - application/third_party/tcpdf/fonts/dejavusans.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusans.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusans.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusansb.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusansb.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusansb.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusansbi.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusansbi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusansbi.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusanscondensed.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusanscondensed.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusanscondensed.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusanscondensedb.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusanscondensedb.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusanscondensedb.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusanscondensedbi.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusanscondensedbi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusanscondensedbi.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusanscondensedi.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusanscondensedi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusanscondensedi.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusansextralight.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusansextralight.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusansextralight.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusansi.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusansi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusansi.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusansmono.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusansmono.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusansmono.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusansmonob.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusansmonob.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusansmonob.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusansmonobi.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusansmonobi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusansmonobi.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusansmonoi.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavusansmonoi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusansmonoi.z Diff File
mod - application/third_party/tcpdf/fonts/dejavuserif.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavuserif.php Diff File
mod - application/third_party/tcpdf/fonts/dejavuserif.z Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifb.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifb.php Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifb.z Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifbi.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifbi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifbi.z Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifcondensed.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifcondensed.php Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifcondensed.z Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifcondensedb.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifcondensedb.php Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifcondensedb.z Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifcondensedbi.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifcondensedbi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifcondensedbi.z Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifcondensedi.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifcondensedi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifcondensedi.z Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifi.ctg.z Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifi.z Diff File
rm - application/third_party/tcpdf/fonts/freefont-20080323/AUTHORS Diff
rm - application/third_party/tcpdf/fonts/freefont-20080323/CREDITS Diff
rm - application/third_party/tcpdf/fonts/freefont-20080323/ChangeLog Diff
rm - application/third_party/tcpdf/fonts/freefont-20080323/INSTALL Diff
rm - application/third_party/tcpdf/fonts/freefont-20080323/README Diff
rm - application/third_party/tcpdf/fonts/freefont-20090104/AUTHORS Diff
rm - application/third_party/tcpdf/fonts/freefont-20090104/COPYING Diff
rm - application/third_party/tcpdf/fonts/freefont-20090104/CREDITS Diff
rm - application/third_party/tcpdf/fonts/freefont-20090104/ChangeLog Diff
rm - application/third_party/tcpdf/fonts/freefont-20090104/INSTALL Diff
rm - application/third_party/tcpdf/fonts/freefont-20090104/README Diff
rm - application/third_party/tcpdf/fonts/freefont-20100919/AUTHORS Diff
rm - application/third_party/tcpdf/fonts/freefont-20100919/COPYING Diff
rm - application/third_party/tcpdf/fonts/freefont-20100919/CREDITS Diff
rm - application/third_party/tcpdf/fonts/freefont-20100919/ChangeLog Diff
rm - application/third_party/tcpdf/fonts/freefont-20100919/INSTALL Diff
rm - application/third_party/tcpdf/fonts/freefont-20100919/README Diff
add - application/third_party/tcpdf/fonts/freefont-20120503/AUTHORS Diff File
add - application/third_party/tcpdf/fonts/freefont-20120503/COPYING Diff File
add - application/third_party/tcpdf/fonts/freefont-20120503/CREDITS Diff File
add - application/third_party/tcpdf/fonts/freefont-20120503/ChangeLog Diff File
add - application/third_party/tcpdf/fonts/freefont-20120503/INSTALL Diff File
add - application/third_party/tcpdf/fonts/freefont-20120503/README Diff File
add - application/third_party/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING Diff File
add - application/third_party/tcpdf/fonts/freefont-20120503/USAGE Diff File
rm - application/third_party/tcpdf/fonts/unifont.ctg.z Diff
rm - application/third_party/tcpdf/fonts/unifont.php Diff
rm - application/third_party/tcpdf/fonts/unifont.z Diff
rm - application/third_party/tcpdf/fonts/utils/README.TXT Diff
rm - application/third_party/tcpdf/fonts/utils/enc/cp1250.map Diff
rm - application/third_party/tcpdf/fonts/utils/enc/cp1251.map Diff