mode forain on
migration hasname resourceNode
resource manager modif
rename hashname
Merge branch 'offline' of https://github.com/vVYou/CoreBundle into offline
adding route to controller split offline bundle
ajout du guid dans la config de creation d'un workspace, permet de contourner le probleme du setGuid workspace
last migration sans creation date pour role entity
oups, correcting a bug
Merge branch 'offline' of https://github.com/vVYou/CoreBundle into offline
migrations pour ajout de creation du user role
migration to create claro_user_role_creation, previous was not a solution
change OneToOne User dans claro_user_role_creation en OneToMany + findUserRoleRepository
avant ajout de dissociate
hasardous, needed to update
update
Merge branch 'master' of https://github.com/vVYou/CoreBundle into offline

Conflicts:
	Entity/Role.php
	Manager/HwiManager.php
	Manager/WorkspaceManager.php
pour le fun
Merge branch 'master' of https://github.com/claroline/CoreBundle

Conflicts:
	Migrations/mysqli/Version20140110095935.php
Merge branch 'master' into offline

Conflicts:
	Entity/Role.php
	Manager/HwiManager.php
	Manager/RoleManager.php
	Manager/WorkspaceManager.php
	Migrations/mysqli/Version20140110095935.php