Changesets: LimeSurvey
twig-layout fcbe78c0 2017-01-06 15:31
Details Diff |
Dev: remove keyword from start page | ||
mod - templates/default/views/startpage.twig | Diff File | ||
twig-layout 9d6d755a 2017-01-06 15:25
Details Diff |
Dev: removed clearalllinks keyword | ||
mod - application/helpers/replacements_helper.php | Diff File | ||
mod - templates/default/views/subviews/clearall_links.twig | Diff File | ||
twig-layout 64e3acdd 2017-01-06 15:15
Details Diff |
Dev: generate exit button from twig. | ||
mod - application/helpers/replacements_helper.php | Diff File | ||
mod - templates/default/views/subviews/clearall_links.twig | Diff File | ||
twig-layout a95a840a 2017-01-06 15:02
Details Diff |
Dev: added clearall_links.twig | ||
mod - templates/default/views/startpage.twig | Diff File | ||
add - templates/default/views/subviews/clearall_links.twig | Diff File | ||
twig-layout f50c3510 2017-01-06 14:56
Details Diff |
Dev: updated start_page.twig | ||
mod - templates/default/views/startpage.twig | Diff File | ||
twig-layout c4113453 2017-01-06 14:55
Details Diff |
Dev: removed keywords SAVE/LOAD buttons | ||
mod - application/helpers/replacements_helper.php | Diff File | ||
twig-layout 65dc9764 2017-01-06 14:54
Details Diff |
Dev: moved and added comments for google_analytics | ||
twig-layout a282a0c9 2017-01-06 14:54
Details Diff |
Dev: added merge method and set tag to twig sandbox. | ||
mod - application/config/internal.php | Diff File | ||
twig-layout d3f85cd2 2017-01-06 14:53
Details Diff |
Dev: added comments | ||
rm - templates/default/views/start_form.twig | Diff | ||
add - templates/default/views/subviews/save_links.twig | Diff File | ||
mod - templates/default/views/subviews/start_form.twig | Diff File | ||
twig-layout 1f761f11 2017-01-06 14:27
Details Diff |
Dev: added surveyUrl to thissurvey variable (so it can be used inside template files) | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
twig-layout b94ffd72 2017-01-06 14:26
Details Diff |
Dev: moved and refactored start_form.twig | ||
add - templates/default/views/subviews/start_form.twig | Diff File | ||
twig-layout 7d8f1dab 2017-01-06 13:45
Details Diff |
Dev: added translate filter to twig | ||
mod - application/config/internal.php | Diff File | ||
develop b46e70ee 2017-01-06 13:40 Details Diff |
Dev: Initialize inputnames | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
develop ebde0ebc 2017-01-06 13:32 Details Diff |
Dev: Add missing variable | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
develop 74281102 2017-01-06 13:28 Details Diff |
Dev: Remove unused break | ||
mod - application/helpers/expressions/em_core_helper.php | Diff File | ||
develop 2cd29f40 2017-01-06 13:11 Details Diff |
Dev: Check if question_template is set before use | ||
mod - application/models/QuestionTemplate.php | Diff File | ||
develop fe1d9761 2017-01-06 13:06 Details Diff |
Dev: Fix correct view folder | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
develop 92bc91fd 2017-01-06 13:00 Details Diff |
Dev: Fix lang variable | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
master bb75bdff 2017-01-06 12:26 Details Diff |
Dev: Add another localization string | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
develop 72f5f25b 2017-01-06 12:17 Details Diff |
Merge branch 'develop' of https://github.com/LimeSurvey/LimeSurvey into develop | ||
mod - application/views/survey/questions/answer/5pointchoice/answer.php | Diff File | ||
mod - application/views/survey/questions/answer/arrays/column/answer.php | Diff File | ||
mod - application/views/survey/questions/answer/gender/buttons/answer.php | Diff File | ||
mod - application/views/survey/questions/answer/gender/radio/answer.php | Diff File | ||
mod - application/views/survey/questions/answer/list_with_comment/list/answer.php | Diff File | ||
mod - application/views/survey/questions/answer/listradio/answer.php | Diff File | ||
mod - application/views/survey/questions/answer/yesno/buttons/item.php | Diff File | ||
mod - application/views/survey/questions/answer/yesno/radio/item.php | Diff File | ||
develop 0835d093 2017-01-06 12:17 Details Diff |
Merge branch 'master' into develop Conflicts: application/config/version.php application/helpers/expressions/em_core_helper.php application/helpers/expressions/em_manager_helper.php application/helpers/qanda_helper.php |
||
mod - application/config/version.php | Diff File | ||
mod - application/extensions/SettingsWidget/SettingsWidget.php | Diff File | ||
mod - application/helpers/admin/activate_helper.php | Diff File | ||
mod - application/helpers/expressions/em_core_helper.php | Diff File | ||
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - application/helpers/update/updatedb_helper.php | Diff File | ||
mod - application/models/Participant.php | Diff File | ||
add - application/third_party/phpmailer/.gitattributes | Diff File | ||
mod - application/third_party/phpmailer/.travis.yml | Diff File | ||
mod - application/third_party/phpmailer/README.md | Diff File | ||
add - application/third_party/phpmailer/SECURITY.md | Diff File | ||
mod - application/third_party/phpmailer/VERSION | Diff File | ||
mod - application/third_party/phpmailer/changelog.md | Diff File | ||
mod - application/third_party/phpmailer/class.phpmailer.php | Diff File | ||
mod - application/third_party/phpmailer/class.phpmaileroauth.php | Diff File | ||
mod - application/third_party/phpmailer/class.pop3.php | Diff File | ||
mod - application/third_party/phpmailer/class.smtp.php | Diff File | ||
mod - application/third_party/phpmailer/composer.lock | Diff File | ||
mod - application/third_party/phpmailer/extras/htmlfilter.php | Diff File | ||
mod - application/third_party/phpmailer/extras/ntlm_sasl_client.php | Diff File | ||
mod - application/third_party/phpmailer/language/phpmailer.lang-de.php | Diff File | ||
mod - application/third_party/phpmailer/language/phpmailer.lang-es.php | Diff File | ||
mod - application/third_party/phpmailer/language/phpmailer.lang-ro.php | Diff File | ||
mod - docs/release_notes.txt | Diff File | ||
mod - locale/_template/limesurvey.pot | Diff File | ||
mod - locale/ca/ca.mo | Diff File | ||
mod - locale/en/en.mo | Diff File | ||
mod - locale/fi/fi.mo | Diff File | ||
mod - locale/fr/fr.mo | Diff File | ||
mod - locale/he/he.mo | Diff File | ||
mod - locale/hu/hu.mo | Diff File | ||
mod - locale/it-informal/it-informal.mo | Diff File | ||
mod - locale/it/it.mo | Diff File | ||
mod - locale/ky/ky.mo | Diff File | ||
mod - locale/nl-informal/nl-informal.mo | Diff File | ||
mod - locale/nl/nl.mo | Diff File | ||
mod - locale/pl/pl.mo | Diff File | ||
mod - locale/prs/prs.mo | Diff File | ||
mod - locale/pt-BR/pt-BR.mo | Diff File | ||
mod - locale/sv/sv.mo | Diff File | ||
mod - locale/th/th.mo | Diff File | ||
mod - locale/zh-Hans/zh-Hans.mo | Diff File | ||
mod - locale/zh-Hant-HK/zh-Hant-HK.mo | Diff File | ||
twig-layout 83a9545c 2017-01-06 12:14
Details Diff |
Dev: removed TEMPLATEJS keyword | ||
mod - application/helpers/replacements_helper.php | Diff File | ||
mod - templates/default/views/startpage.twig | Diff File | ||
twig-layout 72b85290 2017-01-06 12:10
Details Diff |
Dev: move the asset registration from templateReplace to surveyRuntime. | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
mod - application/helpers/replacements_helper.php | Diff File | ||
mod - application/models/TemplateConfiguration.php | Diff File | ||
mod - templates/default/views/startpage.twig | Diff File | ||
twig-layout fdf3412e 2017-01-06 12:09
Details Diff |
Dev: Filtered instead of Fitered | ||
mod - application/models/Template.php | Diff File | ||
twig-layout 5d6b917f 2017-01-06 12:03
Details Diff |
Dev: twig syntax fixes | ||
mod - templates/default/views/google_analytics.twig | Diff File |