Changesets: LimeSurvey
|
develop f1329f57 2016-12-16 15:31
Details Diff |
Dev: added twig renderer before LS replacement. | ||
| mod - application/helpers/replacements_helper.php | Diff File | ||
|
develop 2569f0ae 2016-12-16 15:30
Details Diff |
Dev: added function LSETwigViewRenderer::renderTemplateFromString | ||
| mod - application/core/LSETwigViewRenderer.php | Diff File | ||
|
develop 27fab4e3 2016-12-16 15:22
Details Diff |
Dev: added Twig StringLoader extension | ||
| mod - application/config/internal.php | Diff File | ||
|
master f600ad4f 2016-12-15 18:57 Details Diff |
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey | ||
| mod - application/controllers/admin/templates.php | Diff File | ||
|
master 3368bced 2016-12-15 18:55 Details Diff |
Dev: Fixed issue runtimePath badly set for cron command Dev: set to actual directory/tmp (then must be launched in ls directory to work) |
||
| mod - application/commands/PluginCommand.php | Diff File | ||
| mod - application/commands/console.php | Diff File | ||
|
develop 019a6c51 2016-12-15 17:15
Details Diff |
Dev: few fixes | ||
| mod - application/core/LSETwigViewRenderer.php | Diff File | ||
|
develop 300cc0e8 2016-12-15 15:35
Details Diff |
Dev: updated quanda to use LSETwigViewRenderer::renderFile | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
develop 40dd0ede 2016-12-15 15:35
Details Diff |
Dev: change config to use LSETwigViewRenderer | ||
| mod - application/config/internal.php | Diff File | ||
|
develop a8f1aa9f 2016-12-15 15:27
Details Diff |
Dev: overload ETwigViewRenderer::renderFile() to check if template override core views | ||
| mod - application/core/LSETwigViewRenderer.php | Diff File | ||
|
develop fb33d6b5 2016-12-15 15:26
Details Diff |
Dev: overload ETwigViewRenderer::addExtensions() | ||
| add - application/core/LSETwigViewRenderer.php | Diff File | ||
|
develop 401de006 2016-12-15 15:25
Details Diff |
Dev: reversed ETwigViewRenderer to its original version | ||
| mod - third_party/Twig/ETwigViewRenderer.php | Diff File | ||
|
develop e225a8f4 2016-12-14 19:48
Details Diff |
Dev: added $requiredView for core views in qanda_helper::doRender() | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
develop 076ffbdd 2016-12-14 19:46
Details Diff |
Dev: First test with multiplechoice, answer_row.twig Dev: !!!! JUST A TEST !!! DON'T START TO REWRITE VIEW ON THIS MODEL !!! NEED FIRST TO CHANGE TWIG TEMPLATE SYNTAX TO AVOID CONFLICT WITH EXPRESSION MANAGER !!!! |
||
| rm - application/views/survey/questions/answer/multiplechoice/rows/answer_row.php | Diff | ||
| add - application/views/survey/questions/answer/multiplechoice/rows/answer_row.twig | Diff File | ||
|
develop 7c033139 2016-12-14 19:41
Details Diff |
Dev: added method to render twig file in qanda_helper | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
develop d7735dd4 2016-12-14 19:40
Details Diff |
Dev: added Twig_Extension_Sandbox Dev: the modification of ETwigViewRenderer as been submitted as a PR (https://github.com/yiiext/twig-renderer/pull/40) Dev: a local fork of it has been created in the LimeSurvey GitHub |
||
| mod - application/config/internal.php | Diff File | ||
| mod - third_party/Twig/ETwigViewRenderer.php | Diff File | ||
|
develop 27087665 2016-12-14 17:46
Details Diff |
Dev: Add the Twig configuration to the 'components' section | ||
| mod - application/config/internal.php | Diff File | ||
|
develop c4621595 2016-12-14 17:44
Details Diff |
Dev: point the alias application.vendor.Twig to application.third_party.Twig to avoid to hack ETwigViewRenderer for further update of the extension | ||
| mod - application/config/internal.php | Diff File | ||
|
develop 2d9df542 2016-12-14 17:40
Details Diff |
Dev: Download and extract all Twig files from https://github.com/twigphp/Twig/tags under application/third_party/Twig (Yii: protected/vendor/Twig.) Dev: see https://github.com/yiiext/twig-renderer#installing-manually |
||
| 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 | ||
|
develop ef8bff39 2016-12-14 17:39
Details Diff |
Dev: Extract the release file under third_party/Twig (Yii: vendor/Twig). Dev: see https://github.com/yiiext/twig-renderer#installing-manually |
||
| 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 | ||
|
develop 8a6fc6d0 2016-12-14 17:13 Committer: GitHub Details Diff |
Merge pull request #613 from Shnoulle/develop_setting_separate Dev: separe settings in survey and question |
Affected Issues 12005 |
|
| 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 - scripts/admin/admin_core.js | Diff File | ||
| mod - scripts/admin/questions.js | Diff File | ||
|
develop d531202d 2016-12-14 17:10 Details Diff |
Dev: "real" accordion on survey settings too Dev: Fixed issue : panel is not shown after open (open timer for a good example) |
||
| mod - application/views/admin/survey/subview/accordion/_accordion_container.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_plugin_panel.php | Diff File | ||
| mod - scripts/admin/admin_core.js | Diff File | ||
|
master 8c55d12c 2016-12-14 13:29
Details Diff |
Fixed issue: possible cross-site scripting in template editor | ||
| mod - application/controllers/admin/templates.php | Diff File | ||
|
develop 695a7b64 2016-12-14 10:54 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop Dev: F** start merge conflicts ... Dev: F** all this bug are already fixed in 3.0 # Conflicts: # application/controllers/survey/index.php # application/helpers/qanda_helper.php # application/helpers/replacements_helper.php # application/libraries/Load_answers.php # application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php |
||
| mod - application/commands/console.php | Diff File | ||
| mod - application/controllers/RegisterController.php | Diff File | ||
| mod - application/controllers/admin/templates.php | Diff File | ||
| mod - application/controllers/survey/index.php | Diff File | ||
| mod - application/helpers/qanda_helper.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/update/_ajaxVariables.php | Diff File | ||
| mod - scripts/admin/participantpanel.js | Diff File | ||
|
master 1cd88392 2016-12-13 20:50
Details Diff |
Fixed issue 11533: Sliders with any initial value canot be mandatory (slider_user_no_action_ always 0) |
Affected Issues 11533 |
|
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php | Diff File | ||
|
master 1bfaffc5 2016-12-13 19:04
Details Diff |
Fixed issue: possible cross-site scripting issue in update view. | ||
| mod - application/views/admin/update/_ajaxVariables.php | Diff File | ||
