Merged colosa/processmaker into master

2015-06-08 09:51:20 -04:00
parent 1909757900 bf387ea1f9
commit c5c3b404c3
3 changed files with 1 additions and 2 deletions
--- a/workflow/engine/templates/enterprise/addonsStore.js
+++ b/workflow/engine/templates/enterprise/addonsStore.js
@@ -1154,7 +1154,7 @@ Ext.onReady(function() {
        store: addonsStore,
        defaultType: "displayfield",
        padding: 5,
-        autoHeight : true,
+        height: 335,
        disabled: !licensed,
        columns: [
            expander,
@@ -1605,4 +1605,3 @@ Ext.onReady(function() {
    addonsFeaturesStore.load();
  }
 });
-
--- a/workflow/public_html/images/logopm3.png
+++ b/workflow/public_html/images/logopm3.png
--- a/workflow/public_html/images/processmaker.logo.jpg
+++ b/workflow/public_html/images/processmaker.logo.jpg