replaced view.css with addHeaderItem to avoid unnecessary request
fixed
Merge remote-tracking branch 'upstream/master'

Conflicts:
	web/concrete/blocks/google_map/controller.php
set slideshow height on serverside
missing google map update
use email instead of name if specified
JS/CSS Versioning support

Check the filemtime of the css/js file to prevent browser caching of
these assets
Add link to zip download

Adding the complementary part to mkly's changes, making it more friendly for newcomers to know how to get the latest development build without having to know how to navigate GitHub.
Added possibility to specify translation contexts
What about introducing the use of msgctxt for ambiguous translations? So translators can better understand how to translate a text.
For example: 'To %s' may have two different translations when used as "Send to recipient" or as "End of a date interval".
The modified web/concrete/elements/permission/duration.php shows a possible implementation.
Enhanced the image helper to allow for instance-specific JPEG compression level

I felt there was a need for the image helper to occasionally render
very high quality JPEGs (my usage was a zoomable map), and there was no
functionality to do this on a per-image / -block basis. Should be a
fairly straight-forward upgrade.
Enhanced the image helper to allow for instance-specific JPEG compression level

I felt there was a need for the image helper to occasionally render
very high quality JPEGs (my usage was a zoomable map), and there was no
functionality to do this on a per-image / -block basis. Should be a
fairly straight-forward upgrade.
Structural updates based on best practices and feedback

# Renamed the compression property to jpegCompression to be more
consistent. also set default value to default system value
# moved constructor to the reset() method which is automatically
invoked by Loader::helper
 # returned $this on setJpegCompression method to allow for chaining
(e.g.
Loader::helper('image')->setJpegCompression(20)->getThumbnail($file,
200, 100);
# modified min level to be 0 per imageJPEG method's acceptable range
Structural updates based on best practices and feedback

# Renamed the compression property to jpegCompression to be more
consistent. also set default value to default system value
# moved constructor to the reset() method which is automatically
invoked by Loader::helper
# returned $this on setJpegCompression method to allow for chaining
(e.g.
Loader::helper('image')->setJpegCompression(20)->getThumbnail($file,200,
 100);
# modified min level to be 0 per imageJPEG method's acceptable range
replace t() with DateHelper

Translation of strings inside dates (monthnames, daynames) should be handled through the DateHelper instead of t().
http://docs.mnkras.com/class_concrete5___helper___date.html#a5f7a7453c70e203543e5e0ab057e3ae5
Use DATE_APP_GENERIC_T instead of literal
Show user attributes names instead of handle
(It's just a proposal)
I'm wondering why the normal users should view the handle of custom user attributes (getAttributeKeyDisplayHandle) instead of their names (getAttributeKeyName).
In my mind I see the handles as an internal representation of the attributes, and the name as the text to be shows. Am I missing something?
display recent page breadcrumbs in reverse-chrono order; change breadcrumb divider from slash to pipe (to avoid confusion with page paths); tweak spacing between breadcrumb items
Remove hardocded textarea width from form block output
Fix documentation on Area::setCustomTemplate() method

The docs were giving the wrong example for how to pass in a custom template name (it should be 'templates/file_name.php', not just the template handle as was previously being indicated).
Also refactored the variable name from $temp to $view, so it matches the Block::display() method arg (thus giving another indication that you should pass in the relative path to the custom template file, and not just the handle).
The translation of `%ss` doesn't make sense
The function `on_before_render()` of the concrete5_Controller_Dashboard_Workflow_Me class contains the code `t('%ss', …)`, where the … may be `Page`, `File` or `User`.
Anyway, with that code, translators have to literally translate `%ss`, which doesn't make sense: only in English plural forms are composed by adding an 's' after a word (and even in English this is not always true).
My solution is to translate every case.
Another, more elegant solution, would be to change the /web/concrete/config/install/base/permissions.xml file, adding a new xml attribute (let's call it `tabName`) containing the text for the tabs for each one of the `category` nodes of the `workflowprogresscategories` node. This implies we have to modify the function `importWorkflowProgressCategories()` of the /web/concrete/core/libraries/content/importer.php file and the `Concrete5_Model_WorkflowProgressCategory` class to manage this property.