From ca09087b1c39e279ba3449550e06eb44cf9f2786 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Wed, 12 Feb 2014 21:35:13 +0400
Subject: [PATCH] merged with master

---
 index.html                                    |  21 +++++++++---------
 manifest.json                                 |   4 ++--
 manifest.webapp                               |   4 ++--
 partials/head.html                            |   2 +-
 partials/settings_modal.html                  |   4 ++--
 vendor/bootstrap/css/bootstrap.css            |   0
 .../fonts/glyphicons-halflings-regular.eot    | Bin
 .../fonts/glyphicons-halflings-regular.svg    |   0
 .../fonts/glyphicons-halflings-regular.ttf    | Bin
 .../fonts/glyphicons-halflings-regular.woff   | Bin
 vendor/bootstrap/js/bootstrap.js              |   0
 11 files changed, 18 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 vendor/bootstrap/css/bootstrap.css
 mode change 100644 => 100755 vendor/bootstrap/fonts/glyphicons-halflings-regular.eot
 mode change 100644 => 100755 vendor/bootstrap/fonts/glyphicons-halflings-regular.svg
 mode change 100644 => 100755 vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf
 mode change 100644 => 100755 vendor/bootstrap/fonts/glyphicons-halflings-regular.woff
 mode change 100644 => 100755 vendor/bootstrap/js/bootstrap.js

diff --git a/index.html b/index.html
index ce66eb06..21007072 100644
--- a/index.html
+++ b/index.html
@@ -21,16 +21,6 @@
 
   <div ng-view></div>
 
-   <script>
-     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-     ga('create', 'UA-45099287-2');
-     ga('send', 'pageview');
-  </script>
-
   <script type="text/javascript" src="vendor/console-polyfill/console-polyfill.js?1"></script>
   <script type="text/javascript" src="vendor/jquery/jquery.min.js"></script>
   <script type="text/javascript" src="vendor/jquery.nanoscroller/nanoscroller.js"></script>
@@ -57,5 +47,16 @@
   <script type="text/javascript" src="js/filters.js?4"></script>
   <script type="text/javascript" src="js/directives.js?20"></script>
 
+
+   <script>
+     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+     ga('create', 'UA-45099287-2');
+     ga('send', 'pageview');
+  </script>
+
 </body>
 </html>
diff --git a/manifest.json b/manifest.json
index 5073ad82..1c1d153f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Telegram UNOFFICIAL",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "short_name": "Webogram",
   "manifest_version": 2,
   "app": {
@@ -22,4 +22,4 @@
     "90": "img/icons/icon90.png",
     "128": "img/icons/icon128.png"
   }
-}
\ No newline at end of file
+}
diff --git a/manifest.webapp b/manifest.webapp
index 371f3a17..d0dc124d 100644
--- a/manifest.webapp
+++ b/manifest.webapp
@@ -1,7 +1,7 @@
 {
   "name": "Webogram",
   "description": "Webogram – UNOFFICIAL Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "launch_path": "/index.html",
   "developer": {
     "name": "Igor Zhukov",
@@ -24,4 +24,4 @@
     "120": "/img/icons/icon120.png",
     "128": "/img/icons/icon128.png"
   }
-}
\ No newline at end of file
+}
diff --git a/partials/head.html b/partials/head.html
index 12d8bcf4..2861880f 100644
--- a/partials/head.html
+++ b/partials/head.html
@@ -8,7 +8,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="http://zhukov.github.io/webogram"><img src="img/Logo_2x.png" class="tg_head_logo" alt="Telegram logo" width="110" height="31" /></a>
+        <a class="navbar-brand" href="#/im"><img src="img/Logo_2x.png" class="tg_head_logo" alt="Telegram logo" width="110" height="31" /></a>
         <ul class="nav navbar-nav navbar-quick-nav" ng-show="curDialog.peer">
           <li>
             <a href="#/im">
diff --git a/partials/settings_modal.html b/partials/settings_modal.html
index 474dd44e..6a3c074b 100644
--- a/partials/settings_modal.html
+++ b/partials/settings_modal.html
@@ -61,7 +61,7 @@
 
     <p>
       <strong>Version: </strong>
-      <span class="settings_version">alpha 0.0.15</span>
+      <span class="settings_version">alpha 0.0.16</span>
     </p>
 
     <hr/>
@@ -70,4 +70,4 @@
       <a href="" ng-click="logOut()">Log out</a>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/vendor/bootstrap/css/bootstrap.css b/vendor/bootstrap/css/bootstrap.css
old mode 100644
new mode 100755
diff --git a/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot b/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot
old mode 100644
new mode 100755
diff --git a/vendor/bootstrap/fonts/glyphicons-halflings-regular.svg b/vendor/bootstrap/fonts/glyphicons-halflings-regular.svg
old mode 100644
new mode 100755
diff --git a/vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf b/vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf
old mode 100644
new mode 100755
diff --git a/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff b/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff
old mode 100644
new mode 100755
diff --git a/vendor/bootstrap/js/bootstrap.js b/vendor/bootstrap/js/bootstrap.js
old mode 100644
new mode 100755