merged with develop
made overlay for adding a collection
Merge branch 'develop' of git://github.com/sulu-cmf/SuluMediaBundle into feature/media-ui
began with media edit
save
Merge branch 'feature/media-manager' of git://github.com/sulu-cmf/SuluMediaBundle into feature/media-ui
continued with upload ui
Merge branch 'feature/media-manager' of git://github.com/sulu-cmf/SuluMediaBundle into feature/media-ui
included new file
settings tab for collections
merged with manager and implemented full-width
cleaned code
Merge branch 'feature/media-manager' into develop
updated to symfony 2.5
Merge branch 'develop' of git://github.com/sulu-cmf/SuluMediaBundle into develop
cleaned code and changed template routes
Merge branch 'develop' of git://github.com/sulu-cmf/SuluMediaBundle into feature/media-ui
Merge branch 'feature/media-ui' into develop
built new js version
added colorpicker