partial commit
partial commit
Adding resource field on badge rule form
Using an other way to display resource on badge rule
Uses a form theme file for badge rules instead of copy/paste every modification in every files
Fixed translation
Filter resource data with workspace when in a workspace
Merge branch 'master' into enhancement_user__badge_management
Inscription mail update
mail manager update
delete cyclic dependency
Update composer.json

The vesion 1.2 of "willdurand/js-translation-bundle" doesn't existe.
rename file
Merge pull request #392 from solispauwels/alter

Inscription mail update
wip
Merge branch 'master' of https://github.com/claroline/CoreBundle
Fixing text copy.
Fix bug when intl extention is not present
Merge pull request #394 from ngodfraind/text-edition

Fixing text copy.
Merge pull request #395 from solispauwels/alter

Fix bug