Commit graph

4433 commits

Author SHA1 Message Date
60d556d7ec Fixed bug causing exception when creating a new site 2015-04-04 15:40:05 +02:00
68d3b1e8d1 Fixed bug causing wrong macro output introduced in last commit 2015-04-04 15:26:52 +02:00
242f3f61da Fixed macro output for layout images (no box per default) 2015-04-04 15:23:59 +02:00
85deb1593c Enabled probation period and interval of 0 days for site creation 2015-04-04 15:06:02 +02:00
21605f919d Fixed height of header to prevent overlapping with text links 2015-04-04 14:59:19 +02:00
29343dc5c9 Show button for site creation only if permission is granted for regular users 2015-04-01 16:09:30 +02:00
978b532228 Added gendered german translations 2015-04-01 14:18:39 +02:00
511df4701a Fixed cross-browser compatibility for header (title and animated logo) 2015-03-29 19:18:04 +02:00
c5f0f10a43 Fixed position and link of animated logo in root site 2015-03-29 16:30:09 +02:00
3c669d34ec Replaced “Author” with “Account” 2015-03-28 19:40:09 +01:00
8888a3a1bc Merge branch 'feature/revise-translations' into develop 2015-03-27 22:05:41 +01:00
c7f242aea6 Updated H2 library 2015-03-27 22:05:31 +01:00
5391f96840 Merge branch 'develop' into feature/revise-translations
* 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
2015-03-27 22:02:27 +01:00
86cb473b03 Fixed compatibility issues with missing core stylesheet / JavaScript 2015-03-27 18:53:26 +01:00
953462e3ea Merge branch 'feature/batch-upload' into develop 2015-03-27 17:51:33 +01:00
1221a5b3ee Merge branch 'develop' into feature/batch-upload
* 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
2015-03-27 17:51:24 +01:00
3cb4d41389 Moved client-side upload code to Images#upload skin 2015-03-27 17:50:43 +01:00
6835eac442 Re-added click handler for cancel links (compatibility) 2015-03-27 17:42:02 +01:00
face5d5e99 Fixed display of Gravatar for accounts 2015-03-27 17:13:50 +01:00
82020e9ae6 Added code for embedded audio and video player (HTML5) 2015-03-27 16:42:40 +01:00
8b3c154caa (Whitespace) 2015-03-27 16:07:01 +01:00
b1c6a95897 Updated proxy URL 2015-03-27 15:56:31 +01:00
625c70b4bb Merge branch 'feature/batch-upload' into develop 2015-03-27 15:55:57 +01:00
d36ff32b37 Updated translation files 2015-03-27 15:55:05 +01:00
9ae85ed570 Slightly rearranged code 2015-03-27 15:49:25 +01:00
0a0f1fc376 Moved image dimension limits from image creation to site settings 2015-03-27 15:48:35 +01:00
6c3e056068 Fixed batch upload for layout images 2015-03-27 15:45:43 +01:00
1d14d1f1d5 Refactored Story.getAbstract() method. Commented out abstract for custom content. 2015-03-27 13:12:41 +01:00
494767a986 Refactored Story.getDelta() method. Commented out calculation for custom content. 2015-03-27 13:12:21 +01:00
e54eb458cc Moved calculation of delta behind sanitizing comment title and completely removed HTML sanitization 2015-03-27 13:07:18 +01:00
eb3230956b Moved calculation of delta behind sanitizing comment title and replaced call for setMetadata() with setCustomContent() 2015-03-27 13:03:57 +01:00
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
33921fc1f8 Merge branch 'feature/wysiwyg-editor' into develop 2015-03-25 15:57:40 +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
af18542fe5 Updated translation files 2015-03-25 13:11:05 +01:00
4a69a69409 Fixed patch for MySQL databases 2015-03-25 12:56:43 +01:00
bc46f21926 Merge branch 'develop' into feature/wysiwyg-editor
* develop:
  Added patch for initializing trollFilter for existing sites
2015-03-25 12:24:09 +01:00
509446d905 Fixed overlooked occurrence of render_action() which was renamed to render_json_action() 2015-03-25 12:23:47 +01:00
8608f36fa6 Added patch for initializing trollFilter for existing sites 2015-03-25 12:22:17 +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