update change log

.stylelintrc

@@ -1,12 +1,34 @@
 {
   "extends": "stylelint-config-standard",
   "rules": {
-    "function-url-quotes" : "single",
+    "no-descending-specificity": null,
+    "shorthand-property-no-redundant-values": null,
+    "at-rule-empty-line-before": ["never", {
+      except: [
+        "blockless-after-same-name-blockless",
+        "blockless-after-blockless",
+      ],
+      ignore: [
+        "after-comment",
+        "blockless-after-blockless"
+      ]
+    }],
+    "function-url-quotes": "always",
+    "max-nesting-depth": 10,
     "string-quotes": "single",
-    "indentation": "null",
-    "at-rule-empty-line-before": "never",
-    "rule-nested-empty-line-before": "never-multi-line",
-    "rule-non-nested-empty-line-before": "always-multi-line",
-    "shorthand-property-no-redundant-values": "never"
+    "indentation": null,
+    "block-no-empty": null,
+    "comment-empty-line-before": "never",
+    "rule-empty-line-before": [
+      "always", {
+        except: [
+          "first-nested",
+          "inside-block-and-after-rule"
+        ],
+        ignore: [
+          "inside-block"
+        ]
+      }
+    ]
   }
 }

CHANGELOG.rst

@@ -1,9 +1,15 @@
 Changelog
 =========
 
-0.0.20 (development)
+0.0.21 (development)
 --------------------
 
+0.0.20
+------
+* Update tinymce4 to 4.7.9
+* Update packages
+* Add valid_children and disabled force_root_block settings
+
 0.0.19
 ------
 * Update tinymce4 to 4.7.1

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "django-tinymce-4",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "homepage": "https://github.com/ITCase-django/django-tinymce-4",
   "authors": [
     "ITCase <[email protected]>"
@@ -15,6 +15,6 @@
     "tests"
   ],
   "dependencies": {
-    "tinymce": "~4.7.1"
+    "tinymce": "~4.7.9"
   }
 }

package.json

@@ -2,7 +2,7 @@
   "name": "django-tinymce-4",
   "title": "Integrate TinyMCE4 in Django projects",
   "description": "",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "homepage": "http://www.github.com/ITCase-django/django-tinymce-4/",
   "author": "ITCase <[email protected]> (http://www.itcase.pro/)",
   "repository": {
@@ -14,38 +14,38 @@
     "node": ">= 5.0.0"
   },
   "devDependencies": {
-    "autoprefixer": "^6.5.0",
-    "eslint": "^3.7.1",
-    "eslint-config-standard": "^6.2.0",
-    "eslint-plugin-promise": "^2.0.1",
-    "eslint-plugin-standard": "^2.0.1",
-    "gulp": "github:gulpjs/gulp#4.0",
+    "autoprefixer": "^8.1.0",
+    "eslint": "^4.18.2",
+    "eslint-config-standard": "^11.0.0",
+    "eslint-plugin-promise": "^3.7.0",
+    "eslint-plugin-standard": "^3.0.1",
+    "gulp": "^4.0.0",
     "gulp-batch": "~1.0.5",
-    "gulp-concat": "^2.6.0",
+    "gulp-concat": "^2.6.1",
     "gulp-css-base64": "^1.3.4",
     "gulp-cssnano": "^2.1.2",
-    "gulp-filter": "^4.0.0",
-    "gulp-if": "^2.0.1",
-    "gulp-load-plugins": "^1.3.0",
-    "gulp-newer": "^1.2.0",
-    "gulp-plumber": "^1.1.0",
-    "gulp-postcss": "^6.2.0",
-    "gulp-sourcemaps": "^2.0.0-alpha",
-    "gulp-util": "^3.0.7",
-    "gulp-watch": "^4.3.10",
-    "postcss-calc": "^5.3.1",
-    "postcss-color-function": "^2.0.1",
-    "postcss-css-variables": "^0.6.0",
-    "postcss-custom-properties": "^5.0.1",
-    "postcss-import": "^8.1.2",
-    "postcss-nested": "^1.0.0",
-    "postcss-opacity": "^4.0.0",
-    "postcss-pxtorem": "^3.3.1",
-    "postcss-reporter": "^1.4.1",
-    "stylelint": "^7.3.1",
-    "stylelint-config-standard": "^13.0.2",
-    "vinyl-map": "^1.0.1",
-    "yargs": "^6.0.0"
+    "gulp-filter": "^5.1.0",
+    "gulp-if": "^2.0.2",
+    "gulp-load-plugins": "^1.5.0",
+    "gulp-newer": "^1.4.0",
+    "gulp-plumber": "^1.2.0",
+    "gulp-postcss": "^7.0.1",
+    "gulp-sourcemaps": "^2.6.4",
+    "gulp-util": "^3.0.8",
+    "gulp-watch": "^5.0.0",
+    "postcss-calc": "^6.0.1",
+    "postcss-color-function": "^4.0.1",
+    "postcss-css-variables": "^0.8.0",
+    "postcss-custom-properties": "^7.0.0",
+    "postcss-import": "^11.1.0",
+    "postcss-nested": "^3.0.0",
+    "postcss-opacity": "^5.0.0",
+    "postcss-pxtorem": "^4.0.1",
+    "postcss-reporter": "^5.0.0",
+    "stylelint": "^9.1.3",
+    "stylelint-config-standard": "^18.2.0",
+    "vinyl-map": "^1.0.2",
+    "yargs": "^11.0.0"
   },
   "license": "MIT"
 }

tinymce_4/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.0.19'
+__version__ = '0.0.20'

tinymce_4/static/tinymce_4/settings/full/settings.js

@@ -4,6 +4,8 @@ var tinySettings = {
   relative_urls: false,
   convert_urls: false,
   valid_elements: '*[*]',
+  valid_children: '+a[h1|h2|h3|h4|h5|h6|p|span|div|img]',
+  forced_root_block: false,
   height: '350px',
 
   language_url: '',

tinymce_4/static/tinymce_4/tinymce/.bower.json

@@ -18,14 +18,14 @@
     ".npmignore",
     "changelog.txt"
   ],
-  "version": "4.7.1",
-  "_release": "4.7.1",
+  "version": "4.7.9",
+  "_release": "4.7.9",
   "_resolution": {
     "type": "version",
-    "tag": "4.7.1",
-    "commit": "4fd91026d3765fee9b148b5e684b014a8e18ead1"
+    "tag": "4.7.9",
+    "commit": "3edc2e2b270fb38e85db083b717ab57a092f77ab"
   },
   "_source": "https://github.com/tinymce/tinymce-dist.git",
-  "_target": "~4.7.1",
+  "_target": "~4.7.9",
   "_originalSource": "tinymce"
 }