Commit graph

4433 commits

Author SHA1 Message Date
f9f86ad037 Merge branch 'feature/troll-handling' into develop 2015-03-25 10:47:15 +01:00
453e03f086 Merge branch 'feature/account-image' into develop 2015-03-25 10:46:28 +01:00
4be67618f6 Renamed Stories.render_action() to render_json_action() 2015-03-25 10:43:44 +01:00
f5d11dcff1 Added account image with link to https://gravatar.com 2015-03-22 17:22:56 +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
8e3e98ade1 Added button for easily adding a username to the troll filter 2015-03-22 15:23:13 +01:00
7522418bf0 Implemented “gaslighting” of troll comments, i.e. hiding a comment of a known troll for everyone else but themselves 2015-03-22 15:14:49 +01:00
da15ebd6a3 Removed misleading trailing “(Server)” from console output 2015-03-22 14:15:16 +01:00
316774202a Fixes issue 143 2015-03-22 13:11:19 +01:00
e4ea1ca096 Fixed bug preventing Markdown quotes from being rendered 2015-03-22 12:06:47 +01:00
471f657689 Separated rendering of core and custom CSS with Less and added more detailed error output 2015-03-17 21:34:26 +01:00
0ad005aaeb Improved display of console messages 2015-03-17 21:34:13 +01:00
0ba46e817a Separated rendering of core and custom CSS with Less and added more detailed error output 2015-03-17 21:32:00 +01:00
00ef1aabd2 Improved display of console messages 2015-03-17 21:31:11 +01:00
6f1a650a6f Format text with Markdown in Stories.render_action() 2015-03-17 20:08:11 +01:00
a854c729a3 Removed obsolete code_filter() call – format() already does its job 2015-03-17 19:47:41 +01:00
5a6160e4c4 Separated Markdown formatting from default formatting for maintaining b/w compatibility 2015-03-17 19:44:24 +01:00
7dee983d9b Fixed two issues with new editor:
1. <code> content was not encoded as it used to be
2. Wrong HTML was saved when the form was submitted in preview mode
2015-03-17 18:26:45 +01:00
8b688cade4 Added bottom margin after article meta in case there is no title 2015-03-17 16:07:31 +01:00
17e5013236 Introduced another value for the color of borders, vertical and horizontal lines 2015-03-17 16:07:10 +01:00
ba29af8e5b Added bottom margin after article meta in case there is no title 2015-03-17 16:02:38 +01:00
9788a78f52 Added support for Markdown and implemented preview with rendered macros (via AJAX call) 2015-03-17 16:01:27 +01:00
2ed5138d91 Introduced another value for the color of borders, vertical and horizontal lines 2015-03-17 15:58:57 +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
051dbd1929 Added WYSIWYG editor to comment form 2015-03-15 20:45:59 +01:00
593c0558e0 Refactored simple backup feature when creating a new story and discarding unsaved content (e.g. by accidentally closing the window – which furthermore is alerted now using onbeforeunload handler) 2015-03-15 17:48:38 +01:00
cdc6f5db07 Merge branch 'develop' into feature/wysiwyg-editor
* develop:
  Added comment about why including main CSS file does not work
  Moved renderPage() method down in code
  Fixed bug causing error when trying to delete a comment (see e-mail from kinomu, 22 Feb 2015 19:20:15 – trinity-4365fa39-f3f6-407b-a241-18f3c180b59e-1424629215534@3capp-gmx-bs61)
  Fixed source map URLs

Conflicts:
	build.xml
	code/Site/Site.js
	static/scripts/cm.min.js
	static/scripts/main.min.js
	static/styles/main.min.css
2015-03-14 19:56:46 +01:00
a9ef61898d Added comment about why including main CSS file does not work 2015-03-14 19:33:56 +01:00
5986b59089 Moved renderPage() method down in code 2015-03-14 19:25:48 +01:00
ca5e560ef2 Fixed bug causing error when trying to delete a comment (see e-mail from kinomu, 22 Feb 2015 19:20:15 – trinity-4365fa39-f3f6-407b-a241-18f3c180b59e-1424629215534@3capp-gmx-bs61) 2015-03-14 19:23:32 +01:00
fe97c3cf60 Fixed source map URLs 2015-03-14 19:20:25 +01:00
35bb4734ed Streamlined WYSIWYG story editor integration 2015-03-14 19:16:23 +01:00
1ebcbca48e Merge branch 'develop' into feature/wysiwyg-editor
* develop:
  Fixed color of button for current page in pager navigation
  Fixed color of title and hovered navigation items
  Removed layout values for debugging
  Renamed layout “variables” to “settings”
  Re-added some layout variables and refactored CSS
  Added control for copying the value macro to the clipboard
  Enabled built-in colorpicker for any value which name ends with “color”. (Fixes issue 39.) Added remove link for any value form element. Fixed issue where no value could be added after the last remaining one was removed.
2015-03-14 18:05:27 +01:00
52ffac6295 Fixed color of button for current page in pager navigation 2015-03-14 16:36:47 +01:00
407e46a00b Fixed color of title and hovered navigation items 2015-03-14 16:30:04 +01:00
fa8785050f Removed layout values for debugging 2015-03-14 16:19:47 +01:00
a0b1c5bc86 Merge branch 'feature/layout-rerefactoring' into develop 2015-03-14 16:17:43 +01:00
d856ba24e3 Renamed layout “variables” to “settings” 2015-03-14 16:17:16 +01:00
a93b467e8e Merge branch 'develop' into feature/layout-rerefactoring
* develop:
  Added control for copying the value macro to the clipboard
  Enabled built-in colorpicker for any value which name ends with “color”. (Fixes issue 39.) Added remove link for any value form element. Fixed issue where no value could be added after the last remaining one was removed.
2015-03-14 16:08:32 +01:00
3698c82d99 Re-added some layout variables and refactored CSS 2015-03-14 16:03:26 +01:00
465e6fd55f Merge branch 'feature/values-refactoring' into develop 2015-03-07 18:22:53 +01:00
90a700ab7c Added control for copying the value macro to the clipboard 2015-03-07 18:18:34 +01:00
649cd144eb Enabled built-in colorpicker for any value which name ends with “color”. (Fixes issue 39.) Added remove link for any value form element. Fixed issue where no value could be added after the last remaining one was removed. 2015-03-07 18:02:28 +01:00
8ae9afae6f Implemented first version of working WYSIWYG story editor 2015-03-07 12:28:05 +01:00
5446fc87c2 Fixed nasty bug when resubmitting the story editor via script 2015-03-06 17:25:53 +01:00
cac7eb0ea7 Moved client-side extract script to extra skin which will always be rendered (edit skin is customizable) 2015-02-28 22:55:23 +01:00
1cc9b347de Added missing ID to story editor form 2015-02-28 22:06:00 +01:00
865a418b49 Implemented client-side parsing of story content to extract image and video URLs as metadata. This metadata is then used for rendering Open Graph, Twitter Cards and microdata. 2015-02-28 22:00:54 +01:00
29350df8f0 Commented out og:locale data because Facebook is very picky about locales (see https://www.facebook.com/translations/FacebookLocales.xml) 2015-02-28 17:18:18 +01:00
1ced2595dd Fixed some issues with microdata and Open Graph, removed twitter:site data and added og:locale 2015-02-28 16:43:57 +01:00