From d52d04044694b9f0ab2f340fc79e1467a0d1718a Mon Sep 17 00:00:00 2001
From: Capu <mariokapu@gmail.com>
Date: Fri, 4 Dec 2015 01:15:41 +0100
Subject: [PATCH 1/6] Settings-page: separated theme sections into sections.

---
 src/app/pages/settings/section-theme.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/pages/settings/section-theme.html b/src/app/pages/settings/section-theme.html
index c7215968..149bbdef 100644
--- a/src/app/pages/settings/section-theme.html
+++ b/src/app/pages/settings/section-theme.html
@@ -7,7 +7,8 @@ <h1>Theme</h1>
       {{theme.name}}
     </md-radio-button>
   </md-radio-group>
-
+</div>
+<div class="settings-section">
   <h1>Chat</h1>
   <h2>Timestamps</h2>
   <md-radio-group

From e5bda9afb5f2924737770de41c898f8b1766a818 Mon Sep 17 00:00:00 2001
From: Capu <mcapu@users.noreply.github.com>
Date: Sat, 12 Dec 2015 17:36:58 +0100
Subject: [PATCH 2/6] Updated bower dependencies.

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index 0f2dd8cb..df8c140e 100644
--- a/bower.json
+++ b/bower.json
@@ -13,7 +13,7 @@
     "angular-scroll-glue": "~2.0.6",
     "angular-ui-router": "~0.2.15",
     "clipboard": "~1.5.3",
-    "wsevent.js": "~0.0.4"
+    "wsevent.js": "~1.0.0"
   },
   "devDependencies": {
     "angular-mocks": "~1.4.7"

From 196271161d854e930496054b44f1f68933f7b500 Mon Sep 17 00:00:00 2001
From: Capu <mariokapu@gmail.com>
Date: Sat, 12 Dec 2015 21:50:01 +0100
Subject: [PATCH 3/6] LobbyService: show toast on lobbyStart.

---
 src/app/pages/lobby/lobby.factory.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/pages/lobby/lobby.factory.js b/src/app/pages/lobby/lobby.factory.js
index ba0a7add..27cd4927 100644
--- a/src/app/pages/lobby/lobby.factory.js
+++ b/src/app/pages/lobby/lobby.factory.js
@@ -243,8 +243,14 @@
 
     Websocket.onJSON('lobbyStart', function (data) {
       factory.lobbyJoinInformation = data;
-      $state.go('lobby-page', {lobbyID: factory.lobbySpectatedId});
       $rootScope.$emit('lobby-start');
+      Notifications.toast({
+        message: 'Your lobby has started!',
+        actionMessage: 'Go back',
+        action: function () {
+          factory.goToLobby(factory.lobbyJoinedId);
+        }
+      });
       Settings.getSettings(function (settings) {
         Notifications.notifyBrowser({
           title: 'Lobby is starting!',

From 28449392f8c45fa435cba3df4efe32e5ff734d18 Mon Sep 17 00:00:00 2001
From: Capu <mariokapu@gmail.com>
Date: Sat, 12 Dec 2015 21:51:48 +0100
Subject: [PATCH 4/6] LobbyService: fix ready-up notification not having sound.

---
 src/app/pages/lobby/lobby.factory.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/pages/lobby/lobby.factory.js b/src/app/pages/lobby/lobby.factory.js
index 27cd4927..26f8f638 100644
--- a/src/app/pages/lobby/lobby.factory.js
+++ b/src/app/pages/lobby/lobby.factory.js
@@ -232,6 +232,8 @@
       Notifications.notifyBrowser({
         title: 'Click here to ready up!',
         body: 'All the slots are filled, ready up to start',
+        soundFile: '/assets/sound/lobby-readyup.wav',
+        soundVolume: settings.soundVolume * 0.01,
         timeout: 30,
         callbacks: {
           onclick: function () {

From 0e7ef518eac8911dd14d57154f3f90661156bd8b Mon Sep 17 00:00:00 2001
From: Capu <mariokapu@gmail.com>
Date: Sat, 12 Dec 2015 21:58:17 +0100
Subject: [PATCH 5/6] LobbyService: fix notification error.

---
 src/app/pages/lobby/lobby.factory.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/app/pages/lobby/lobby.factory.js b/src/app/pages/lobby/lobby.factory.js
index 26f8f638..a5155598 100644
--- a/src/app/pages/lobby/lobby.factory.js
+++ b/src/app/pages/lobby/lobby.factory.js
@@ -228,18 +228,19 @@
         localStorage.setItem('tabCommunication', '');
         localStorage.setItem('tabCommunication', 'closeDialog');
       });
-
-      Notifications.notifyBrowser({
-        title: 'Click here to ready up!',
-        body: 'All the slots are filled, ready up to start',
-        soundFile: '/assets/sound/lobby-readyup.wav',
-        soundVolume: settings.soundVolume * 0.01,
-        timeout: 30,
-        callbacks: {
-          onclick: function () {
-            $window.focus();
+      Settings.getSettings(function (settings) {
+        Notifications.notifyBrowser({
+          title: 'Click here to ready up!',
+          body: 'All the slots are filled, ready up to start',
+          soundFile: '/assets/sound/lobby-readyup.wav',
+          soundVolume: settings.soundVolume * 0.01,
+          timeout: 30,
+          callbacks: {
+            onclick: function () {
+              $window.focus();
+            }
           }
-        }
+        });
       });
     });
 

From 1842a2ef494a7fdd0a0d2ec8fe8fb0c50f41f8f9 Mon Sep 17 00:00:00 2001
From: Capu <mariokapu@gmail.com>
Date: Sat, 12 Dec 2015 22:56:56 +0100
Subject: [PATCH 6/6] Bump version.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bb7e10c8..789adefc 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "license": "GPL-3.0",
   "repository": "https://github.com/TF2Stadium/Frontend",
   "readme": "readme.md",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "dependencies": {
     "del": "~1.2.0",
     "uglify-save-license": "~0.4.1",