| Author |
Committer |
Branch |
Timestamp |
Parent |
| sammousa |
sammousa |
develop |
2015-01-27 16:32 |
develop 61e28170 |
|
|
Changeset |
Merge branch '2.06' of github.com:LimeSurvey/LimeSurvey into 2.06
Conflicts:
application/config/internal.php
application/controllers/SurveysController.php
application/controllers/admin/statistics.php
application/core/WebApplication.php
application/helpers/common_helper.php
application/libraries/Limesurvey_lang.php
application/third_party/phpmailer/LICENSE
application/third_party/phpmailer/class.phpmailer.php
application/third_party/phpmailer/class.smtp.php
application/third_party/phpmailer/language/phpmailer.lang-ar.php
application/third_party/phpmailer/language/phpmailer.lang-br.php
application/third_party/phpmailer/language/phpmailer.lang-ca.php
application/third_party/phpmailer/language/phpmailer.lang-ch.php
application/third_party/phpmailer/language/phpmailer.lang-cz.php
application/third_party/phpmailer/language/phpmailer.lang-de.php
application/third_party/phpmailer/language/phpmailer.lang-dk.php
application/third_party/phpmailer/language/phpmailer.lang-es.php
application/third_party/phpmailer/language/phpmailer.lang-et.php
application/third_party/phpmailer/language/phpmailer.lang-fi.php
application/third_party/phpmailer/language/phpmailer.lang-fo.php
application/third_party/phpmailer/language/phpmailer.lang-fr.php
application/third_party/phpmailer/language/phpmailer.lang-hu.php
application/third_party/phpmailer/language/phpmailer.lang-it.php
application/third_party/phpmailer/language/phpmailer.lang-ja.php
application/third_party/phpmailer/language/phpmailer.lang-nl.php
application/third_party/phpmailer/language/phpmailer.lang-no.php
application/third_party/phpmailer/language/phpmailer.lang-pl.php
application/third_party/phpmailer/language/phpmailer.lang-ro.php
application/third_party/phpmailer/language/phpmailer.lang-ru.php
application/third_party/phpmailer/language/phpmailer.lang-se.php
application/third_party/phpmailer/language/phpmailer.lang-tr.php
application/third_party/phpmailer/language/phpmailer.lang-zh.php
application/third_party/phpmailer/language/phpmailer.lang-zh_cn.php
application/third_party/tcpdf/CHANGELOG.TXT
application/third_party/tcpdf/LICENSE.TXT
application/third_party/tcpdf/README.TXT
application/third_party/tcpdf/config/tcpdf_config.php
application/third_party/tcpdf/fonts/aealarabiya.ctg.z
application/third_party/tcpdf/fonts/aealarabiya.php
application/third_party/tcpdf/fonts/aealarabiya.z
application/third_party/tcpdf/fonts/aefurat.ctg.z
application/third_party/tcpdf/fonts/aefurat.php
application/third_party/tcpdf/fonts/aefurat.z
application/third_party/tcpdf/fonts/cid0cs.php
application/third_party/tcpdf/fonts/cid0ct.php
application/third_party/tcpdf/fonts/cid0jp.php
application/third_party/tcpdf/fonts/cid0kr.php
application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS
application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS
application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE
application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS
application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.34/README
application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt
application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt
application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt
application/third_party/tcpdf/fonts/dejavusans.ctg.z
application/third_party/tcpdf/fonts/dejavusans.php
application/third_party/tcpdf/fonts/dejavusans.z
application/third_party/tcpdf/fonts/dejavusansb.ctg.z
application/third_party/tcpdf/fonts/dejavusansb.php
application/third_party/tcpdf/fonts/dejavusansb.z
application/third_party/tcpdf/fonts/dejavusansbi.ctg.z
application/third_party/tcpdf/fonts/dejavusansbi.php
application/third_party/tcpdf/fonts/dejavusansbi.z
application/third_party/tcpdf/fonts/dejavusanscondensed.ctg.z
application/third_party/tcpdf/fonts/dejavusanscondensed.php
application/third_party/tcpdf/fonts/dejavusanscondensed.z
application/third_party/tcpdf/fonts/dejavusanscondensedb.ctg.z
application/third_party/tcpdf/fonts/dejavusanscondensedb.php
application/third_party/tcpdf/fonts/dejavusanscondensedb.z
application/third_party/tcpdf/fonts/dejavusanscondensedbi.ctg.z
application/third_party/tcpdf/fonts/dejavusanscondensedbi.php
application/third_party/tcpdf/fonts/dejavusanscondensedbi.z
application/third_party/tcpdf/fonts/dejavusanscondensedi.ctg.z
application/third_party/tcpdf/fonts/dejavusanscondensedi.php
application/third_party/tcpdf/fonts/dejavusanscondensedi.z
application/third_party/tcpdf/fonts/dejavusansextralight.ctg.z
application/third_party/tcpdf/fonts/dejavusansextralight.php
application/third_party/tcpdf/fonts/dejavusansextralight.z
application/third_party/tcpdf/fonts/dejavusansi.ctg.z
application/third_party/tcpdf/fonts/dejavusansi.php
application/third_party/tcpdf/fonts/dejavusansi.z
application/third_party/tcpdf/fonts/dejavusansmono.ctg.z
application/third_party/tcpdf/fonts/dejavusansmono.php
application/third_party/tcpdf/fonts/dejavusansmono.z
application/third_party/tcpdf/fonts/dejavusansmonob.ctg.z
application/third_party/tcpdf/fonts/dejavusansmonob.php
application/third_party/tcpdf/fonts/dejavusansmonob.z
application/third_party/tcpdf/fonts/dejavusansmonobi.ctg.z
application/third_party/tcpdf/fonts/dejavusansmonobi.php
application/third_party/tcpdf/fonts/dejavusansmonobi.z
application/third_party/tcpdf/fonts/dejavusansmonoi.ctg.z
application/third_party/tcpdf/fonts/dejavusansmonoi.php
application/third_party/tcpdf/fonts/dejavusansmonoi.z
application/third_party/tcpdf/fonts/dejavuserif.ctg.z
application/third_party/tcpdf/fonts/dejavuserif.php
application/third_party/tcpdf/fonts/dejavuserif.z
application/third_party/tcpdf/fonts/dejavuserifb.ctg.z
application/third_party/tcpdf/fonts/dejavuserifb.php
application/third_party/tcpdf/fonts/dejavuserifb.z
application/third_party/tcpdf/fonts/dejavuserifbi.ctg.z
application/third_party/tcpdf/fonts/dejavuserifbi.php
application/third_party/tcpdf/fonts/dejavuserifbi.z
application/third_party/tcpdf/fonts/dejavuserifcondensed.ctg.z
application/third_party/tcpdf/fonts/dejavuserifcondensed.php
application/third_party/tcpdf/fonts/dejavuserifcondensed.z
application/third_party/tcpdf/fonts/dejavuserifcondensedb.ctg.z
application/third_party/tcpdf/fonts/dejavuserifcondensedb.php
application/third_party/tcpdf/fonts/dejavuserifcondensedb.z
application/third_party/tcpdf/fonts/dejavuserifcondensedbi.ctg.z
application/third_party/tcpdf/fonts/dejavuserifcondensedbi.php
application/third_party/tcpdf/fonts/dejavuserifcondensedbi.z
application/third_party/tcpdf/fonts/dejavuserifcondensedi.ctg.z
application/third_party/tcpdf/fonts/dejavuserifcondensedi.php
application/third_party/tcpdf/fonts/dejavuserifcondensedi.z
application/third_party/tcpdf/fonts/dejavuserifi.ctg.z
application/third_party/tcpdf/fonts/dejavuserifi.php
application/third_party/tcpdf/fonts/dejavuserifi.z
application/third_party/tcpdf/fonts/freefont-20120503/AUTHORS
application/third_party/tcpdf/fonts/freefont-20120503/COPYING
application/third_party/tcpdf/fonts/freefont-20120503/CREDITS
application/third_party/tcpdf/fonts/freefont-20120503/INSTALL
application/third_party/tcpdf/fonts/freefont-20120503/README
application/third_party/tcpdf/fonts/freemono.ctg.z
application/third_party/tcpdf/fonts/freemono.php
application/third_party/tcpdf/fonts/freemono.z
application/third_party/tcpdf/fonts/freemonob.ctg.z
application/third_party/tcpdf/fonts/freemonob.php
application/third_party/tcpdf/fonts/freemonob.z
application/third_party/tcpdf/fonts/freemonobi.ctg.z
application/third_party/tcpdf/fonts/freemonobi.php
application/third_party/tcpdf/fonts/freemonobi.z
application/third_party/tcpdf/fonts/freemonoi.ctg.z
application/third_party/tcpdf/fonts/freemonoi.php
application/third_party/tcpdf/fonts/freemonoi.z
application/third_party/tcpdf/fonts/freesans.ctg.z
application/third_party/tcpdf/fonts/freesans.php
application/third_party/tcpdf/fonts/freesans.z
application/third_party/tcpdf/fonts/freesansb.ctg.z
application/third_party/tcpdf/fonts/freesansb.php
application/third_party/tcpdf/fonts/freesansb.z
application/third_party/tcpdf/fonts/freesansbi.ctg.z
application/third_party/tcpdf/fonts/freesansbi.php
application/third_party/tcpdf/fonts/freesansbi.z
application/third_party/tcpdf/fonts/freesansi.ctg.z
application/third_party/tcpdf/fonts/freesansi.php
application/third_party/tcpdf/fonts/freesansi.z
application/third_party/tcpdf/fonts/freeserif.ctg.z
application/third_party/tcpdf/fonts/freeserif.php
application/third_party/tcpdf/fonts/freeserif.z
application/third_party/tcpdf/fonts/freeserifb.ctg.z
application/third_party/tcpdf/fonts/freeserifb.php
application/third_party/tcpdf/fonts/freeserifb.z
application/third_party/tcpdf/fonts/freeserifbi.ctg.z
application/third_party/tcpdf/fonts/freeserifbi.php
application/third_party/tcpdf/fonts/freeserifbi.z
application/third_party/tcpdf/fonts/freeserifi.ctg.z
application/third_party/tcpdf/fonts/freeserifi.php
application/third_party/tcpdf/fonts/freeserifi.z
application/third_party/tcpdf/fonts/pdfacourier.z
application/third_party/tcpdf/fonts/pdfacourierb.z
application/third_party/tcpdf/fonts/pdfacourierbi.z
application/third_party/tcpdf/fonts/pdfacourieri.z
application/third_party/tcpdf/fonts/pdfahelvetica.z
application/third_party/tcpdf/fonts/pdfahelveticab.z
application/third_party/tcpdf/fonts/pdfahelveticabi.z
application/third_party/tcpdf/fonts/pdfahelveticai.z
application/third_party/tcpdf/fonts/pdfasymbol.z
application/third_party/tcpdf/fonts/pdfatimes.z
application/third_party/tcpdf/fonts/pdfatimesb.z
application/third_party/tcpdf/fonts/pdfatimesbi.z
application/third_party/tcpdf/fonts/pdfatimesi.z
application/third_party/tcpdf/fonts/pdfazapfdingbats.z
application/third_party/tcpdf/include/barcodes/datamatrix.php
application/third_party/tcpdf/include/barcodes/pdf417.php
application/third_party/tcpdf/include/barcodes/qrcode.php
application/third_party/tcpdf/include/sRGB.icc
application/third_party/tcpdf/include/tcpdf_filters.php
application/third_party/tcpdf/include/tcpdf_font_data.php
application/third_party/tcpdf/tcpdf.php
application/third_party/tcpdf/tcpdf_barcodes_1d.php
application/third_party/tcpdf/tcpdf_barcodes_2d.php
application/third_party/tcpdf/tcpdf_parser.php
framework/CHANGELOG
framework/UPGRADE
framework/YiiBase.php
framework/web/CWebApplication.php
framework/yiilite.php
framework/zii/widgets/CDetailView.php
index.php |
| mod - .gitignore |
Diff
File |
| mod - .scrutinizer.yml |
Diff
File |
| add - application/Psr4AutoloaderClass.php |
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/routes.php |
Diff
File |
| mod - application/config/tcpdf.php |
Diff
File |
| mod - application/config/third_party.php |
Diff
File |
| mod - application/config/version.php |
Diff
File |
| mod - application/controllers/AdminController.php |
Diff
File |
| mod - application/controllers/InstallerController.php |
Diff
File |
| mod - application/controllers/OptinController.php |
Diff
File |
| mod - application/controllers/OptoutController.php |
Diff
File |
| mod - application/controllers/PluginsController.php |
Diff
File |
| mod - application/controllers/PrintanswersController.php |
Diff
File |
| mod - application/controllers/RegisterController.php |
Diff
File |
| mod - application/controllers/Statistics_userController.php |
Diff
File |
| mod - application/controllers/SurveyController.php |
Diff
File |
| mod - application/controllers/SurveysController.php |
Diff
File |
| mod - application/controllers/UploaderController.php |
Diff
File |
| add - application/controllers/admin/ExpressionValidate.php |
Diff
File |
| mod - application/controllers/admin/assessments.php |
Diff
File |
| mod - application/controllers/admin/authentication.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/expressions.php |
Diff
File |
| mod - application/controllers/admin/globalsettings.php |
Diff
File |
| mod - application/controllers/admin/htmleditor_pop.php |
Diff
File |
| mod - application/controllers/admin/index.php |
Diff
File |
| mod - application/controllers/admin/labels.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/questiongroups.php |
Diff
File |
| mod - application/controllers/admin/questions.php |
Diff
File |
| mod - application/controllers/admin/quotas.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/statistics.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/update.php |
Diff
File |
| mod - application/controllers/admin/useraction.php |
Diff
File |
| mod - application/controllers/admin/usergroups.php |
Diff
File |
| mod - application/controllers/survey/index.php |
Diff
File |
| mod - application/core/ConsoleApplication.php |
Diff
File |
| mod - application/core/LSHttpRequest.php |
Diff
File |
| mod - application/core/LSUserIdentity.php |
Diff
File |
| mod - application/core/LSWebUser.php |
Diff
File |
| add - application/core/LSYii_CaseValidator.php |
Diff
File |
| add - application/core/LSYii_EmailIDNAValidator.php |
Diff
File |
| mod - application/core/LSYii_Validators.php |
Diff
File |
| add - application/core/PluginEvent.php |
Diff
File |
| mod - application/core/Survey_Common_Action.php |
Diff
File |
| mod - application/core/UserIdentity.php |
Diff
File |
| add - application/core/db/DbConnection.php |
Diff
File |
| add - application/core/db/MssqlSchema.php |
Diff
File |
| add - application/core/db/MysqlSchema.php |
Diff
File |
| add - application/core/db/PgsqlSchema.php |
Diff
File |
| add - application/core/db/SmartColumnTypeTrait.php |
Diff
File |
| mod - application/core/plugins/AuthLDAP/AuthLDAP.php |
Diff
File |
| mod - application/core/plugins/Authdb/Authdb.php |
Diff
File |
| mod - application/core/plugins/Authwebserver/Authwebserver.php |
Diff
File |
| mod - application/core/plugins/ExportR/ExportR.php |
Diff
File |
| mod - application/core/plugins/ExportR/RDataWriter.php |
Diff
File |
| mod - application/core/plugins/ExportSTATAxml/ExportSTATAxml.php |
Diff
File |
| mod - application/core/plugins/ExportSTATAxml/STATAxmlWriter.php |
Diff
File |
| add - application/extensions/ExtendedClientScript/ExtendedClientScript.php |
Diff
File |
| add - application/extensions/ExtendedClientScript/cssmin/cssmin.php |
Diff
File |
| add - application/extensions/ExtendedClientScript/jsmin/JSMin.php |
Diff
File |
| rm - application/language/english/index.html |
Diff |
| rm - application/libraries/Limesurvey_lang.php |
Diff |
| add - application/libraries/PluginManager/PluginController.php |
Diff
File |
| add - application/libraries/PluginManager/PluginModule.php |
Diff
File |
| add - application/libraries/PluginManager/PluginTrait.php |
Diff
File |
| add - application/libraries/admin/http/LICENSE.txt |
Diff
File |
| add - application/libraries/admin/http/httpRequestIt.php |
Diff
File |
| add - application/libraries/admin/http/testfiles.zip |
Diff
File |
| rm - application/models/Dynamic_old.php |
Diff |
| add - application/third_party/idna-convert/LICENCE |
Diff
File |
| add - application/third_party/idna-convert/ReadMe.txt |
Diff
File |
| add - application/third_party/idna-convert/idna_convert.class.php |
Diff
File |
| add - application/third_party/idna-convert/transcode_wrapper.php |
Diff
File |
| add - application/third_party/idna-convert/uctc.php |
Diff
File |
| rm - application/third_party/php-gettext/AUTHORS |
Diff |
| rm - application/third_party/php-gettext/COPYING |
Diff |
| rm - application/third_party/php-gettext/README |
Diff |
| rm - application/third_party/php-gettext/gettext.inc |
Diff |
| rm - application/third_party/php-gettext/gettext.php |
Diff |
| rm - application/third_party/php-gettext/streams.php |
Diff |
| add - application/third_party/phpmailer/PHPMailerAutoload.php |
Diff
File |
| add - application/third_party/phpmailer/README.md |
Diff
File |
| add - application/third_party/phpmailer/language/phpmailer.lang-be.php |
Diff
File |
| add - application/third_party/phpmailer/language/phpmailer.lang-el.php |
Diff
File |
| add - application/third_party/phpmailer/language/phpmailer.lang-eo.php |
Diff
File |
| add - application/third_party/phpmailer/language/phpmailer.lang-fa.php |
Diff
File |
| add - application/third_party/phpmailer/language/phpmailer.lang-gl.php |
Diff
File |
| add - application/third_party/phpmailer/language/phpmailer.lang-he.php |
Diff
File |
| add - application/third_party/phpmailer/language/phpmailer.lang-hr.php |
Diff
File |
| add - application/third_party/phpmailer/language/phpmailer.lang-ka.php |
Diff
File |
| add - application/third_party/phpmailer/language/phpmailer.lang-lt.php |
Diff
File |
| add - application/third_party/phpmailer/language/phpmailer.lang-lv.php |
Diff
File |
| add - application/third_party/phpmailer/language/phpmailer.lang-pt.php |
Diff
File |
| add - application/third_party/phpmailer/language/phpmailer.lang-sk.php |
Diff
File |
| add - application/third_party/phpmailer/language/phpmailer.lang-sr.php |
Diff
File |
| add - application/third_party/phpmailer/language/phpmailer.lang-uk.php |
Diff
File |
| add - application/third_party/phpmailer/language/phpmailer.lang-vi.php |
Diff
File |
| add - application/third_party/tcpdf/composer.json |
Diff
File |
| add - application/third_party/tcpdf/fonts/ae_fonts_2.0/COPYING |
Diff
File |
| 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 |
| add - application/third_party/tcpdf/fonts/freefont-20120503/ChangeLog |
Diff
File |
| add - application/third_party/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING |
Diff
File |
| add - application/third_party/tcpdf/fonts/freefont-20120503/USAGE |
Diff
File |
| add - application/third_party/tcpdf/include/tcpdf_colors.php |
Diff
File |
| add - application/third_party/tcpdf/include/tcpdf_fonts.php |
Diff
File |
| add - application/third_party/tcpdf/include/tcpdf_images.php |
Diff
File |
| add - application/third_party/tcpdf/include/tcpdf_static.php |
Diff
File |
| add - application/third_party/tcpdf/tcpdf_autoconfig.php |
Diff
File |
| add - application/third_party/tcpdf/tcpdf_import.php |
Diff
File |
| add - application/third_party/tcpdf/tools/.htaccess |
Diff
File |
| add - application/third_party/tcpdf/tools/convert_fonts_examples.txt |
Diff
File |
| add - application/third_party/tcpdf/tools/tcpdf_addfont.php |
Diff
File |
| add - application/views/admin/expressions/validationList.php |
Diff
File |
| add - application/views/admin/responses/listResponses_view.php |
Diff
File |
