Changesets: LimeSurvey
twig c84d2153 2016-09-12 09:26:46 Details Diff |
Merge remote-tracking branch 'origin/master' into twig | ||
mod - application/models/TokenDynamic.php | Diff File | ||
twig eadcd41f 2016-09-12 09:26:30 Details Diff |
Dev: Add sandbox to Twig | ||
mod - application/third_party/Twig/ETwigViewRenderer.php | Diff File | ||
answers_html baf5c4c2 2016-09-10 18:37:06 Details Diff |
Dev : add label to sum and remaining Dev: unsure is the good tag/class Dev: in 2.06 : dynamic remaining show red/green : not in 2.50 |
||
mod - application/views/survey/questions/multiplenumeric/answer_input.php | Diff File | ||
answers_html 0ab388b4 2016-09-10 18:32:32 Details Diff |
Dev: fix test on qanda | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
answers_html 454ea2aa 2016-09-10 18:30:43 Details Diff |
Dev: ul/li on yes-no and gender : button and radio Dev: fix empty label on yes-no and gender Dev: fix inline on ul/li radio Dev: added fontawesome thumb for yes-no : is it OK ? |
||
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - application/views/survey/questions/gender/buttons/answer.php | Diff File | ||
mod - application/views/survey/questions/gender/radio/answer.php | Diff File | ||
mod - application/views/survey/questions/yesno/buttons/item.php | Diff File | ||
mod - application/views/survey/questions/yesno/radio/item.php | Diff File | ||
answers_html 54ae5381 2016-09-10 17:09:46 Details Diff |
Merge branch 'toolsforresearch-iss025' into answers_html | ||
mod - application/views/survey/questions/arrays/increasesamedecrease/rows/answer_row.php | Diff File | ||
mod - application/views/survey/questions/yesno/buttons/item.php | Diff File | ||
mod - templates/default/css/flat_and_modern.css | Diff File | ||
mod - templates/default/css/template.css | Diff File | ||
mod - templates/default/scripts/template.js | Diff File | ||
mod - templates/default/views/groupdescription.pstpl | Diff File | ||
mod - templates/default/views/question.pstpl | Diff File | ||
mod - templates/default/views/startgroup.pstpl | Diff File | ||
mod - templates/default/views/startpage.pstpl | Diff File | ||
mod - templates/default/views/welcome.pstpl | Diff File | ||
answers_html 004fc3a3 2016-09-10 17:09:07 Details Diff |
Merge branch 'iss025' of https://github.com/toolsforresearch/LimeSurvey-Shnoulle into toolsforresearch-iss025 Dev : question.pstpl : take the new unmodified Dev : increasamedecrease : remove the text-center # Conflicts: # application/views/survey/questions/arrays/increasesamedecrease/rows/answer_row.php # templates/default/views/question.pstpl |
||
mod - application/views/survey/questions/arrays/increasesamedecrease/rows/answer_row.php | Diff File | ||
mod - application/views/survey/questions/yesno/buttons/item.php | Diff File | ||
mod - templates/default/css/flat_and_modern.css | Diff File | ||
mod - templates/default/css/template.css | Diff File | ||
mod - templates/default/scripts/template.js | Diff File | ||
mod - templates/default/views/groupdescription.pstpl | Diff File | ||
mod - templates/default/views/question.pstpl | Diff File | ||
mod - templates/default/views/startgroup.pstpl | Diff File | ||
mod - templates/default/views/startpage.pstpl | Diff File | ||
mod - templates/default/views/welcome.pstpl | Diff File | ||
answers_html 65d20a78 2016-09-10 16:42:45 Details Diff |
Increase Same decrease: deleted text-center class | ||
mod - application/views/survey/questions/arrays/increasesamedecrease/rows/answer_row.php | Diff File | ||
answers_html 7647d188 2016-09-10 16:38:16 Details Diff |
Yes/no stated without row. Now corrected | ||
mod - application/views/survey/questions/yesno/buttons/item.php | Diff File | ||
answers_html 4e1162fe 2016-09-10 16:31:00 Details Diff |
Typo in question.pstpl | ||
mod - templates/default/views/question.pstpl | Diff File | ||
answers_html 7cf75243 2016-09-10 16:28:49 Details Diff |
Some extra room for answers | ||
mod - templates/default/css/template.css | Diff File | ||
answers_html b3e5818b 2016-09-10 16:07:59 Details Diff |
Merge branch 'iss025' of https://github.com/toolsforresearch/LimeSurvey-Shnoulle into iss025 | ||
mod - templates/default/views/welcome.pstpl | Diff File | ||
answers_html 40d49eae 2016-09-10 16:07:20 Details Diff |
Deleted class jumbotron and added jumbotron styling statements totopContainer | ||
mod - templates/default/css/template.css | Diff File | ||
mod - templates/default/views/startpage.pstpl | Diff File | ||
master 52ecf96a 2016-09-10 13:15:31 Details Diff |
Fixed issue 11574: Search box in main survey list is case sensitive Dev: Also fixing the same problem in tokens list |
Affected Issues 11574 |
|
add - application/core/LSDbCriteria.php | Diff File | ||
mod - application/models/Survey.php | Diff File | ||
mod - application/models/TokenDynamic.php | Diff File | ||
answers_html 1f1995cb 2016-09-10 13:01:12 Committer: GitHub Details Diff |
Update welcome.pstpl | ||
mod - templates/default/views/welcome.pstpl | Diff File | ||
master 9303c2ce 2016-09-10 12:44:39 Details Diff |
Fixed issue: SQL error with postgresql when filling integer fields in tokens list Dev: Similar error and fix to bug 11415 |
Affected Issues 11415 |
|
mod - application/models/TokenDynamic.php | Diff File | ||
global_participants cf432a0d 2016-09-10 12:44:39 Details Diff |
Fixed issue: SQL error with postgresql when filling integer fields in tokens list Dev: Similar error and fix to bug 11415 |
Affected Issues 11415 |
|
mod - application/models/TokenDynamic.php | Diff File | ||
answers_html 1f06c65a 2016-09-10 12:42:29 Details Diff |
Clean up om template/views level | ||
mod - templates/default/css/flat_and_modern.css | Diff File | ||
mod - templates/default/css/template.css | Diff File | ||
mod - templates/default/scripts/template.js | Diff File | ||
mod - templates/default/views/groupdescription.pstpl | Diff File | ||
mod - templates/default/views/question.pstpl | Diff File | ||
mod - templates/default/views/startgroup.pstpl | Diff File | ||
mod - templates/default/views/startpage.pstpl | Diff File | ||
mod - templates/default/views/welcome.pstpl | Diff File | ||
twig 1378500e 2016-09-09 15:35:13 Details Diff |
Dev: Add support to override question view with Twig template | ||
mod - application/config/internal.php | Diff File | ||
mod - application/core/LSYii_Application.php | Diff File | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
twig a62f1040 2016-09-09 15:34:35 Details Diff |
Dev: Add Twig | ||
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/ETwigViewRenderer.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/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/README.md | Diff File | ||
add - application/third_party/Twig/README_RU.md | 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/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/Template.php | Diff File | ||
add - application/third_party/Twig/TemplateInterface.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/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 | ||
add - application/third_party/Twig/changelog.md | Diff File | ||
add - application/third_party/Twig/composer.json | Diff File | ||
answers_html c4635557 2016-09-09 13:16:44 Committer: GitHub Details Diff |
Merge pull request #24 from toolsforresearch/iss23 Deleted .question-wrapper from question.pstpl in default template. #23 OK, but : think we need a global wrapper/container for whole question+answers+help part :) with a clean class name. And we must fix the question-title-container VS questionvalidcontainer VS answer-container |
||
mod - templates/default/views/question.pstpl | Diff File | ||
answers_html ab743849 2016-09-09 12:30:02 Details Diff |
Deleted .question-wrapper from question.pstpl in default template. #23 | ||
mod - templates/default/views/question.pstpl | Diff File | ||
master 4befbe59 2016-09-09 06:08:45 Committer: GitHub Details Diff |
Merge pull request #532 from Shnoulle/master_fix11626_beforeTokenEmail Fix and improve beforeTokenEmail |
Affected Issues 11626 |
|
mod - application/controllers/RegisterController.php | Diff File | ||
mod - application/controllers/admin/tokens.php | Diff File | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
answers_html c17fe469 2016-09-09 01:39:44 Details Diff |
Dev: ul/li on multiple numeric without slider Dev: https://github.com/Shnoulle/LimeSurvey-Shnoulle/issues/3 Dev: review labelWidth/inputWidth system |
||
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - application/views/survey/questions/multiplenumeric/answer.php | Diff File | ||
mod - application/views/survey/questions/multiplenumeric/answer_input.php | Diff File | ||
mod - application/views/survey/questions/multiplenumeric/empty.php | Diff File | ||
mod - application/views/survey/questions/multiplenumeric/rows/input/answer_row.php | Diff File | ||
mod - application/views/survey/questions/multipleshorttext/rows/answer_row_inputtext.php | Diff File | ||
answers_html 8c6d2e4d 2016-09-09 00:54:48 Details Diff |
Dev: ul/li on multichoice with comment https://github.com/Shnoulle/LimeSurvey-Shnoulle/issues/3 Dev: fix some aria |
||
mod - application/views/survey/questions/listradio/rows/answer_row_other.php | Diff File | ||
mod - application/views/survey/questions/multiplechoice_with_comments/answer.php | Diff File | ||
mod - application/views/survey/questions/multiplechoice_with_comments/rows/answer_row.php | Diff File | ||
mod - application/views/survey/questions/multiplechoice_with_comments/rows/answer_row_other.php | Diff File |