LimeSurvey: develop 00596cfd

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2018-11-26 18:22 develop c882d826
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop
Dev: hope i didn't broke existing fix

Conflicts:

application/config/version.php

application/controllers/admin/themeoptions.php

application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php

application/helpers/qanda_helper.php

application/libraries/PluginManager/PluginBase.php

application/models/Question.php

application/models/Survey.php

application/models/behaviors/PluginEventBehavior.php

application/views/admin/survey/Question/answerOptionsEdit_view.twig

framework/db/ar/CActiveRecord.php

themes/survey/bootswatch/options/options.twig

themes/survey/fruity/options/options.twig

themes/survey/vanilla/options/options.twig
mod - application/config/version.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/themeoptions.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSYii_Application.php Diff File
rm - application/core/plugins/extendedStartPage/config.xml Diff
rm - application/core/plugins/extendedStartPage/extendedStartPage.php Diff
rm - application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php Diff
add - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_change_survey_group.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php Diff File
mod - application/helpers/admin/ajax_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_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/update/updatedb_helper.php Diff File
mod - application/libraries/MersenneTwister.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/models/behaviors/PluginEventBehavior.php Diff File
mod - application/third_party/pclzip/pclzip.lib.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/survey/Question/answerOptionsEdit_view.twig Diff File
mod - application/views/admin/survey/Question/question_subviews/_modals.twig Diff File
mod - application/views/admin/survey/Question/subquestionsAndAnswers/_answer_option.twig Diff File
mod - application/views/admin/token/managetokenattributes.php Diff File
mod - application/views/survey/system/LanguageChanger/LanguageChanger.php Diff File
mod - assets/packages/adminbasics/build/adminbasics.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.debug.js Diff File
mod - assets/packages/adminbasics/build/adminbasics.js Diff File
mod - assets/packages/adminbasics/build/adminbasics.min.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.min.js Diff File
add - assets/packages/adminbasics/scss/grid.scss Diff File
mod - assets/packages/adminbasics/scss/main.scss Diff File
mod - assets/packages/adminbasics/src/adminbasicsmain.js Diff File
add - assets/packages/adminbasics/src/components/gridAction.js Diff File
mod - assets/packages/adminbasics/src/parts/globalMethods.js Diff File
mod - assets/packages/limesurvey/survey.js Diff File
mod - assets/packages/template-core/template-core.js Diff File
mod - assets/scripts/admin/expression.js Diff File
mod - assets/scripts/admin/statistics.js Diff File
mod - assets/scripts/admin/tokens.js Diff File
mod - assets/styles-public/expressionlogicfile.css Diff File
mod - assets/styles-public/expressions.css Diff File
mod - docs/release_notes.txt Diff File
mod - framework/LICENSE Diff File
mod - framework/YiiBase.php Diff File
mod - framework/cli/views/webapp/protected/controllers/SiteController.php Diff File
mod - framework/cli/views/webapp/protected/yiic Diff File
mod - framework/db/ar/CActiveFinder.php Diff File
mod - framework/db/ar/CActiveRecord.php Diff File
mod - framework/db/schema/cubrid/CCubridColumnSchema.php Diff File
mod - framework/db/schema/cubrid/CCubridSchema.php Diff File
mod - framework/db/schema/cubrid/CCubridTableSchema.php Diff File
mod - framework/db/schema/mysql/CMysqlColumnSchema.php Diff File
mod - framework/gii/components/Pear/Text/Diff/Engine/native.php Diff File
mod - framework/gii/components/Pear/Text/Diff/Engine/shell.php Diff File
mod - framework/gii/generators/crud/views/index.php Diff File
mod - framework/gii/generators/model/ModelCode.php Diff File
mod - framework/gii/generators/model/views/index.php Diff File
mod - framework/logging/CProfileLogRoute.php Diff File
mod - framework/messages/el/yii.php Diff File
mod - framework/vendors/htmlpurifier/HTMLPurifier.standalone.php Diff File
mod - framework/vendors/markdown/markdown.php Diff File
mod - framework/vendors/zend-escaper/Escaper.php Diff File
mod - framework/web/CClientScript.php Diff File
mod - framework/web/CController.php Diff File
mod - framework/web/CDbHttpSession.php Diff File
mod - framework/web/CHttpRequest.php Diff File
mod - framework/web/CHttpSession.php Diff File
mod - framework/web/CUrlManager.php Diff File
mod - framework/web/CWebApplication.php Diff File
mod - framework/web/filters/CHttpCacheFilter.php Diff File
mod - framework/web/helpers/CHtml.php Diff File
mod - framework/web/js/packages.php Diff File
mod - framework/web/js/source/jquery.autocomplete.js Diff File
mod - framework/web/widgets/CTabView.php Diff File
mod - framework/web/widgets/captcha/CCaptcha.php Diff File
mod - framework/yiilite.php Diff File
mod - framework/zii/widgets/assets/gridview/jquery.yiigridview.js Diff File
mod - framework/zii/widgets/assets/listview/jquery.yiilistview.js Diff File
mod - framework/zii/widgets/grid/CGridView.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/cs/cs.mo Diff File
mod - locale/da/da.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/hr/hr.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/ja/ja.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/pt/pt.mo Diff File
mod - locale/ro/ro.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - locale/zh-Hans/zh-Hans.mo Diff File
mod - tests/LimeSurveyWebDriver.php Diff File
mod - themes/question/ranking_advanced/survey/questions/answer/ranking/answer.twig Diff File
mod - themes/survey/bootswatch/options/options.twig Diff File
mod - themes/survey/fruity/options/options.twig Diff File
mod - themes/survey/vanilla/options/options.twig Diff File
mod - themes/survey/vanilla/views/subviews/content/save.twig Diff File
mod - themes/survey/vanilla/views/subviews/content/submit.twig Diff File
mod - themes/survey/vanilla/views/subviews/content/submit_preview.twig Diff File