antville/code
Tobi Schäfer 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
..
Admin Fixed HTML for validation with validator.w3.org 2015-02-22 14:36:00 +01:00
Api Fixed HTML for validation with validator.w3.org 2015-02-22 14:36:00 +01:00
Archive Implemented UIKit support for archive pagination 2015-01-01 20:24:05 +01:00
Choice Refactored code with required client-side functionality to basically work with disabled JS, too. Fixes #36 2015-02-21 19:21:35 +01:00
Claustra Refactored trails to claustra 2015-01-23 18:19:24 +01:00
Comment Merge branch 'develop' into feature/wysiwyg-editor 2015-03-25 10:56:53 +01:00
Comments Replaced <td> elements with <th> in table headers 2015-01-11 13:13:28 +01:00
File Added support for Markdown and implemented preview with rendered macros (via AJAX call) 2015-03-17 16:01:27 +01:00
Files Replaced <td> elements with <th> in table headers 2015-01-11 13:13:28 +01:00
Global Merge branch 'develop' into feature/wysiwyg-editor 2015-03-25 10:56:53 +01:00
HopObject 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
Image Fixed HTML for validation with validator.w3.org 2015-02-22 14:36:00 +01:00
Images Added new ant image as favicon 2015-02-15 20:25:24 +01:00
Layout Renamed layout “variables” to “settings” 2015-03-14 16:17:16 +01:00
LogEntry Removed obsolete code 2015-01-11 13:21:35 +01:00
Members Fixed HTML for validation with validator.w3.org 2015-02-22 14:36:00 +01:00
Membership Fixed wrapping in subscription list 2015-02-07 11:58:46 +01:00
Metadata Updated license header and unified comments 2014-07-04 17:16:51 +02:00
Poll Removed code removing one choice field too many 2015-02-22 14:39:15 +01:00
Polls Refactored code with required client-side functionality to basically work with disabled JS, too. Fixes #36 2015-02-21 19:21:35 +01:00
Root Added dummy action for favicon.ico to Root 2015-02-21 19:26:32 +01:00
Site 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
Skin Refactored code with required client-side functionality to basically work with disabled JS, too. Fixes #36 2015-02-21 19:21:35 +01:00
Skins Implemented first version of working WYSIWYG story editor 2015-03-07 12:28:05 +01:00
Stories Merge branch 'develop' into feature/wysiwyg-editor 2015-03-25 10:56:53 +01:00
Story Merge branch 'develop' into feature/wysiwyg-editor 2015-03-25 10:56:53 +01:00
Tag Refactored code with required client-side functionality to basically work with disabled JS, too. Fixes #36 2015-02-21 19:21:35 +01:00
TagHub Refactored galleries using the jquery-collagePlus plugin 2015-01-06 12:30:47 +01:00
Tags Refactored code with required client-side functionality to basically work with disabled JS, too. Fixes #36 2015-02-21 19:21:35 +01:00
User Added account image with link to https://gravatar.com 2015-03-22 17:22:56 +01:00
Vote Updated license header and unified comments 2014-07-04 17:16:51 +02:00
app.properties Updated license header and unified comments 2014-07-04 17:16:51 +02:00
db.properties Updated license header and unified comments 2014-07-04 17:16:51 +02:00