Merge branch 'master' of https://github.com/claroline/CoreBundle into bugfix
Portfolio is in a variable
Merge pull request #881 from ngodfraind/master

Bugfixes
Add portfolio url parameters
Remove useless field
Redesign portfolio url field + add help
Add a little javascript script for selected portfolio url if something is written in the field
Use the portfolio url if available
Merge branch 'master' into configure_portfolio_url

Conflicts:
	Resources/translations/platform.en.yml
	Resources/translations/platform.fr.yml
Adding request type GET (without it doesn't work) + changing portfolio link text if it's internal or external
Workspace roles can have special chars (prepared stmt).
the email is displayed properly in the user list of workspaces.
Merge pull request #882 from maxailloud/configure_portfolio_url

Configure portfolio url tool
"show as" functionnality now display resource permissions properly in
resource_manager
Merge branch 'master' of https://github.com/claroline/CoreBundle into bugfixes
desktop agenda can be exported
Allows workspace manager to decline a register request and user to cancel it
Merge branch 'master' of https://github.com/claroline/CoreBundle into workspace-registration-decline
Adds user notification when declining registration request
Merge pull request #883 from kitan1982/workspace-registration-decline

Workspace registration decline