Commit graph

11 commits

Author SHA1 Message Date
95d3a7f6cb Merge branch 'develop' into feature/wysiwyg-editor
* develop:
  Renamed Stories.render_action() to render_json_action()
  Added account image with link to https://gravatar.com
  Added HTML sanitizer for comments and stories. Fixes issue 64.
  Added button for easily adding a username to the troll filter
  Implemented “gaslighting” of troll comments, i.e. hiding a comment of a known troll for everyone else but themselves
  Removed misleading trailing “(Server)” from console output
  Fixes issue 143
  Separated rendering of core and custom CSS with Less and added more detailed error output
  Improved display of console messages
  Added bottom margin after article meta in case there is no title
  Introduced another value for the color of borders, vertical and horizontal lines

Conflicts:
	code/Global/0.node.js
	code/Global/Global.js
	code/Site/$Site.skin
	code/Story/$Story.skin
	code/Story/Story.js
	code/Story/Story.skin
2015-03-25 10:56:53 +01:00
86edcaac33 Added HTML sanitizer for comments and stories. Fixes issue 64.
I added the sanitize-html NPM module [1] using its default settings.

```json
{
  "allowedTags": [
    "h3",
    "h4",
    "h5",
    "h6",
    "blockquote",
    "p",
    "a",
    "ul",
    "ol",
    "nl",
    "li",
    "b",
    "i",
    "strong",
    "em",
    "strike",
    "code",
    "hr",
    "br",
    "div",
    "table",
    "thead",
    "caption",
    "tbody",
    "tr",
    "th",
    "td",
    "pre"
  ],
  "allowedAttributes": {
    "a": [
      "href",
      "name",
      "target"
    ],
    "img": [
      "src"
    ]
  },
  "selfClosing": [
    "img",
    "br",
    "hr",
    "area",
    "base",
    "basefont",
    "input",
    "link",
    "meta"
  ],
  "allowedSchemes": [
    "http",
    "https",
    "ftp",
    "mailto"
  ]
}
```

[1] https://www.npmjs.com/package/sanitize-html
2015-03-22 16:36:14 +01:00
bb12a80358 Replaced all references to uikit package with uikit-bower, added marked package and subsequently removed uikit. 2015-03-17 15:55:09 +01:00
8ae9afae6f Implemented first version of working WYSIWYG story editor 2015-03-07 12:28:05 +01:00
0733d19622 Added json2 and lessjs via node_modules / npm 2015-02-21 21:55:46 +01:00
8beedd6799 Fixed package name to lower case 2015-01-28 18:00:58 +01:00
a86db532e1 Enabled minifying of JS code including source maps 2015-01-25 19:02:37 +01:00
aa4c527fcd Replaced copy&pasta version of MD5 implementation with js-md5 NPM module 2015-01-11 14:25:00 +01:00
f899a12fb0 Refactored galleries using the jquery-collagePlus plugin 2015-01-06 12:30:47 +01:00
e5f641a050 Fixed license and author 2015-01-03 11:21:14 +01:00
c27d28b692 Implemented build process for client-side (static) code and assets using Browserify 2015-01-01 20:23:21 +01:00