Merge pull request #207 from evolution-cms/develop

1.3.5
evolution-cms · Sep 1, 2017 · 81763f3 · 81763f3
2 parents e323f74 + 7a382fc
commit 81763f3
Show file tree

Hide file tree

Showing 39 changed files with 2,017 additions and 2,024 deletions.
diff --git a/assets/docs/changelog.txt b/assets/docs/changelog.txt
@@ -1,6 +1,37 @@
 This file shows the changes in recent releases of Evolution CMS. The most current release is usually the
 development release, and is only shown to give an idea of what's currently in the pipeline.
 
+Evolution CMS 1.3.5 (Sep 01, 2017)
+* [GitHub:#be94d6de] - fix php notice in Ditto (dmi3yy)
+* [GitHub:#16fe3481] - ElementsInTree clean up (Piotr Matysiak)
+* [GitHub:#f171c523] - ElementsInTree restyled for new theme (Piotr Matysiak)
+* [GitHub:#6726580c] - ElementsInTree 1.5.8 (Piotr Matysiak)
+* [GitHub:#4b6c3946] - Fix - <@IF><@ELSEIF><@ELSE><@ENDIF> (yamamoto)
+* [GitHub:#43fc85b3] - Code cleanup (yamamoto)
+* [GitHub:#3a941181] - #188 Ditto in dashboard widget permission issue (yamamoto)
+* [GitHub:#a7c1eb8e] - Fix - $ditto_base directory separator char (yamamoto)
+* [GitHub:#bd785cf9] - Fix - $modx->parseDocumentSource() (yamamoto)
+* [GitHub:#623be60e] - Code cleanup (yamamoto)
+* [GitHub:#2c0ad143] - fix Ditto TV output (dmi3yy)
+* [GitHub:#003c0be9] - Update document.parser.class.inc.php (Dreamer0x01)
+* [GitHub:#6cc75b5e] - Fix Ditto when dateSource emply use createdon  #190 (dmi3yy)
+* [GitHub:#cd35be24] - fix tinymce params underfined bug on frontend (dmi3yy)
+* [GitHub:#c0702676] - fix 65 Plugin parameters are lost after update to the new version (dmi3yy)
+* [GitHub:#12c5c36f] - delete deprecated code (dmi3yy)
+* [GitHub:#ac4c1d37] - Refactor (yamamoto)
+* [GitHub:#82c8a6d8] - Remove - $ditto->renderQELinks() (yamamoto)
+* [GitHub:#19cfd326] - #188 Ditto in dashboard widget permission issue (yamamoto)
+* [GitHub:#1bac7219] - #190 Ditto does not recognize &dateSource parameter any more (yamamoto)
+* [GitHub:#d3760b2f] - no need update.php in extras module (dmi3yy)
+* [GitHub:#b8b75b24] - fix #192 (64j)
+* [GitHub:#83535377] - fix variable documentDirty (64j)
+* [GitHub:#3b70064c] - Update to Make sortable list more condensed (Piotr Matysiak)
+* [GitHub:#ffe64306] - Make sortable list more condensed (Piotr Matysiak)
+* [GitHub:#2c2fe39b] - #187 Ditto is missing placeholders when built-in filters are enabled (yamamoto)
+* [GitHub:#7374ccf6] - fix eng translate (dmi3yy)
+* [GitHub:#4903a8bd] - fix saved roles users #130 (Serg)
+
+
 Evolution CMS 1.3.4 (Aug 24, 2017)
 * [GitHub:#30e0efc9] - fix version (dmi3yy)
 * [GitHub:#d03412a7] - Updater one more check for use from manager only (dmi3yy)

diff --git a/assets/lib/MODxAPI/modResource.php b/assets/lib/MODxAPI/modResource.php
@@ -44,8 +44,6 @@ class modResource extends MODxAPI
         'publishedby'     => 0,
         'menutitle'       => '',
         'donthit'         => 0,
-        'haskeywords'     => 0,
-        'hasmetatags'     => 0,
         'privateweb'      => 0,
         'privatemgr'      => 0,
         'content_dispo'   => 0,

diff --git a/assets/modules/store/update.php b/assets/modules/store/update.php
diff --git a/assets/plugins/elementsintree/assets/css_treeButtonsInTab.tpl b/assets/plugins/elementsintree/assets/css_treeButtonsInTab.tpl
@@ -1,33 +1,34 @@
-  /* Tree Buttons in Tab */
-  #treeHolder {
-    padding-top: 10px;
-    padding-left: 10px;
-  }
-
-  #treeMenu {
-    display: none;
-    margin-left: 0;
-    margin-bottom: 6px;
-    background-color: transparent !important;
-    border-bottom-width: 0;
-  }
+/* Tree Buttons in Tab */
 
-  #treeMenu.is-intab {
-    display: table;
-  }
+#treeHolder {
+  padding-top: 10px;
+  padding-left: 10px;
+}
 
-  .treeButton,
-  .treeButtonDisabled {
-    padding: 2px 3px;
-  }
+#treeMenu {
+  display: none;
+  margin-left: 0;
+  margin-bottom: 6px;
+  background-color: transparent !important;
+  border-bottom-width: 0;
+}
 
-  #tabDoc {
-    padding-top: 11px !important;
-    padding-left: 13px !important;
-    padding-right: 13px !important;
-  }
-
-  #floater {
-    width: 99%;
-    top: 94px;
-  }
+#treeMenu.is-intab {
+  display: table;
+}
+
+.treeButton,
+.treeButtonDisabled {
+  padding: 2px 3px;
+}
+
+#tabDoc {
+  padding-top: 11px !important;
+  padding-left: 13px !important;
+  padding-right: 13px !important;
+}
+
+#floater {
+  width: 99%;
+  top: 94px;
+}
diff --git a/assets/plugins/elementsintree/assets/css_unifyFrames.tpl b/assets/plugins/elementsintree/assets/css_unifyFrames.tpl
@@ -1,16 +1,17 @@
-        /* Unify Frames */
-        body,
-        div.treeframebody {
-            background-color: #f2f2f2 !important;
-        }
+/* Unify frames */
 
-        div.treeframebody {
-            background-color: transparent !important;
-            -webkit-box-shadow: none !important;
-            box-shadow: none !important;
-        }
+body,
+div.treeframebody {
+  background-color: #f2f2f2 !important;
+}
 
-        #treeMenu {
-            background-color: transparent !important;
-            border-bottom-color: transparent !important;
-        }
+div.treeframebody {
+  background-color: transparent !important;
+  -webkit-box-shadow: none !important;
+  box-shadow: none !important;
+}
+
+#treeMenu {
+  background-color: transparent !important;
+  border-bottom-color: transparent !important;
+}