From 6fe4a14216e40752006faafac80ddd57471b94ea Mon Sep 17 00:00:00 2001
From: Florian Eckerstorfer <florian@eckerstorfer.co>
Date: Fri, 6 Mar 2015 13:04:50 +0100
Subject: [PATCH 1/5] Don't throw exception if no settings to restore

---
 Twig/BootstrapFormExtension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Twig/BootstrapFormExtension.php b/Twig/BootstrapFormExtension.php
index bcc79f7..b4ac1e2 100644
--- a/Twig/BootstrapFormExtension.php
+++ b/Twig/BootstrapFormExtension.php
@@ -212,7 +212,7 @@ public function backupFormSettings()
     public function restoreFormSettings()
     {
         if (count($this->settingsStack) < 1) {
-            throw new \UnderflowException("No settings on the stack to restore");
+            return;
         }
 
         $settings = array_pop($this->settingsStack);

From 7f2ee2d8c0ce4cda207ba140a2f762a4821b818f Mon Sep 17 00:00:00 2001
From: Florian Eckerstorfer <florian@eckerstorfer.co>
Date: Fri, 6 Mar 2015 13:07:05 +0100
Subject: [PATCH 2/5] Revert "Don't throw exception if no settings to restore"

This reverts commit 6fe4a14216e40752006faafac80ddd57471b94ea.
---
 Twig/BootstrapFormExtension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Twig/BootstrapFormExtension.php b/Twig/BootstrapFormExtension.php
index b4ac1e2..bcc79f7 100644
--- a/Twig/BootstrapFormExtension.php
+++ b/Twig/BootstrapFormExtension.php
@@ -212,7 +212,7 @@ public function backupFormSettings()
     public function restoreFormSettings()
     {
         if (count($this->settingsStack) < 1) {
-            return;
+            throw new \UnderflowException("No settings on the stack to restore");
         }
 
         $settings = array_pop($this->settingsStack);

From fcfa47346686a87e283b09e89e296f21d5b694a5 Mon Sep 17 00:00:00 2001
From: Luis Cordova <cordoval@gmail.com>
Date: Sat, 11 Apr 2015 16:41:51 -0500
Subject: [PATCH 3/5] this updates the form_themes supported keyword to replace
 the form.resources keyword

---
 DependencyInjection/BraincraftedBootstrapExtension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DependencyInjection/BraincraftedBootstrapExtension.php b/DependencyInjection/BraincraftedBootstrapExtension.php
index 2fc6f62..479e6f4 100644
--- a/DependencyInjection/BraincraftedBootstrapExtension.php
+++ b/DependencyInjection/BraincraftedBootstrapExtension.php
@@ -162,7 +162,7 @@ protected function configureTwigBundle(ContainerBuilder $container)
                 case 'twig':
                     $container->prependExtensionConfig(
                         $name,
-                        array('form'  => array('resources' => array($this->formTemplate)))
+                        array('form_themes'  => array($this->formTemplate))
                     );
                     break;
             }

From 343dad61b7a4f8f1159436f2203e48fd7a19d555 Mon Sep 17 00:00:00 2001
From: Florian Eckerstorfer <florian@eckerstorfer.co>
Date: Wed, 15 Apr 2015 13:59:19 +0200
Subject: [PATCH 4/5] Revert "this updates the form_themes supported keyword to
 replace the form.resources keyword"

---
 DependencyInjection/BraincraftedBootstrapExtension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DependencyInjection/BraincraftedBootstrapExtension.php b/DependencyInjection/BraincraftedBootstrapExtension.php
index 479e6f4..2fc6f62 100644
--- a/DependencyInjection/BraincraftedBootstrapExtension.php
+++ b/DependencyInjection/BraincraftedBootstrapExtension.php
@@ -162,7 +162,7 @@ protected function configureTwigBundle(ContainerBuilder $container)
                 case 'twig':
                     $container->prependExtensionConfig(
                         $name,
-                        array('form_themes'  => array($this->formTemplate))
+                        array('form'  => array('resources' => array($this->formTemplate)))
                     );
                     break;
             }

From f405c17c6b53eeae226227af3ee70e67e0cb4207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20Ocetn=C3=ADk?= <ocetnik.david@gmail.com>
Date: Sun, 26 Apr 2015 04:41:47 +0200
Subject: [PATCH 5/5] Add a missing ul tag for multilevel menu

Fixes #366
---
 Resources/views/Menu/bootstrap.html.twig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Resources/views/Menu/bootstrap.html.twig b/Resources/views/Menu/bootstrap.html.twig
index 9540def..4bbd35d 100644
--- a/Resources/views/Menu/bootstrap.html.twig
+++ b/Resources/views/Menu/bootstrap.html.twig
@@ -83,7 +83,9 @@
 {% block listList %}
 {% spaceless %}
     {% if item.hasChildren and options.depth is not sameas(0) and item.displayChildren %}
-        {{ block('children') }}
+        <ul{{ _self.attributes(listAttributes) }}>
+            {{ block('children') }}
+        </ul>
     {% endif %}
 {% endspaceless %}
 {% endblock listList %}