LimeSurvey: master 0da4050b

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz master 2015-06-10 14:05 master 0dfb358d
Changeset

Merge branch '2.06' to master
mod - .gitignore Diff File
add - application/Psr4AutoloaderClass.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/config-sample-dblib.php Diff File
mod - application/config/config-sample-mysql.php Diff File
mod - application/config/config-sample-pgsql.php Diff File
mod - application/config/config-sample-sqlsrv.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/routes.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/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/LSUserIdentity.php Diff File
mod - application/core/LSWebUser.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - 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
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/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
mod - application/extensions/LimeScript/LimeScript.php Diff File
mod - application/extensions/LimeScript/assets/script.js Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
mod - application/extensions/SettingsWidget/assets/settingswidget.css Diff File
mod - application/extensions/SettingsWidget/assets/settingswidget.js Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/export/DocWriter.php Diff File
mod - application/helpers/admin/export/ExcelWriter.php Diff File
mod - application/helpers/admin/export/FormattingOptions.php Diff File
mod - application/helpers/admin/export/PdfWriter.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/admin/export/Translator.php Diff File
mod - application/helpers/admin/export/Writer.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/label_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/admin/template_helper.php Diff File
mod - application/helpers/admin/token_helper.php Diff File
rm - application/language/english/index.html Diff
rm - application/libraries/Limesurvey_lang.php Diff
rm - application/libraries/admin/gtranslate/COPYING Diff
rm - application/libraries/admin/gtranslate/GTranslate.php Diff
rm - application/libraries/admin/gtranslate/languages.ini Diff
rm - application/libraries/admin/pear/OLE/OLE.php Diff
rm - application/libraries/admin/pear/OLE/PPS.php Diff
rm - application/libraries/admin/pear/OLE/PPS/File.php Diff
rm - application/libraries/admin/pear/OLE/PPS/Root.php Diff
rm - application/libraries/admin/pear/PEAR.php Diff
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/BIFFwriter.php Diff
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Format.php Diff
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Parser.php Diff
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Validator.php Diff
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Workbook.php Diff
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Worksheet.php Diff
rm - application/libraries/admin/pear/Spreadsheet/Excel/Xlswriter.php Diff
add - application/third_party/gtranslate-api/COPYING Diff File
add - application/third_party/gtranslate-api/ChangeLog Diff File
add - application/third_party/gtranslate-api/GTranslate.php Diff File
add - application/third_party/gtranslate-api/languages.ini Diff File
add - application/third_party/gtranslate-api/languages.v2.ini Diff File
add - application/third_party/http/LICENSE.txt Diff File
add - application/third_party/http/http.php Diff File
add - application/third_party/pear/OLE/OLE.php Diff File
add - application/third_party/pear/OLE/PPS.php Diff File
add - application/third_party/pear/OLE/PPS/File.php Diff File
add - application/third_party/pear/OLE/PPS/Root.php Diff File
add - application/third_party/pear/PEAR.php Diff File
add - application/third_party/pear/Spreadsheet/Excel/Writer/BIFFwriter.php Diff File
add - application/third_party/pear/Spreadsheet/Excel/Writer/Format.php Diff File
add - application/third_party/pear/Spreadsheet/Excel/Writer/Parser.php Diff File
add - application/third_party/pear/Spreadsheet/Excel/Writer/Validator.php Diff File
add - application/third_party/pear/Spreadsheet/Excel/Writer/Workbook.php Diff File
add - application/third_party/pear/Spreadsheet/Excel/Writer/Worksheet.php Diff File
add - application/third_party/pear/Spreadsheet/Excel/Xlswriter.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/views/admin/expressions/validationList.php Diff File
add - application/views/admin/responses/listResponses_view.php Diff File