LimeSurvey: master 6b658748

Diff Back to Repository
Author Committer Branch Timestamp Parent
adamzammit adamzammit master 2015-06-17 03:59:25 master dc3460a1
Changeset

Merge remote-tracking branch 'upstream/master'

Conflicts:
application/libraries/admin/quexmlpdf.php
application/views/admin/survey/editSurvey_view.php
application/views/admin/survey/subview/tab_view.php
mod - .gitignore Diff File
mod - .scrutinizer.yml Diff File
add - application/Psr4AutoloaderClass.php Diff File
mod - application/commands/InstallCommand.php Diff File
add - application/commands/PluginCommand.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/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
add - 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
add - application/core/AuthPluginBase.php Diff File
mod - application/core/ConsoleApplication.php Diff File
mod - application/core/LSBootstrap.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
add - application/core/LSYii_CaseValidator.php Diff File
mod - application/core/LSYii_Controller.php Diff File
add - application/core/LSYii_EmailIDNAValidator.php Diff File
mod - application/core/LSYii_Validators.php Diff File
add - application/core/PluginBase.php Diff File
add - application/core/PluginEvent.php Diff File
add - application/core/PluginManager.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
add - application/extensions/AdminFooter/AdminFooter.php Diff File
add - application/extensions/AdminFooter/views/footer.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
add - application/extensions/yii-jsoneditor/JsonEditor.php Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/HISTORY.md Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/LICENSE Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/NOTICE Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/README.md Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/docs/api.md Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/docs/usage.md Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/examples/01_basic_usage.html Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/examples/02_viewer.html Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/examples/03_switch_mode.html Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/examples/requirejs_demo/requirejs_demo.html Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/examples/requirejs_demo/scripts/main.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/examples/requirejs_demo/scripts/require.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/img/jsoneditor-icons.png Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/jsoneditor-min.css Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/jsoneditor-min.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/jsoneditor.css Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/jsoneditor.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/lib/ace/ace.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/lib/ace/ext-searchbox.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/lib/ace/mode-json.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/lib/ace/theme-jsoneditor.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/lib/ace/theme-textmate.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/lib/ace/worker-json.js Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/lib/jsonlint/README.md Diff File
add - application/extensions/yii-jsoneditor/jsoneditor-2.3.6/lib/jsonlint/jsonlint.js Diff File
add - application/extensions/yii-jsoneditor/widget.js Diff File
rm - application/helpers/PluginSettingsHelper.php Diff File
rm - application/language/english/index.html Diff File
rm - application/libraries/ExpressionManager/js/em_javascript.js Diff File
rm - application/libraries/Limesurvey_lang.php Diff File
rm - application/libraries/admin/gtranslate/COPYING Diff File
rm - application/libraries/admin/gtranslate/GTranslate.php Diff File
rm - application/libraries/admin/gtranslate/languages.ini Diff File
add - application/libraries/admin/pclzip.php Diff File
rm - application/libraries/admin/pclzip/gnu-lgpl.txt Diff File
rm - application/libraries/admin/pclzip/pclerror.lib.php Diff File
rm - application/libraries/admin/pclzip/pcltrace.lib.php Diff File
rm - application/libraries/admin/pclzip/pclzip-trace.lib.php Diff File
rm - application/libraries/admin/pclzip/readme.txt Diff File
rm - application/libraries/admin/pear/OLE/OLE.php Diff File
rm - application/libraries/admin/pear/OLE/PPS.php Diff File
rm - application/libraries/admin/pear/OLE/PPS/File.php Diff File
rm - application/libraries/admin/pear/OLE/PPS/Root.php Diff File
rm - application/libraries/admin/pear/PEAR.php Diff File
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/BIFFwriter.php Diff File
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Format.php Diff File
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Parser.php Diff File
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Validator.php Diff File
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Workbook.php Diff File
rm - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Worksheet.php Diff File
rm - application/libraries/admin/pear/Spreadsheet/Excel/Xlswriter.php Diff File
rm - application/models/Dynamic_old.php Diff File
rm - application/third_party/ar-php/Arabic/Data.php Diff File
add - application/third_party/ar-php/Arabic/images.zip Diff File
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/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
add - application/third_party/pclzip/gnu-lgpl.txt Diff File
add - application/third_party/pclzip/pclzip.lib.php Diff File
add - application/third_party/pclzip/readme.txt 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 File
rm - application/third_party/php-gettext/COPYING Diff File
rm - application/third_party/php-gettext/README Diff File
rm - application/third_party/php-gettext/gettext.inc Diff File
rm - application/third_party/php-gettext/gettext.php Diff File
rm - application/third_party/php-gettext/streams.php Diff File
add - application/third_party/phpmailer/PHPMailerAutoload.php Diff File
add - application/third_party/phpmailer/README.md Diff File
rm - application/third_party/phpmailer/README.php Diff File