* develop:
Fixed compatibility issues with missing core stylesheet / JavaScript
Moved client-side upload code to Images#upload skin
Re-added click handler for cancel links (compatibility)
Fixed display of Gravatar for accounts
Added code for embedded audio and video player (HTML5)
(Whitespace)
Updated proxy URL
Updated translation files
Slightly rearranged code
Moved image dimension limits from image creation to site settings
Fixed batch upload for layout images
Refactored Story.getAbstract() method. Commented out abstract for custom content.
Refactored Story.getDelta() method. Commented out calculation for custom content.
Moved calculation of delta behind sanitizing comment title and completely removed HTML sanitization
Moved calculation of delta behind sanitizing comment title and replaced call for setMetadata() with setCustomContent()
Fixed appearance of button for new site creation
Added box argument to image macro output
Added metadata for Open Graph et al. to Stories.create_action()
Implemented first version of multiple image upload by drag&drop
Refactored Comment.update() method - text is now required, title remains optional - sanitize text first to catch potential empty string afterwards
Conflicts:
i18n/antville.pot
i18n/de.po
i18n/en.po
i18n/messages.de.js
i18n/messages.en.js
* develop:
Re-added click handler for cancel links (compatibility)
Fixed display of Gravatar for accounts
Added code for embedded audio and video player (HTML5)
(Whitespace)
Updated proxy URL
* 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
* 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