Changesets: LimeSurvey

Search Browse Back to Index

master 8a25591e

2016-12-20 14:51

ollehar


Details Diff		 Dev: Typo in button class
mod - application/views/admin/token/addtokenpost.php Diff File

master 7fa4fb0a

2016-12-20 14:47

ollehar


Details Diff		 Dev: PHPDoc; formatting
mod - application/controllers/admin/tokens.php Diff File

master 4db0f45c

2016-12-20 14:22

ollehar


Details Diff		 Fixed issue 12008: The Notification-Widget is not available inside the template editor Affected Issues
12008
mod - application/controllers/admin/templates.php Diff File

master a0af6f05

2016-12-19 17:37

DenisChenu


Details Diff		 Dev: --interval optionnable in plugin cron
mod - application/commands/PluginCommand.php Diff File

develop 9491b232

2016-12-19 14:39

ollehar


Details Diff		 Merge branch 'cint' into develop

Conflicts:
application/core/plugins/CintLink/CintXml.php

develop 68e6d99a

2016-12-19 14:27

ollehar


Details Diff		 Dev: Remove tracevar
mod - application/views/survey/questions/answer/arrays/array/no_dropdown/rows/answer_row.php Diff File

develop 9db36773

2016-12-19 14:24

ollehar


Details Diff		 Dev: Remove CintLink plugin

Dev: Revert this commit to continue with CintLink dev
rm - application/core/plugins/CintLink/CintLink.php Diff
rm - application/core/plugins/CintLink/CintLinkAPI.php Diff
rm - application/core/plugins/CintLink/CintXml.php Diff
rm - application/core/plugins/CintLink/config.json Diff
rm - application/core/plugins/CintLink/css/bootstrap-tour.min.css Diff
rm - application/core/plugins/CintLink/css/cintlink.css Diff
rm - application/core/plugins/CintLink/css/icomoon.eot Diff
rm - application/core/plugins/CintLink/css/icomoon.svg Diff
rm - application/core/plugins/CintLink/css/icomoon.ttf Diff
rm - application/core/plugins/CintLink/css/icomoon.woff Diff
rm - application/core/plugins/CintLink/js/bootstrap-tour.min.js Diff
rm - application/core/plugins/CintLink/js/checkOrders.js Diff
rm - application/core/plugins/CintLink/js/cintlink.js Diff
rm - application/core/plugins/CintLink/js/tour.js Diff
rm - application/core/plugins/CintLink/model/CintLinkOrder.php Diff
rm - application/core/plugins/CintLink/views/activateFeedback.php Diff
rm - application/core/plugins/CintLink/views/buttons/cancelled.php Diff
rm - application/core/plugins/CintLink/views/buttons/hold.php Diff
rm - application/core/plugins/CintLink/views/common.php Diff
rm - application/core/plugins/CintLink/views/dashboard.php Diff
rm - application/core/plugins/CintLink/views/index.php Diff
rm - application/core/plugins/CintLink/views/indexGlobal.php Diff
rm - application/core/plugins/CintLink/views/loginform.php Diff
rm - application/core/plugins/CintLink/views/notifications/nagging.php Diff
rm - application/core/plugins/CintLink/views/notifications/tutorial.php Diff
rm - application/core/plugins/CintLink/views/notifications/warning_popup.php Diff
rm - application/core/plugins/CintLink/views/sidemenu.php Diff

develop 8192921f

2016-12-19 14:23

ollehar


Details Diff		 Dev: Correct db message
mod - application/helpers/update/updatedb_helper.php Diff File

develop 212f771a

2016-12-19 14:14

ollehar


Details Diff		 Merge remote-tracking branch 'origin/cint' into develop

Conflicts:
application/config/version.php
application/controllers/survey/index.php
application/core/LSYii_Application.php
application/helpers/update/updatedb_helper.php
installer/sql/create-mssql.sql
installer/sql/create-mysql.sql
installer/sql/create-pgsql.sql
mod - application/config/internal.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/NotificationController.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/survey/index.php Diff File
add - application/core/LSCGettextMessageSource.php Diff File
mod - application/core/LSHttpRequest.php Diff File
mod - application/core/LSUserIdentity.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
add - application/core/plugins/CintLink/CintLink.php Diff File
add - application/core/plugins/CintLink/CintLinkAPI.php Diff File
add - application/core/plugins/CintLink/CintXml.php Diff File
add - application/core/plugins/CintLink/config.json Diff File
add - application/core/plugins/CintLink/css/bootstrap-tour.min.css Diff File
add - application/core/plugins/CintLink/css/cintlink.css Diff File
add - application/core/plugins/CintLink/css/icomoon.eot Diff File
add - application/core/plugins/CintLink/css/icomoon.svg Diff File
add - application/core/plugins/CintLink/css/icomoon.ttf Diff File
add - application/core/plugins/CintLink/css/icomoon.woff Diff File
add - application/core/plugins/CintLink/js/bootstrap-tour.min.js Diff File
add - application/core/plugins/CintLink/js/checkOrders.js Diff File
add - application/core/plugins/CintLink/js/cintlink.js Diff File
add - application/core/plugins/CintLink/js/tour.js Diff File
add - application/core/plugins/CintLink/model/CintLinkOrder.php Diff File
add - application/core/plugins/CintLink/views/activateFeedback.php Diff File
add - application/core/plugins/CintLink/views/buttons/cancelled.php Diff File
add - application/core/plugins/CintLink/views/buttons/hold.php Diff File
add - application/core/plugins/CintLink/views/common.php Diff File
add - application/core/plugins/CintLink/views/dashboard.php Diff File
add - application/core/plugins/CintLink/views/index.php Diff File
add - application/core/plugins/CintLink/views/indexGlobal.php Diff File
add - application/core/plugins/CintLink/views/loginform.php Diff File
add - application/core/plugins/CintLink/views/notifications/nagging.php Diff File
add - application/core/plugins/CintLink/views/notifications/tutorial.php Diff File
add - application/core/plugins/CintLink/views/notifications/warning_popup.php Diff File
add - application/core/plugins/CintLink/views/sidemenu.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/MenuObjects/Menu.php Diff File
mod - application/libraries/MenuObjects/MenuItem.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/models/Plugin.php Diff File
mod - application/models/QuestionGroup.php Diff File
add - application/models/UniqueNotification.php Diff File
mod - application/views/admin/super/footer.php Diff File
mod - application/views/admin/super/sidemenu.php Diff File
mod - application/views/admin/survey/deactivateSurvey_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/layouts/main.php Diff File
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - installer/sql/create-pgsql.sql Diff File
mod - scripts/admin/notifications.js Diff File
rm - tmp/assets/index.html Diff

develop 352c511e

2016-12-18 14:59

DenisChenu


Details Diff		 Dev: TemplateConfiguration->getFrameworkPackages
mod - application/models/TemplateConfiguration.php Diff File

develop 2670326d

2016-12-18 14:55

DenisChenu


Details Diff		 /bin/bash: q : commande introuvable
mod - application/models/TemplateConfiguration.php Diff File

develop da5193cc

2016-12-18 13:52

DenisChenu


Details Diff		 Dev: Fixed : be sure to get the actual 'survey-template' package
mod - application/controllers/admin/templates.php Diff File
mod - application/models/TemplateConfiguration.php Diff File

develop 707a9f2a

2016-12-18 13:38

DenisChenu


Details Diff		 Dev: Fixed issue framework class for body
mod - application/config/third_party.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/models/TemplateConfiguration.php Diff File

develop 40c7bb21

2016-12-18 13:19

DenisChenu


Details Diff		 Dev: add any framework (if exist) , theming can be done in config.xml (css & js)
Dev: load order fixed : framework always first
Dev: load rtl framework if exist
Dev: 2.5X template still compatible (rtl too)
Dev: pre 2.5X template not tested
mod - application/controllers/admin/templates.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - templates/default/config.xml Diff File
rm - templates/default/css/jquery-ui-custom-rtl.css Diff
rm - templates/default/css/jquery-ui-custom.css Diff
rm - templates/default/css/template-rtl.css Diff

develop d5b01489

2016-12-17 17:52

DenisChenu


Details Diff		 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
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
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

develop 0fd68403

2016-12-17 17:48

DenisChenu


Details Diff		 Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop
mod - application/commands/PluginCommand.php Diff File
mod - application/commands/console.php Diff File
mod - application/controllers/admin/templates.php Diff File

master 2f9b7eeb

2016-12-17 15:50

DenisChenu


Details Diff		 Dev: better fix for runtimePath : test tmp/runtime, really one used
mod - application/commands/console.php Diff File

develop 30e9e058

2016-12-16 19:17

LouisGac


Details Diff		 Dev: used {{ thissurvey.name }} instead of {SURVEYNAME}
mod - templates/default/views/startpage.pstpl Diff File

develop f983dacb

2016-12-16 18:23

LouisGac


Details Diff		 Dev: few more twig and indications in startpage
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - templates/default/views/startpage.pstpl Diff File

develop df6f99e9

2016-12-16 18:14

LouisGac


Details Diff		 Dev: replaced the renderPartial by the twig renderer
mod - application/helpers/replacements_helper.php Diff File

develop 443aded5

2016-12-16 18:13

LouisGac


Details Diff		 Dev: added surveylanguage as a variable for twig
mod - application/helpers/replacements_helper.php Diff File

develop b04c11b0

2016-12-16 18:12

LouisGac


Details Diff		 Dev: moved twig rendering at the end of templatereplace() to get the all the defined vars
mod - application/helpers/replacements_helper.php Diff File

develop b48a92df

2016-12-16 17:38

LouisGac


Details Diff		 Dev: use twig only when some variables are passed to the view.
mod - application/core/LSETwigViewRenderer.php Diff File

develop 543ee2b6

2016-12-16 17:34

LouisGac


Details Diff		 Dev: refactorisation of twig renderer
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/helpers/qanda_helper.php Diff File

develop e83ef484

2016-12-16 15:34

LouisGac


Details Diff		 Dev: first test of twig usage in PSTPL
mod - templates/default/views/startpage.pstpl Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 587 588 589 590 591 592 593 ... 600 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1465 1466 1467  Next  Last