Merge branch 'release/0.11.2'

pagekit · Apr 1, 2016 · d7f1db6 · d7f1db6
2 parents f6aa602 + 2843e6d
commit d7f1db6
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.11.2 (April 1, 2016)
+
+### Fixed
+- Fixed missing extension icons
+
 ## 0.11.1 (April 1, 2016)
 
 ### Changed

diff --git a/app/installer/views/extensions.php b/app/installer/views/extensions.php
@@ -38,7 +38,7 @@
                     <td class="pk-table-width-minimum">
                         <div class="uk-position-relative">
                             <div class="uk-cover-background uk-position-cover" :style="{'background-image': 'url('+icon(pkg)+')'}"></div>
-                            <canvas class="uk-display-block" width="50" height="50"></canvas>
+                            <canvas class="uk-display-block uk-img-preserve" width="50" height="50"></canvas>
                         </div>
                     </td>
                     <td class="uk-text-nowrap">

diff --git a/app/system/app/lib/asset.js b/app/system/app/lib/asset.js
@@ -8,7 +8,7 @@ module.exports = function (Vue) {
      */
     function Asset(assets) {
 
-        var promises = [], $url = (this.$url || Vue.url), _assets = [], promise;
+        var promises = [], $url = (this.$url || Vue.url), _assets = [];
 
         Object.keys(assets).forEach(function (type) {
 

diff --git a/app/system/config.php b/app/system/config.php
@@ -4,7 +4,7 @@
 
     'application' => [
 
-        'version' => '0.11.1'
+        'version' => '0.11.2'
 
     ],
 

diff --git a/app/system/modules/dashboard/app/views/index.js b/app/system/modules/dashboard/app/views/index.js
@@ -35,7 +35,7 @@ window.Dashboard = {
 
     ready: function () {
 
-        var self = this, list, startindex;
+        var self = this;
 
         // widget re-ordering
         var sortables = $(this.$el).find('.uk-sortable[data-column]').each(function () {

diff --git a/app/system/modules/user/app/components/modal-login.vue b/app/system/modules/user/app/components/modal-login.vue
@@ -7,7 +7,7 @@
 
                 <img class="uk-margin" :src="$url('app/system/assets/images/pagekit-logo-text-black.svg')" alt="Pagekit">
 
-                <p class="uk-text-danger">{{ 'Session expired. Please login again.' | trans }}</p>
+                <p class="uk-text-danger">{{ 'Session expired. Please log in again.' | trans }}</p>
 
                 <form class="uk-form tm-form" @submit.prevent="login" v-el:login>
 

diff --git a/app/system/modules/user/views/admin/permission-index.php b/app/system/modules/user/views/admin/permission-index.php
@@ -19,7 +19,7 @@
                         <span :title="permission.description | trans" data-uk-tooltip="{pos:'top-left'}">{{ permission.title | trans }}</span>
                     </td>
                     <td>
-                        <i class="pk-icon-warning uk-invisible" :title="'This permission has security implications. Give it trusted roles only.' | trans" data-uk-tooltip v-if="permission.trusted"></i>
+                        <i class="pk-icon-warning uk-invisible" :title="'Grant this permission to trusted roles only to avoid security implications.' | trans" data-uk-tooltip v-if="permission.trusted"></i>
                     </td>
                     <td class="uk-text-center" v-for="role in roles">
 

diff --git a/app/system/modules/user/views/admin/role-index.php b/app/system/modules/user/views/admin/role-index.php
@@ -43,7 +43,7 @@
                                 <span :title="permission.description | trans" data-uk-tooltip="{pos:'top-left'}">{{ permission.title | trans }}</span>
                             </td>
                             <td>
-                                <i class="pk-icon-warning uk-invisible" :title="'This permission has security implications. Give it trusted roles only.' | trans" data-uk-tooltip v-if="permission.trusted"></i>
+                                <i class="pk-icon-warning uk-invisible" :title="'Grant this permission to trusted roles only to avoid security implications.' | trans" data-uk-tooltip v-if="permission.trusted"></i>
                             </td>
                             <td class="uk-text-center">