LimeSurvey: develop c8f2b045
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| develop | 2017-04-12 12:42:07 | develop 71685ac1 | ||
| Changeset | Merge branch 'twig-layout' into develop Conflicts: |
|||
| mod - application/config/config-defaults.php | Diff File | |||
| mod - application/config/internal.php | Diff File | |||
| mod - application/config/packages.php | Diff File | |||
| mod - application/controllers/admin/database.php | Diff File | |||
| mod - application/controllers/survey/index.php | Diff File | |||
| mod - application/core/LSETwigViewRenderer.php | Diff File | |||
| add - application/core/LS_Twig_Extension.php | Diff File | |||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | |||
| mod - application/helpers/common_helper.php | Diff File | |||
| mod - application/helpers/frontend_helper.php | Diff File | |||
| mod - application/helpers/replacements_helper.php | Diff File | |||
| mod - application/helpers/viewHelper.php | Diff File | |||
| mod - application/libraries/Save.php | Diff File | |||
| mod - application/models/Template.php | Diff File | |||
| mod - application/models/TemplateConfiguration.php | Diff File | |||
| rm - templates/default/views/assessment.pstpl | Diff File | |||
| add - templates/default/views/group.twig | Diff File | |||
| add - templates/default/views/layout-submit-preview.twig | Diff File | |||
| add - templates/default/views/layout-submit.twig | Diff File | |||
| add - templates/default/views/layout.twig | Diff File | |||
| add - templates/default/views/layout_clearall.twig | Diff File | |||
| add - templates/default/views/layout_errors.twig | Diff File | |||
| add - templates/default/views/layout_first_page.twig | Diff File | |||
| add - templates/default/views/layout_quotas.twig | Diff File | |||
| add - templates/default/views/layout_save.twig | Diff File | |||
| add - templates/default/views/layout_submit.twig | Diff File | |||
| add - templates/default/views/navigator.twig | Diff File | |||
| add - templates/default/views/privacy.twig | Diff File | |||
| add - templates/default/views/question.twig | Diff File | |||
| add - templates/default/views/subviews/LEMDebug.twig | Diff File | |||
| add - templates/default/views/subviews/allinone_mode_welcome_privacy.twig | Diff File | |||
| add - templates/default/views/subviews/assessments.twig | Diff File | |||
| add - templates/default/views/subviews/bootstrap_alert_modal.twig | Diff File | |||
| add - templates/default/views/subviews/flash_message.twig | Diff File | |||
| add - templates/default/views/subviews/google_analytics.twig | Diff File | |||
| add - templates/default/views/subviews/head.twig | Diff File | |||
| add - templates/default/views/subviews/language_changer.twig | Diff File | |||
| add - templates/default/views/subviews/nav_bar.twig | Diff File | |||
| add - templates/default/views/subviews/navigation/clearall_links.twig | Diff File | |||
| add - templates/default/views/subviews/navigation/language_changer_top_menu.twig | Diff File | |||
| add - templates/default/views/subviews/navigation/question_index_menu.twig | Diff File | |||
| add - templates/default/views/subviews/navigation/save_links.twig | Diff File | |||
| add - templates/default/views/subviews/no_js_alert.twig | Diff File | |||
| add - templates/default/views/subviews/start_form.twig | Diff File | |||
| add - templates/default/views/subviews/top_container.twig | Diff File | |||
| add - templates/default/views/subviews/warnings.twig | Diff File | |||
| add - templates/default/views/user_forms_layout.twig | Diff File | |||
| add - templates/default/views/welcome.twig | Diff File | |||
| mod - third_party/Twig/ETwigViewRenderer.php | Diff File | |||
