Commit graph

3842 commits

Author SHA1 Message Date
dc6bd3afc8 Fixed appearance of button for new site creation 2015-03-27 11:50:14 +01:00
af25a813de Added box argument to image macro output 2015-03-27 11:49:41 +01:00
05a76383de Added metadata for Open Graph et al. to Stories.create_action() 2015-03-25 23:41:07 +01:00
14128dd6eb Implemented first version of multiple image upload by drag&drop 2015-03-25 19:27:20 +01:00
525f477ca3 Refactored Comment.update() method
- text is now required, title remains optional
- sanitize text first to catch potential empty string afterwards
2015-03-25 16:45:48 +01:00
20e605aa7b Added accusatives for user-defined objects. Replaced user with account. Balanced out gender in german translation. 2015-03-25 16:04:47 +01:00
3ab34a7ded Merge branch 'develop' into feature/wysiwyg-editor
* develop:
  Re-Granted permissions for privileged users to edit comments
  Increased margin before comment form
  Added badge next to username in a comment
  Fixed patch for MySQL databases

Conflicts:
	code/Comment/Comment.skin
2015-03-25 14:25:51 +01:00
7d79e85a2e Re-Granted permissions for privileged users to edit comments 2015-03-25 14:21:21 +01:00
fadc04649e Increased margin before comment form 2015-03-25 14:20:42 +01:00
f3815a9653 Added badge next to username in a comment 2015-03-25 14:20:03 +01:00
509446d905 Fixed overlooked occurrence of render_action() which was renamed to render_json_action() 2015-03-25 12:23:47 +01:00
ec30345b64 Removed “Macro” suffix from File and Poll buttons 2015-03-25 11:31:35 +01:00
4cc65b574c Removed condition for cursor mode to fix issue where macro buttons would not work anymore 2015-03-25 11:31:00 +01:00
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
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
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
d856ba24e3 Renamed layout “variables” to “settings” 2015-03-14 16:17:16 +01:00