LimeSurvey: master 2344910b

Diff Back to Repository
Author Committer Branch Timestamp Parent
apmuthu apmuthu master 2014-07-01 06:16 master 80af8f72
Changeset

Merge pull request #12 from LimeSurvey/master

Synch with Upstream
mod - .gitignore Diff File
mod - .scrutinizer.yml 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/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/SurveysController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dataentry.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/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/questions.php Diff File
mod - application/controllers/admin/quotas.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/statistics.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/ConsoleApplication.php Diff File
mod - application/core/LSUserIdentity.php Diff File
mod - application/core/LSYii_Application.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
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/UserIdentity.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/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/AdminFooter/AdminFooter.php Diff File
add - application/extensions/AdminFooter/views/footer.php Diff File
mod - application/extensions/LimeDebug/LimeDebug.php Diff File
mod - application/extensions/Menu/MenuWidget.php 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
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/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
mod - application/helpers/ClassFactory.php Diff File
rm - application/helpers/PluginSettingsHelper.php Diff
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/export/DocWriter.php Diff File
mod - application/helpers/admin/export/HtmlWriter.php Diff File
mod - application/helpers/admin/export/PdfWriter.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/statistics_helper.php Diff File
mod - application/helpers/admin/template_helper.php Diff File
mod - application/helpers/admin/token_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/database_helper.php Diff File
mod - application/helpers/export_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/helpers/viewHelper.php Diff File
mod - application/libraries/BigData.php Diff File
mod - application/libraries/Limesurvey_lang.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/libraries/PluginManager/PluginBase.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/libraries/PluginManager/Storage/DbStorage.php Diff File
mod - application/libraries/PluginManager/Storage/iPluginStorage.php Diff File
mod - application/libraries/PluginManager/iPlugin.php Diff File
mod - application/libraries/Save.php Diff File
add - application/libraries/admin/pclzip.php Diff File
rm - application/libraries/admin/pclzip/gnu-lgpl.txt Diff
rm - application/libraries/admin/pclzip/pclerror.lib.php Diff
rm - application/libraries/admin/pclzip/pcltrace.lib.php Diff
rm - application/libraries/admin/pclzip/pclzip-trace.lib.php Diff
rm - application/libraries/admin/pclzip/readme.txt Diff
mod - application/libraries/admin/pdf.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/models/Dynamic.php Diff File
rm - application/models/Dynamic_old.php Diff
mod - application/models/FailedLoginAttempt.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
mod - application/models/ParticipantShare.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/PluginDynamic.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/Quota.php Diff File
mod - application/models/QuotaLanguageSetting.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/Session.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveyLanguageSetting.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/tests/staticCalls.php Diff File
mod - application/third_party/ar-php/Arabic.php Diff File
mod - application/third_party/ar-php/Arabic/AutoSummarize.php Diff File
mod - application/third_party/ar-php/Arabic/Changes Diff File
mod - application/third_party/ar-php/Arabic/CharsetC.php Diff File
mod - application/third_party/ar-php/Arabic/CharsetD.php Diff File
mod - application/third_party/ar-php/Arabic/CompressStr.php Diff File
rm - application/third_party/ar-php/Arabic/Data.php Diff
mod - application/third_party/ar-php/Arabic/Date.php Diff File
mod - application/third_party/ar-php/Arabic/Docs.zip Diff File
mod - application/third_party/ar-php/Arabic/Examples.zip Diff File
mod - application/third_party/ar-php/Arabic/Gender.php Diff File
mod - application/third_party/ar-php/Arabic/Glyphs.php Diff File
mod - application/third_party/ar-php/Arabic/Hiero.php Diff File
mod - application/third_party/ar-php/Arabic/Identifier.php Diff File
mod - application/third_party/ar-php/Arabic/KeySwap.php Diff File
mod - application/third_party/ar-php/Arabic/Mktime.php Diff File
add - application/third_party/ar-php/Arabic/images.zip 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/views/admin/survey/subview/tabPluginSettings_view.php Diff File
rm - docs/demosurveys/Randomization_Group_Test.lss Diff
rm - docs/demosurveys/limesurvey2_sample_survey_english.lss Diff
rm - docs/demosurveys/ls191_sample_survey_multilingual.lss Diff
add - docs/demosurveys/ls205_EM_question_attributes.lss Diff File
add - docs/demosurveys/ls205_array_filter_tests.lss Diff File
add - docs/demosurveys/ls205_cascading_array_filter.lss Diff File
add - docs/demosurveys/ls205_cascading_array_filter_exclude.lss Diff File
add - docs/demosurveys/ls205_comma_as_radix_separator.lss Diff File
add - docs/demosurveys/ls205_countifop_sumifop.lss Diff File
add - docs/demosurveys/ls205_em_tailoring.lss Diff File
add - docs/demosurveys/ls205_em_validation_q.lss Diff File
add - docs/demosurveys/ls205_group_relevance.lss Diff File
add - docs/demosurveys/ls205_maximum_chars_feature.lss Diff File
add - docs/demosurveys/ls205_plurals_test.lss Diff File
add - docs/demosurveys/ls205_randomization_group_test.lss Diff File
add - docs/demosurveys/ls205_sample_survey_english.lss Diff File
add - docs/demosurveys/ls205_sample_survey_multilingual.lss Diff File
add - docs/demosurveys/ls205_self_and_that.lss Diff File
add - docs/demosurveys/ls205_subquestion_relevance.lss Diff File
add - docs/demosurveys/ls205_test_em_sq_validation.lss Diff File
add - docs/demosurveys/ls205_validation_tests.lss Diff File
rm - docs/demosurveys/ls2_EM_question_attributes.lss Diff
rm - docs/demosurveys/ls2_array_filter_tests.lss Diff
rm - docs/demosurveys/ls2_cascading_array_filter.lss Diff
rm - docs/demosurveys/ls2_cascading_array_filter_exclude.lss Diff
rm - docs/demosurveys/ls2_comma_as_radix_separator.lss Diff
rm - docs/demosurveys/ls2_countifop_sumifop.lss Diff
rm - docs/demosurveys/ls2_em_tailoring.lss Diff
rm - docs/demosurveys/ls2_em_validation_q.lss Diff
rm - docs/demosurveys/ls2_group_relevance.lss Diff
rm - docs/demosurveys/ls2_maximum_chars_feature.lss Diff
rm - docs/demosurveys/ls2_plurals_test.lss Diff
rm - docs/demosurveys/ls2_self_and_that.lss Diff
rm - docs/demosurveys/ls2_subquestion_relevance.lss Diff
rm - docs/demosurveys/ls2_test_em_sq_validation.lss Diff
rm - docs/demosurveys/ls2_validation_tests.lss Diff