LimeSurvey: develop d5b01489
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| DenisChenu | DenisChenu | develop | 2016-12-17 16:52:32 | develop f7509b5f |
| Changeset | Merge branch 'develop' of git@github.com:LimeSurvey/LimeSurvey.git into bs-package |
|||
| mod - application/commands/PluginCommand.php | Diff File | |||
| mod - application/commands/console.php | Diff File | |||
| mod - application/config/config-defaults.php | Diff File | |||
| mod - application/config/internal.php | Diff File | |||
| mod - application/config/packages.php | Diff File | |||
| mod - application/config/third_party.php | Diff File | |||
| mod - application/controllers/RegisterController.php | Diff File | |||
| mod - application/controllers/admin/templates.php | Diff File | |||
| mod - application/controllers/admin/update.php | Diff File | |||
| mod - application/controllers/survey/index.php | Diff File | |||
| add - application/core/LSETwigViewRenderer.php | Diff File | |||
| mod - application/core/LSYii_Controller.php | Diff File | |||
| rm - application/core/packages/limesurvey/js.js | Diff File | |||
| mod - application/core/packages/limesurvey/survey.css | 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/questionHelper.php | Diff File | |||
| mod - application/helpers/replacements_helper.php | Diff File | |||
| mod - application/models/Timing.php | Diff File | |||
| add - application/third_party/Twig/Autoloader.php | Diff File | |||
| add - application/third_party/Twig/BaseNodeVisitor.php | Diff File | |||
| add - application/third_party/Twig/Cache/Filesystem.php | Diff File | |||
| add - application/third_party/Twig/Cache/Null.php | Diff File | |||
| add - application/third_party/Twig/CacheInterface.php | Diff File | |||
| add - application/third_party/Twig/Compiler.php | Diff File | |||
| add - application/third_party/Twig/CompilerInterface.php | Diff File | |||
| add - application/third_party/Twig/Environment.php | Diff File | |||
| add - application/third_party/Twig/Error.php | Diff File | |||
| add - application/third_party/Twig/Error/Loader.php | Diff File | |||
| add - application/third_party/Twig/Error/Runtime.php | Diff File | |||
| add - application/third_party/Twig/Error/Syntax.php | Diff File | |||
| add - application/third_party/Twig/ExistsLoaderInterface.php | Diff File | |||
| add - application/third_party/Twig/ExpressionParser.php | Diff File | |||
| add - application/third_party/Twig/Extension.php | Diff File | |||
| add - application/third_party/Twig/Extension/Core.php | Diff File | |||
| add - application/third_party/Twig/Extension/Debug.php | Diff File | |||
| add - application/third_party/Twig/Extension/Escaper.php | Diff File | |||
| add - application/third_party/Twig/Extension/GlobalsInterface.php | Diff File | |||
| add - application/third_party/Twig/Extension/InitRuntimeInterface.php | Diff File | |||
| add - application/third_party/Twig/Extension/Optimizer.php | Diff File | |||
| add - application/third_party/Twig/Extension/Profiler.php | Diff File | |||
| add - application/third_party/Twig/Extension/Sandbox.php | Diff File | |||
| add - application/third_party/Twig/Extension/Staging.php | Diff File | |||
| add - application/third_party/Twig/Extension/StringLoader.php | Diff File | |||
| add - application/third_party/Twig/ExtensionInterface.php | Diff File | |||
| add - application/third_party/Twig/FileExtensionEscapingStrategy.php | Diff File | |||
| add - application/third_party/Twig/Filter.php | Diff File | |||
| add - application/third_party/Twig/Filter/Function.php | Diff File | |||
| add - application/third_party/Twig/Filter/Method.php | Diff File | |||
| add - application/third_party/Twig/Filter/Node.php | Diff File | |||
| add - application/third_party/Twig/FilterCallableInterface.php | Diff File | |||
| add - application/third_party/Twig/FilterInterface.php | Diff File | |||
| add - application/third_party/Twig/Function.php | Diff File | |||
| add - application/third_party/Twig/Function/Function.php | Diff File | |||
| add - application/third_party/Twig/Function/Method.php | Diff File | |||
| add - application/third_party/Twig/Function/Node.php | Diff File | |||
| add - application/third_party/Twig/FunctionCallableInterface.php | Diff File | |||
| add - application/third_party/Twig/FunctionInterface.php | Diff File | |||
| add - application/third_party/Twig/Lexer.php | Diff File | |||
| add - application/third_party/Twig/LexerInterface.php | Diff File | |||
| add - application/third_party/Twig/Loader/Array.php | Diff File | |||
| add - application/third_party/Twig/Loader/Chain.php | Diff File | |||
| add - application/third_party/Twig/Loader/Filesystem.php | Diff File | |||
| add - application/third_party/Twig/Loader/String.php | Diff File | |||
| add - application/third_party/Twig/LoaderInterface.php | Diff File | |||
| add - application/third_party/Twig/Markup.php | Diff File | |||
| add - application/third_party/Twig/Node.php | Diff File | |||
| add - application/third_party/Twig/Node/AutoEscape.php | Diff File | |||
| add - application/third_party/Twig/Node/Block.php | Diff File | |||
| add - application/third_party/Twig/Node/BlockReference.php | Diff File | |||
| add - application/third_party/Twig/Node/Body.php | Diff File | |||
| add - application/third_party/Twig/Node/CheckSecurity.php | Diff File | |||
| add - application/third_party/Twig/Node/Do.php | Diff File | |||
| add - application/third_party/Twig/Node/Embed.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Array.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/AssignName.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/Add.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/And.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/BitwiseAnd.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/BitwiseOr.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/BitwiseXor.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/Concat.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/Div.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/EndsWith.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/Equal.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/FloorDiv.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/Greater.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/GreaterEqual.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/In.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/Less.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/LessEqual.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/Matches.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/Mod.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/Mul.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/NotEqual.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/NotIn.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/Or.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/Power.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/Range.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/StartsWith.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Binary/Sub.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/BlockReference.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Call.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Conditional.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Constant.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/ExtensionReference.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Filter.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Filter/Default.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Function.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/GetAttr.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/MethodCall.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Name.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/NullCoalesce.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Parent.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/TempName.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Test.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Test/Constant.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Test/Defined.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Test/Divisibleby.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Test/Even.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Test/Null.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Test/Odd.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Test/Sameas.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Unary.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Unary/Neg.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Unary/Not.php | Diff File | |||
| add - application/third_party/Twig/Node/Expression/Unary/Pos.php | Diff File | |||
| add - application/third_party/Twig/Node/Flush.php | Diff File | |||
| add - application/third_party/Twig/Node/For.php | Diff File | |||
| add - application/third_party/Twig/Node/ForLoop.php | Diff File | |||
| add - application/third_party/Twig/Node/If.php | Diff File | |||
| add - application/third_party/Twig/Node/Import.php | Diff File | |||
| add - application/third_party/Twig/Node/Include.php | Diff File | |||
| add - application/third_party/Twig/Node/Macro.php | Diff File | |||
| add - application/third_party/Twig/Node/Module.php | Diff File | |||
| add - application/third_party/Twig/Node/Print.php | Diff File | |||
| add - application/third_party/Twig/Node/Sandbox.php | Diff File | |||
| add - application/third_party/Twig/Node/SandboxedPrint.php | Diff File | |||
| add - application/third_party/Twig/Node/Set.php | Diff File | |||
| add - application/third_party/Twig/Node/SetTemp.php | Diff File | |||
| add - application/third_party/Twig/Node/Spaceless.php | Diff File | |||
| add - application/third_party/Twig/Node/Text.php | Diff File | |||
| add - application/third_party/Twig/Node/With.php | Diff File | |||
| add - application/third_party/Twig/NodeInterface.php | Diff File | |||
| add - application/third_party/Twig/NodeOutputInterface.php | Diff File | |||
| add - application/third_party/Twig/NodeTraverser.php | Diff File | |||
| add - application/third_party/Twig/NodeVisitor/Escaper.php | Diff File | |||
| add - application/third_party/Twig/NodeVisitor/Optimizer.php | Diff File | |||
| add - application/third_party/Twig/NodeVisitor/SafeAnalysis.php | Diff File | |||
| add - application/third_party/Twig/NodeVisitor/Sandbox.php | Diff File | |||
| add - application/third_party/Twig/NodeVisitorInterface.php | Diff File | |||
| add - application/third_party/Twig/Parser.php | Diff File | |||
| add - application/third_party/Twig/ParserInterface.php | Diff File | |||
| add - application/third_party/Twig/Profiler/Dumper/Blackfire.php | Diff File | |||
| add - application/third_party/Twig/Profiler/Dumper/Html.php | Diff File | |||
| add - application/third_party/Twig/Profiler/Dumper/Text.php | Diff File | |||
| add - application/third_party/Twig/Profiler/Node/EnterProfile.php | Diff File | |||
| add - application/third_party/Twig/Profiler/Node/LeaveProfile.php | Diff File | |||
| add - application/third_party/Twig/Profiler/NodeVisitor/Profiler.php | Diff File | |||
| add - application/third_party/Twig/Profiler/Profile.php | Diff File | |||
| add - application/third_party/Twig/RuntimeLoaderInterface.php | Diff File | |||
| add - application/third_party/Twig/Sandbox/SecurityError.php | Diff File | |||
| add - application/third_party/Twig/Sandbox/SecurityNotAllowedFilterError.php | Diff File | |||
| add - application/third_party/Twig/Sandbox/SecurityNotAllowedFunctionError.php | Diff File | |||
| add - application/third_party/Twig/Sandbox/SecurityNotAllowedMethodError.php | Diff File | |||
| add - application/third_party/Twig/Sandbox/SecurityNotAllowedPropertyError.php | Diff File | |||
| add - application/third_party/Twig/Sandbox/SecurityNotAllowedTagError.php | Diff File | |||
| add - application/third_party/Twig/Sandbox/SecurityPolicy.php | Diff File | |||
| add - application/third_party/Twig/Sandbox/SecurityPolicyInterface.php | Diff File | |||
| add - application/third_party/Twig/SimpleFilter.php | Diff File | |||
| add - application/third_party/Twig/SimpleFunction.php | Diff File | |||
| add - application/third_party/Twig/SimpleTest.php | Diff File | |||
| add - application/third_party/Twig/Source.php | Diff File | |||
| add - application/third_party/Twig/SourceContextLoaderInterface.php | Diff File | |||
| add - application/third_party/Twig/Template.php | Diff File | |||
| add - application/third_party/Twig/TemplateInterface.php | Diff File | |||
| add - application/third_party/Twig/TemplateWrapper.php | Diff File | |||
| add - application/third_party/Twig/Test.php | Diff File | |||
| add - application/third_party/Twig/Test/Function.php | Diff File | |||
| add - application/third_party/Twig/Test/IntegrationTestCase.php | Diff File | |||
| add - application/third_party/Twig/Test/Method.php | Diff File | |||
| add - application/third_party/Twig/Test/Node.php | Diff File | |||
| add - application/third_party/Twig/Test/NodeTestCase.php | Diff File | |||
| add - application/third_party/Twig/TestCallableInterface.php | Diff File | |||
| add - application/third_party/Twig/TestInterface.php | Diff File | |||
| add - application/third_party/Twig/Token.php | Diff File | |||
| add - application/third_party/Twig/TokenParser.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/AutoEscape.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/Block.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/Do.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/Embed.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/Extends.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/Filter.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/Flush.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/For.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/From.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/If.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/Import.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/Include.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/Macro.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/Sandbox.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/Set.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/Spaceless.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/Use.php | Diff File | |||
| add - application/third_party/Twig/TokenParser/With.php | Diff File | |||
| add - application/third_party/Twig/TokenParserBroker.php | Diff File | |||
| add - application/third_party/Twig/TokenParserBrokerInterface.php | Diff File | |||
| add - application/third_party/Twig/TokenParserInterface.php | Diff File | |||
| add - application/third_party/Twig/TokenStream.php | Diff File | |||
| add - application/third_party/Twig/Util/DeprecationCollector.php | Diff File | |||
| add - application/third_party/Twig/Util/TemplateDirIterator.php | Diff File | |||
| mod - application/views/admin/export/generatestats/simplestats/_statisticsoutput_graphs.php | Diff File | |||
| mod - application/views/admin/participants/attributeControl_view.php | Diff File | |||
| mod - application/views/admin/participants/displayParticipants_view.php | Diff File | |||
| mod - application/views/admin/participants/sharePanel_view.php | Diff File | |||
| mod - application/views/admin/responses/listResponses_view.php | Diff File | |||
| mod - application/views/admin/super/fullpagebar_view.php | Diff File | |||
| mod - application/views/admin/survey/Question/advanced_settings_view.php | Diff File | |||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | |||
| mod - application/views/admin/survey/subview/accordion/_accordion_container.php | Diff File | |||
| add - application/views/admin/survey/subview/accordion/_plugin_panel.php | Diff File | |||
| mod - application/views/admin/survey/subview/accordion/_plugins_panel.php | Diff File | |||
| mod - application/views/admin/templates/templateeditor_question_answertext_view.php | Diff File | |||
| mod - application/views/admin/templates/templateeditor_surveylist_view.php | Diff File | |||
| mod - application/views/admin/update/_ajaxVariables.php | Diff File | |||
| add - application/views/admin/update/manage/manage_key.php | Diff File | |||
| add - application/views/admin/update/manage/subscribe.php | Diff File | |||
| mod - application/views/admin/update/updater/welcome/_welcome.php | Diff File | |||
| mod - application/views/survey/questions/answer/arrays/10point/rows/answer_row.php | Diff File | |||
| mod - application/views/survey/questions/answer/arrays/5point/rows/answer_row.php | Diff File | |||
| mod - application/views/survey/questions/answer/arrays/array/dropdown/rows/answer_row.php | Diff File | |||
| mod - application/views/survey/questions/answer/arrays/array/no_dropdown/rows/answer_row.php | Diff File | |||
| mod - application/views/survey/questions/answer/arrays/column/answer.php | Diff File | |||
| mod - application/views/survey/questions/answer/arrays/dualscale/answer.php | Diff File | |||
| mod - application/views/survey/questions/answer/arrays/increasesamedecrease/rows/answer_row.php | Diff File | |||
| mod - application/views/survey/questions/answer/arrays/multiflexi/rows/answer_row.php | Diff File | |||
| mod - application/views/survey/questions/answer/arrays/texts/rows/answer_row.php | Diff File | |||
| mod - application/views/survey/questions/answer/arrays/yesnouncertain/rows/answer_row.php | Diff File | |||
| rm - application/views/survey/questions/answer/multiplechoice/rows/answer_row.php | Diff File | |||
| add - application/views/survey/questions/answer/multiplechoice/rows/answer_row.twig | Diff File | |||
| mod - application/views/survey/questions/answer/multiplenumeric/rows/input/answer_row.php | Diff File | |||
| mod - application/views/survey/questions/answer/multiplenumeric/rows/sliders/answer_row.php | Diff File | |||
| mod - application/views/survey/questions/answer/multipleshorttext/rows/answer_row_inputtext.php | Diff File | |||
| mod - application/views/survey/questions/answer/multipleshorttext/rows/answer_row_textarea.php | Diff File | |||
| mod - application/views/survey/questions/answer/shortfreetext/location_mapservice/item_100.php | Diff File | |||
| mod - application/views/surveys/publicSurveyList.php | Diff File | |||
| mod - scripts/admin/admin_core.js | Diff File | |||
| mod - scripts/admin/participantpanel.js | Diff File | |||
| mod - scripts/admin/questions.js | Diff File | |||
| mod - scripts/map.js | Diff File | |||
| add - third_party/Twig/ETwigViewRenderer.php | Diff File | |||
| add - third_party/Twig/README.md | Diff File | |||
| add - third_party/Twig/README_RU.md | Diff File | |||
| add - third_party/Twig/changelog.md | Diff File | |||
| add - third_party/Twig/composer.json | Diff File | |||
