matomo-org · mattab · Mar 1, 2017 · Feb 28, 2017 · Feb 28, 2017 · Mar 1, 2017
diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ See http://piwik.org/docs/requirements/
 
 See http://piwik.org/docs/installation/
 
-If you do not have a server, consider our Piwik Hosting partner: http://piwik.org/hosting/
+If you do not have a server, consider our Piwik Hosting partner: https://www.innocraft.cloud/
 
 ## Changelog
 

diff --git a/composer.lock b/composer.lock
diff --git a/core/Version.php b/core/Version.php
@@ -20,7 +20,7 @@ final class Version
      * The current Piwik version.
      * @var string
      */
-    const VERSION = '3.0.2-rc1';
+    const VERSION = '3.0.2';
 
     public function isStableVersion($version)
     {

diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
@@ -132,6 +132,12 @@ public function setMailSettings()
             $mail['type'] = Common::getRequestVar('mailType', '');
             $mail['username'] = Common::unsanitizeInputValue(Common::getRequestVar('mailUsername', ''));
             $mail['password'] = Common::unsanitizeInputValue(Common::getRequestVar('mailPassword', ''));
+
+            if (!array_key_exists('mailPassword', $_POST)) {
+                // use old password if it wasn't set in request
+                $mail['password'] = Config::getInstance()->mail['password'];
+            }
+
             $mail['encryption'] = Common::getRequestVar('mailEncryption', '');
 
             Config::getInstance()->mail = $mail;

diff --git a/plugins/CoreAdminHome/angularjs/smtp/mail-smtp.controller.js b/plugins/CoreAdminHome/angularjs/smtp/mail-smtp.controller.js
@@ -17,21 +17,28 @@
 
         var self = this;
         this.isLoading = false;
+        this.passwordChanged = false;
 
         this.save = function () {
 
             this.isLoading = true;
 
-            piwikApi.withTokenInUrl();
-            piwikApi.post({module: 'CoreAdminHome', action: 'setMailSettings'}, {
+            var mailSettings = {
                 mailUseSmtp: this.enabled ? '1' : '0',
                 mailPort: this.mailPort,
                 mailHost: this.mailHost,
                 mailType: this.mailType,
                 mailUsername: this.mailUsername,
-                mailPassword: this.mailPassword,
-                mailEncryption: this.mailEncryption,
-            }).then(function (success) {
+                mailEncryption: this.mailEncryption
+            };
+
+            if (this.passwordChanged) {
+                mailSettings.mailPassword = this.mailPassword;
+            }
+
+            piwikApi.withTokenInUrl();
+            piwikApi.post({module: 'CoreAdminHome', action: 'setMailSettings'}, mailSettings)
+                .then(function (success) {
 
                 self.isLoading = false;
 

diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig
@@ -130,8 +130,9 @@
 
                 <div piwik-field uicontrol="password" name="mailPassword"
                      ng-model="mailSettings.mailPassword"
+                     ng-change="mailSettings.passwordChanged = true"
                      title="{{ 'General_SmtpPassword'|translate|e('html_attr') }}"
-                     value="{{ mail.password }}" inline-help="{{ help|e('html_attr') }}">
+                     value="{{ mail.password ? '******' }}" inline-help="{{ help|e('html_attr') }}">
                 </div>
 
                 <div piwik-field uicontrol="select" name="mailEncryption"

diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig
@@ -46,10 +46,10 @@
                 {% else %}
                     {% set rowMetadata=null %}
                 {% endif %}
-                <tr style="{{ cycle(cycleValues, cycleIndex) }};{{styleTableCell}}">
+                <tr style="{{ cycle(cycleValues, cycleIndex) }};">
                     {% set cycleIndex=cycleIndex+1 %}
                     {% for columnId, columnName in reportColumns %}
-                        <td style="padding:17px 15px;{% if columnId == 'label' %}{%  else %} text-align:right;{% endif %}">
+                        <td style="padding:17px 15px;{% if columnId == 'label' %}{%  else %} text-align:right;{% endif %};{{styleTableCell}}">
                             {% if columnId == 'label' %}
                                 {% if rowMetrics[columnId] is defined %}
                                     {% if rowMetadata.logo is defined %}

diff --git a/plugins/CoreHome/templates/_menu.twig b/plugins/CoreHome/templates/_menu.twig
@@ -25,7 +25,7 @@
                                     <li {% if urlParameters._url.module is defined and urlParameters._url.module == currentModule and urlParameters._url.action is defined and urlParameters._url.action == currentAction %}class="active"{% endif %}
                                         role="menuitem"
                                     >
-                                        <a class="item" tabindex="5"
+                                        <a class="item" tabindex="5" target="_self"
                                            title="{{ urlParameters._tooltip|default('')|translate|e('html_attr') }}"
                                            href="index.php?{{ urlParameters._url|urlRewriteWithParameters|slice(1) }}">
                                             {{ name|translate }}
@@ -58,7 +58,7 @@
                                 {% for name,urlParameters in level2 %}
                                     {% if name|slice(0,1) != '_' %}
                                         <li>
-                                            <a title="{{ urlParameters._tooltip|default('')|translate|e('html_attr') }}"
+                                            <a title="{{ urlParameters._tooltip|default('')|translate|e('html_attr') }}" target="_self"
                                                href="index.php?{{ urlParameters._url|urlRewriteWithParameters|slice(1) }}">{{ name|translate }}</a>
                                         </li>
                                     {% endif %}

diff --git a/plugins/CoreHome/templates/_topBar.twig b/plugins/CoreHome/templates/_topBar.twig
@@ -13,7 +13,7 @@
             {{ menu._html|raw }}
         {% else %}
             <a {% if menu._tooltip is defined %}title="{{ menu._tooltip }}"{% endif %}
-               id="topmenu-{{ menu._url.module|lower }}"
+               id="topmenu-{{ menu._url.module|lower }}" target="_self"
                href="index.php{{ menu._url|urlRewriteWithParameters }}" tabindex="3">{{ _self.menuItemLabel(label, icon) }}</a>
         {% endif %}
     {% endmacro %}

diff --git a/plugins/CoreUpdater/templates/updateSuccess.twig b/plugins/CoreUpdater/templates/updateSuccess.twig
@@ -27,7 +27,7 @@
                 <a href="https://piwik.org/support/?pk_medium=Update_Success_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-block">{{ 'CoreUpdater_ServicesSupport'|translate }}</a>
             </div>
             <div class="col s5">
-                <a href="https://piwik.org/hosting/?pk_medium=App_Cloud_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-block">{{ 'CoreUpdater_CloudHosting'|translate }}</a>
+                <a href="https://www.innocraft.cloud/?pk_medium=App_Cloud_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-block">{{ 'CoreUpdater_CloudHosting'|translate }}</a>
             </div>
         </div>
 

diff --git a/plugins/Referrers/images/searchEngines/laban.vn.png b/plugins/Referrers/images/searchEngines/laban.vn.png
diff --git a/plugins/Referrers/images/searchEngines/search.lilo.org.png b/plugins/Referrers/images/searchEngines/search.lilo.org.png