12 files changed, 31 insertions, 25 deletions
diff --git a/plugins/CoreAdminHome/stylesheets/generalSettings.less b/plugins/CoreAdminHome/stylesheets/generalSettings.less
index 7166370255..5241f06e26 100644
--- a/plugins/CoreAdminHome/stylesheets/generalSettings.less
+++ b/plugins/CoreAdminHome/stylesheets/generalSettings.less
@@ -83,6 +83,7 @@ table.admin  tbody td:hover, table.admin  tbody th:hover {
     margin: 15px -15px 20px 0;
     padding: 0 0 5px 0;
     font-size: 24px;
+    width:95%;
 }
 
 .admin p, .admin section {
diff --git a/plugins/Dashboard/templates/_header.twig b/plugins/Dashboard/templates/_header.twig
index c17f947ef0..055129f4cb 100644
--- a/plugins/Dashboard/templates/_header.twig
+++ b/plugins/Dashboard/templates/_header.twig
@@ -10,7 +10,7 @@
     <![endif]-->
 
     <link rel="stylesheet" type="text/css" href="plugins/Dashboard/stylesheets/standalone.css" />
-    {% include "_jsGlobalVariables.twig" %}
-    {% include "_jsCssIncludes.twig" %}
+{% include "_jsGlobalVariables.twig" %}
+{% include "_jsCssIncludes.twig" %}
 </head>
 <body id="standalone">
diff --git a/plugins/PleineLune b/plugins/PleineLune
-Subproject 68987f2d86307d5f3524fcf0373fa1ab0f6af87
+Subproject 51ed2c8b396ac912e9039594c085348467d39b8
diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo
-Subproject cd98a60c785ce56b45e4d142e9af3a470619a60
+Subproject 2d1f5e5a70ddcf5e7a88514c07b9e0ef501051e
diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable
-Subproject f6e252d5dc5e3cf004263f7450c2ca55bd2c5a7
+Subproject 2646ac6b7856fc46e20a0213a5467cd6cd7c731
diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization
-Subproject 2cb15300a88f7ff2a1fc27ef633a1a1f4d5fef0
+Subproject 19978cb7cd926ec0fba111ce257b8f0450f34ce
diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php
index b1db4daaf7..70eb348de9 100644
--- a/plugins/UsersManager/API.php
+++ b/plugins/UsersManager/API.php
@@ -479,6 +479,10 @@ class API extends \Piwik\Plugin\API
             return true;
         }
 
+        if ($userLogin == Piwik::getCurrentUserLogin()) {
+            return true;
+        }
+
         Piwik::checkUserIsNotAnonymous();
         Piwik::checkUserHasSomeViewAccess();
 
diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator
-Subproject 0e0066e5358aea60026b8f53bd7a33e854dbb67
+Subproject 6cd5e94ca5cca57ed5132b9f929d7a952e41041
diff --git a/plugins/Zeitgeist/templates/_jsGlobalVariables.twig b/plugins/Zeitgeist/templates/_jsGlobalVariables.twig
index fc60d946f2..b89178a4e0 100644
--- a/plugins/Zeitgeist/templates/_jsGlobalVariables.twig
+++ b/plugins/Zeitgeist/templates/_jsGlobalVariables.twig
@@ -2,22 +2,22 @@
     var piwik = {};
     piwik.token_auth = "{{ token_auth }}";
     piwik.piwik_url = "{{ piwikUrl }}";
-    {% if userLogin %}piwik.userLogin = "{{ userLogin|e('js')}}";
-    {% endif %}
-    {% if idSite is defined %}piwik.idSite = "{{ idSite }}";
-    {% endif %}
-    {% if siteName is defined %}piwik.siteName = "{{ siteName|e('js') }}";
-    {% endif %}
-    {% if siteMainUrl is defined %}piwik.siteMainUrl = "{{ siteMainUrl|e('js') }}";
-    {% endif %}
-    {% if period is defined %}piwik.period = "{{ period }}";
-    {% endif %}
-    {# piwik.currentDateString should not be used other than by the calendar Javascript
+    {% if userLogin %}piwik.userLogin = "{{ userLogin|e('js')}}";{% endif %}
+
+    {% if idSite is defined %}piwik.idSite = "{{ idSite }}";{% endif %}
+
+    {% if siteName is defined %}piwik.siteName = "{{ siteName|e('js') }}";{% endif %}
+
+    {% if siteMainUrl is defined %}piwik.siteMainUrl = "{{ siteMainUrl|e('js') }}";{% endif %}
+
+    {% if period is defined %}piwik.period = "{{ period }}";{% endif %}
+
+{# piwik.currentDateString should not be used other than by the calendar Javascript
             (it is not set to the expected value when period=range)
         Use broadcast.getValueFromUrl('date') instead
-    #}
+#}
     piwik.currentDateString = "{{ date|default(endDate|default('')) }}";
-    {% if startDate is defined %}
+{% if startDate is defined %}
     piwik.startDateString = "{{ startDate }}";
     piwik.endDateString = "{{ endDate }}";
     piwik.minDateYear = {{ minDateYear }};
@@ -26,11 +26,11 @@
     piwik.maxDateYear = {{ maxDateYear }};
     piwik.maxDateMonth = parseInt("{{ maxDateMonth }}", 10);
     piwik.maxDateDay = parseInt("{{ maxDateDay }}", 10);
-    {% endif %}
-    {% if language is defined %}piwik.language = "{{ language }}";
-    {% endif %}
-    {% if config_action_url_category_delimiter is defined %}
+{% endif %}
+    {% if language is defined %}piwik.language = "{{ language }}";{% endif %}
+
+{% if config_action_url_category_delimiter is defined %}
     piwik.config = {};
     piwik.config.action_url_category_delimiter = "{{ config_action_url_category_delimiter }}";
-    {% endif %}
+{% endif %}
 </script>
diff --git a/plugins/Zeitgeist/templates/admin.twig b/plugins/Zeitgeist/templates/admin.twig
index 808d4ddc2d..8fa0fedeff 100644
--- a/plugins/Zeitgeist/templates/admin.twig
+++ b/plugins/Zeitgeist/templates/admin.twig
@@ -4,14 +4,15 @@
 <!--[if (gte IE 9)|!(IE)]><!-->
 <html><!--<![endif]-->
     <head>
-        {% block head %}
+{% block head %}
             <meta charset="utf-8">
             <title>{% if not isCustomLogo %}Piwik &rsaquo; {% endif %}{{ 'CoreAdminHome_Administration'|translate }}</title>
             <meta name="generator" content="Piwik - Open Source Web Analytics"/>
             <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
 
-            {% include "_jsGlobalVariables.twig" %}
-            {% include "_jsCssIncludes.twig" %}
+{% include "_jsGlobalVariables.twig" %}
+{% include "_jsCssIncludes.twig" %}
+
             <!--[if IE]>
             <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/ieonly.css"/>
             <![endif]-->
diff --git a/plugins/Zeitgeist/templates/dashboard.twig b/plugins/Zeitgeist/templates/dashboard.twig
index d627808ca3..282f51f6c8 100644
--- a/plugins/Zeitgeist/templates/dashboard.twig
+++ b/plugins/Zeitgeist/templates/dashboard.twig
@@ -13,11 +13,11 @@
             <meta name="description" content="Web Analytics report for '{{ siteName|escape("html_attr") }}' - Piwik"/>
             <meta name="apple-itunes-app" content="app-id=737216887" />
             <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
-            {% include "_jsGlobalVariables.twig" %}
+{% include "_jsGlobalVariables.twig" %}
             <!--[if lt IE 9]>
             <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script>
             <![endif]-->
-            {% include "_jsCssIncludes.twig" %}
+{% include "_jsCssIncludes.twig" %}
             <!--[if IE]>
             <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/ieonly.css"/>
             <![endif]-->
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
-Subproject ba9eecdcc8be1a0a3114c99e9810b9b98ff15af
+Subproject 31b989f00418209cb8f398d55788ba5eead2893