Updating gitignore.
Squashed commit of the following:

commit 4c222e21b7c3adbe79a4638c3eabfddfda5a4f48
Merge: 7e52c51 39870bf
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Sep 11 17:24:50 2013 +0200

    Merge branch 'master' into core-only

    Conflicts:
    	Controller/DesktopController.php
    	Entity/User.php
    	Resources/doc/sections/plugins/resources.md
    	Tests/old/Controller/AdministrationControllerTest.php
    	Tests/old/Controller/AuthenticationControllerTest.php
    	Tests/old/Controller/ProfileControllerTest.php
    	Tests/old/Controller/RegistrationControllerTest.php
    	Tests/old/Controller/Resource/ResourceControllerTest.php
    	Tests/old/Controller/Resource/ResourcePropertiesControllerTest.php
    	Tests/old/Controller/Resource/ResourceRightsControllerTest.php
    	Tests/old/Controller/TextControllerTest.php
    	Tests/old/Controller/Tool/AgendaControllerTest.php
    	Tests/old/Controller/Tool/WorkspaceGroupControllerTest.php
    	Tests/old/Controller/Tool/WorkspaceUserControllerTest.php
    	Tests/old/Controller/WorkspaceControllerTest.php
    	Tests/old/Listener/Resource/ActivityListenerTest.php
    	Tests/old/Listener/Resource/DirectoryListenerTest.php
    	Tests/old/Listener/Resource/FileListenerTest.php
    	Tests/old/Listener/Resource/TextListenerTest.php
    	Tests/old/Listener/ResourceManagerListenerTest.php
    	Tests/old/Listener/ToolListenerTest.php

commit 7e52c5145d0b10d52422b45e9f90e42754049c5b
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Sep 11 17:18:34 2013 +0200

    Updating core-only .gitignore.

commit 39870bf37f2c6021402f364c11b706f71cacff89
Merge: 6c068c0 d3b50fb
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Sep 11 07:42:40 2013 -0700

    Merge pull request #265 from kitan1982/issue-125-widget-tabs

    Finished tests for AdministrationHomeTabController

commit d3b50fb6207ab10105e671ddeab1d2c33953330c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Sep 11 12:01:56 2013 +0200

    Finished tests for AdministrationHomeTabController

commit 6c068c0cbdbd6af5bade1d345767c273c678e093
Merge: 1586b4f 616e838
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Sep 11 02:42:54 2013 -0700

    Merge pull request #264 from kitan1982/issue-125-widget-tabs

    Merge badges into core

commit 616e838caaaae42df0aed89978e04e2dc85dac35
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Sep 11 11:26:10 2013 +0200

    Skipped functional test for Bagde controller

commit f7f91c93811c81f7ee1f4fa12df6dd7a101a70b7
Merge: 99614d9 0043634
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Sep 11 11:17:44 2013 +0200

    Merge branch 'badge-in-core-bundle' of https://github.com/maxailloud/Claroline into issue-125-widget-tabs

commit 99614d94e84838f74b1b228977e50f0df1c3b4f6
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Sep 11 11:14:54 2013 +0200

    Added testAdminHomeTabUpdateVisibilityAction

commit df434b696356af15496681ed4d6e0209560fbf5f
Merge: 085a52c 1586b4f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Sep 11 11:08:41 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-125-widget-tabs

commit 085a52c49dc1161f138f062d417f51a1e6ada6d0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Sep 11 11:07:57 2013 +0200

    Added more tests for AdministrationHomeTabController

commit 1586b4f834c4596be69489fe99973d67a2cd4da3
Merge: 8caf4a5 725c9ed
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Sep 11 01:52:09 2013 -0700

    Merge pull request #262 from kitan1982/issue-125-widget-tabs

    Issue 125 widget tabs

commit 725c9ed2285da750ea0611fb83a1755921e2c639
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Sep 11 10:29:12 2013 +0200

    Refactored request service

commit 004363470d7f31298169d0508b92db418e55bd89
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Sep 11 10:17:16 2013 +0200

    Correct edit badge form display

commit fc7c4e59c6fc243495eedd59d482b565125a22fe
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Sep 11 10:05:00 2013 +0200

    Move all badgeBundle files in the coreBundle

commit c8111bc4c43f2c7b8686a7132c7bdb93ea03905e
Merge: 6a5c291 8caf4a5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Sep 11 10:01:23 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-125-widget-tabs

commit 6a5c291a001ae65c60e507c1f74b981e3f81f3a5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Sep 11 10:01:01 2013 +0200

    Submodule update

commit 28722a5ffff56674da116b5bcd98d158fcb00aa9
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Sep 11 10:00:36 2013 +0200

    Added first tests for AdministrationHomeTabController

commit 02d08c9315f4ffae42c1786f480fc31c9c87a76c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Sep 11 09:59:43 2013 +0200

    Fixed intermittent test error with postgres

commit 8caf4a5d9c02f14cc597d790689cc8b21060cc31
Merge: 523b6f9 b77ebcd
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Sep 10 08:23:15 2013 -0700

    Merge pull request #261 from kitan1982/issue-125-widget-tabs

    Issue 125 widget tabs

commit b77ebcdfab05dcfd200bd05d51a8d89d1c598587
Merge: fba5ed6 523b6f9
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Sep 10 17:20:28 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-125-widget-tabs

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/DesktopController.php
    	src/plugin/ICAP/BlogBundle

commit 523b6f91104a825cd22344668508aa1e7f7ab3cd
Merge: bb80751 471127f
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Sep 10 07:58:13 2013 -0700

    Merge pull request #216 from maxailloud/log-event-improvement

    Log management improvement

commit fba5ed6141f18d7aa33bbed03eed6252cbdb9777
Merge: d010509 bb80751
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Sep 10 16:46:28 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-125-widget-tabs

commit d0105098da8ae398a5e660ce6b939ba0faff5604
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Sep 10 16:45:53 2013 +0200

    Fixed bug in test name class

commit 64d44fb620ceac4598d292dc180f804fcd9aec81
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Sep 10 16:41:27 2013 +0200

    Added data fixtures for Home tabs

commit 471127f34d45504c8115162a5165cc5467aa7097
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Sep 10 16:20:34 2013 +0200

    Correct test

commit a3f7ffd96fb034156fff096ca9880adb3856747c
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Sep 10 15:48:09 2013 +0200

    Correcting saving issue

commit 6dc795baf42c70fb2774d3c8bab50b5fad6ee44d
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Sep 10 15:38:24 2013 +0200

    Workspace widget config now use a simple_array field to store action restriction instead of one field per action

commit 7dd74e114feb12cbc3ea004c03da5d757bd69eb2
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Sep 10 14:43:14 2013 +0200

    Added tests for repository and manager

commit a3e51ffb8b67115d6a63e307c395f7c49c8a0741
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Sep 9 16:23:42 2013 +0200

    Refacto of the mechanism of displaying restriction for the event log action

commit 3d39e7d3640533e4066f115d09c1cff0d02e2eac
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Sep 9 14:58:41 2013 +0200

    Rename setter for flag isDisplayed

commit 4ff76c7e9b4b7102138afc86b8675189c764cd66
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Sep 9 14:34:42 2013 +0200

    Using eventManager in adminLogFilter

commit 09ecb1365d591618bdb684916097f442b3cc77b5
Merge: 56c9aa8 bb80751
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Sep 9 11:10:02 2013 +0200

    Merge branch 'master' into log-event-improvement

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceControllerTest.php

commit 401fc9cba5b72a49fc044dd308e0744bd2929b0f
Merge: 4ba3eae 5a57778
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 9 11:08:44 2013 +0200

    Merge branch 'main-core' into core-only

commit 56c9aa8486c9db58925555bc3cb33bcf8dc91e8d
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Sep 9 11:07:12 2013 +0200

    Update blog plugin with new translation for workspace filter form

commit 4ba3eae248363cfa1d2f3609c180a82825134e4c
Merge: c15fa20 a17474f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 9 11:05:41 2013 +0200

    Merge remote-tracking branch 'core_remote/master' into core-only

commit 1679e81060628c567ab16f8fc6ec4e0fbc06c840
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Sep 9 11:04:38 2013 +0200

    Change translation key for displaying text in workspace filter form + update doc according to this modification

commit be52127c6f5812c52370476effaa898bbf6a33b2
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Sep 9 11:03:48 2013 +0200

    Change design of workspace log filter form

commit 957def1d8e2e7460cda10f520f956030ca12cb7b
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Sep 9 11:03:11 2013 +0200

    Update vendor to get bootstrap3 form theme file + uses this file in the project

commit bd0cff88dfbd9828b8e7a9fe383b1e16f9f71482
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Sep 9 11:00:05 2013 +0200

    GUI update

commit a17474f047dfb821e4e565b67289d91774a02473
Merge: f866ff1 e33d9d7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 9 10:58:59 2013 +0200

    Merge branch 'core-squashed'

    Conflicts:
    	Resources/views/Administration/layout.html.twig
    	Resources/views/Theme/templates/common.less.twig

commit c15fa20377767b8b2263f234be9f93a02cace27c
Merge: 500fdee 6d06870
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 9 10:45:49 2013 +0200

    Merge remote-tracking branch 'core_remote/master' into core-only

    Conflicts:
    	Resources/views/Administration/layout.html.twig

commit f866ff17122a78e115c3e7a4c65466d41fb34b62
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Sep 9 10:38:05 2013 +0200

    Fixing log manager bad request.

commit 5a57778664e67f4f9ef9bcf2c8269d7b312323c6
Merge: 8c1474f bb80751
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 9 10:37:56 2013 +0200

    Merge branch 'master' into main-core

    Conflicts:
    	Resources/views/Text/editForm.html.twig

commit bb80751803095313735bd77f3d5dd435bc7725a5
Merge: 98d1d22 37ecc01
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Sep 9 01:31:23 2013 -0700

    Merge pull request #257 from easy-es/resource-linker

    Resource linker- change the path of the init resource picker

commit 37ecc01488bde30a4432d3540bccdc8f17830427
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Sep 9 10:24:11 2013 +0200

    update plugin

commit e65c32791e22c52156394330bfcb7dc8e9aecf88
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Sep 9 10:16:21 2013 +0200

    plugin update

commit be0539405f67b8c05b061604fc90190384d99779
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Sep 9 10:11:49 2013 +0200

    delete console debug line

commit 98d1d22d8d61f5ef0d19840a3840060bf30e2977
Merge: 07efadb ad37b8c
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Sep 9 01:02:45 2013 -0700

    Merge pull request #260 from solispauwels/master

    GUI update

commit 6d068709b2c661264f6ed0daebad0f809216308f
Merge: 13c65ea 6574f71
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 9 10:01:57 2013 +0200

    Merge branch 'core-squashed'

    Conflicts:
    	DataFixtures/Required/LoadResourceTypeData.php
    	DataFixtures/Required/LoadThemeData.php
    	Listener/Tool/ResourceManagerImportExportListener.php
    	Resources/views/Administration/layout.html.twig
    	Resources/views/Theme/templates/common.less.twig

commit 500fdee7e10b14b8bb3abfff5c22dbb9f7ca2117
Merge: f2652d6 8c1474f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 9 09:43:32 2013 +0200

    Merge branch 'main-core' into core-only

commit f2652d6d585e7d48f87fff90fe955e6be11511d0
Merge: 72074ad 13c65ea
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 9 09:42:55 2013 +0200

    Merge remote-tracking branch 'core_remote/master' into core-only

    Conflicts:
    	Converter/AuthenticatedUserConverter.php
    	DataFixtures/Required/LoadResourceTypeData.php
    	DataFixtures/Required/LoadThemeData.php
    	Listener/Tool/ResourceManagerImportExportListener.php
    	Resources/views/Administration/layout.html.twig
    	Resources/views/Layout/topBar.html.twig
    	Tests/Manager/ToolManagerTest.php

commit ad37b8ca57d193016e3a268ec75262694b4b4d8e
Merge: 88321a9 07efadb
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Sep 9 09:34:05 2013 +0200

    Merge remote-tracking branch 'upstream/master'

commit 88321a900d746139cf8e07d4bf251086f6aedbf4
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Sep 9 09:34:02 2013 +0200

    Readme update + submodule gui update

commit ec44178142c2241e41a67c24e74fcc8b2c3efbd3
Merge: b193b66 07efadb
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Sep 9 09:32:19 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-125-widget-tabs

commit b193b66c77b375e046abc2af9d16baada9c2bd62
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Sep 9 09:31:54 2013 +0200

    Fixed bug when there is no tab

commit 07efadb24ee2af480cd16958167e0f118f134ac6
Merge: acbbc85 ebf52c9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 9 00:26:41 2013 -0700

    Merge pull request #259 from ngodfraind/exception-handling

    Fixing query builder tests.

commit 8c1474fc92bc6b0fb39dc5d60ccbabe7c73fc1cc
Merge: bb9bfcf acbbc85
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 9 09:25:04 2013 +0200

    Merge branch 'master' into main-core

commit ebf52c9b82bf7e8e71962f1689c559502205dd72
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Sep 9 09:22:47 2013 +0200

    Fixing query builder tests.

commit acbbc85cc2bc0e233f7dbed310a2a33206b6bd29
Merge: 292bf96 032a396
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 9 00:20:55 2013 -0700

    Merge pull request #258 from ngodfraind/exception-handling

    SelectAsEntity can take a class a argument.

commit 032a396c832813002dbed8067314241a2bd2a7b3
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Sep 9 09:16:51 2013 +0200

    SelectAsEntity can take a class a argument.

commit 13c65ea1b0324968c4f0f3deee70a7deb173d3d9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Sep 8 23:46:40 2013 +0200

    Commented tests producing fatal errors

commit 7d79b92abc3233e022d938064127b279e50b5213
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Sep 8 22:51:33 2013 +0200

    Skipped tests needing a refactoring

commit cbdc1598401b892c9870e04f5be33c06386067b0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Sep 8 22:51:00 2013 +0200

    Removed double test case

commit 7eedda434facfacb0ba570f33d0eadd820b85b85
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Sep 8 22:50:11 2013 +0200

    Changed exception type

commit 1dde6f1e23fd2ff20f7d3f2a467152f4e6bf6b00
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Sep 8 22:20:21 2013 +0200

    Fixed relative paths

commit 1a5a377e595f4bf8613f4a233471d3742644ff09
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Sep 8 09:27:39 2013 +0200

    Made plugin base class autoconfigurable

commit 03f7bac7db5d27a5b82c0c144c740a1240b3493a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Sep 8 09:19:58 2013 +0200

    Commented broken links

commit 9fb09039d5e74bbf7231f5990d24dfa720e76bce
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Sep 8 02:39:20 2013 +0200

    Fixed fontawesome path

commit 9caa5065b4238f54c14db3a7e90e572da08d9d2e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Sep 8 01:38:03 2013 +0200

    Fixed merge issues

commit 932591920e65144b98b6610ff2d5209c5531cede
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Sep 8 01:21:51 2013 +0200

    Restored missing use statement

commit 1a8989f4a8a4ec9fa559f75574b4d7c9ac2a790e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Sep 8 01:15:44 2013 +0200

    Fixed service name

commit 2eac6aeb4ee11f1b89281f4654061d9840f6a37d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Sep 8 01:00:47 2013 +0200

    Fixed unmerged listener

commit ebb52e5521ef587bcb824e8d96890708003e9e47
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Sep 8 00:53:35 2013 +0200

    Temporarily forced doctrine extensions version

commit 72074ad433c78c6fa1c3e4b1bde1cbc5086dc12e
Merge: 8d94a9e bb9bfcf
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Sep 7 22:35:57 2013 +0200

    Merge branch 'main-core' into core-only

    Conflicts:
    	ClarolineCoreBundle.php
    	Command/AbstractPluginCommand.php
    	Command/PlatformInstallCommand.php
    	Controller/AdministrationController.php
    	Controller/DesktopController.php
    	Controller/LayoutController.php
    	Controller/MailController.php
    	Controller/MessageController.php
    	Controller/ProfileController.php
    	Controller/RegistrationController.php
    	Controller/ResourceController.php
    	Controller/ResourceRightsController.php
    	Controller/Tool/DesktopAgendaController.php
    	Controller/Tool/RolesController.php
    	Controller/Tool/WorkspaceAgendaController.php
    	Controller/Tool/WorkspaceResourceParametersController.php
    	Converter/AuthenticatedUserConverter.php
    	DataFixtures/Demo/LoadDemoFixture.php
    	DataFixtures/Required/LoadResourceTypeData.php
    	DataFixtures/Required/LoadThemeData.php
    	Entity/Event.php
    	Entity/Resource/AbstractResource.php
    	Entity/Resource/ResourceRights.php
    	Entity/Resource/ResourceType.php
    	Entity/User.php
    	Form/ActivityType.php
    	Form/AgendaType.php
    	Form/DirectoryType.php
    	Form/MailType.php
    	Form/ResourcePropertiesType.php
    	Form/TextType.php
    	Library/HttpFoundation/XmlResponse.php
    	Library/Installation/Plugin/Configuration.php
    	Library/Installation/Plugin/ConfigurationChecker.php
    	Library/Installation/Plugin/ConfigurationFileWriter.php
    	Library/Installation/Plugin/DatabaseWriter.php
    	Library/Installation/Plugin/Installer.php
    	Library/Installation/Plugin/Loader.php
    	Library/Installation/Plugin/Migrator.php
    	Library/Installation/Plugin/RoutingChecker.php
    	Library/PluginBundle.php
    	Library/Resource/ResourceCollection.php
    	Library/Security/Utilities.php
    	Library/Security/Voter/ResourceVoter.php
    	Library/Testing/RepositoryTestCase.php
    	Library/Themes/ThemeParameters.php
    	Library/Workspace/TemplateBuilder.php
    	Listener/LogListener.php
    	Listener/Resource/ActivityListener.php
    	Listener/Resource/DirectoryListener.php
    	Listener/Resource/FileListener.php
    	Listener/Resource/TextListener.php
    	Listener/Tool/ResourceManagerImportExportListener.php
    	Listener/ToolListener.php
    	Manager/ResourceManager.php
    	Manager/RightsManager.php
    	Manager/ToolManager.php
    	Manager/WorkspaceManager.php
    	Migrations/pdo_pgsql/Version20130819145625.php
    	Repository/EventRepository.php
    	Repository/ResourceNodeRepository.php
    	Repository/ResourceQueryBuilder.php
    	Repository/ResourceRightsRepository.php
    	Resources/config/parameters.yml
    	Resources/config/services.yml
    	Resources/doc/sections/resources.md
    	Resources/public/js/resource/dragndrop.js
    	Resources/public/js/resource/manager.js
    	Resources/public/js/startup.js
    	Resources/public/js/table.js
    	Resources/public/js/theme/theme.js
    	Resources/public/js/tool/calendar.js
    	Resources/translations/agenda.en.yml
    	Resources/translations/agenda.fr.yml
    	Resources/translations/platform.en.yml
    	Resources/translations/platform.fr.yml
    	Resources/translations/resource.en.yml
    	Resources/translations/resource.fr.yml
    	Resources/translations/theme.en.yml
    	Resources/translations/theme.fr.yml
    	Resources/views/Activity/index.html.twig
    	Resources/views/Activity/player/instructions.html.twig
    	Resources/views/Activity/player/leftMenu.html.twig
    	Resources/views/Administration/desktopToolNames.html.twig
    	Resources/views/Administration/groupCreationForm.html.twig
    	Resources/views/Administration/groupList.html.twig
    	Resources/views/Administration/groupSettingsForm.html.twig
    	Resources/views/Administration/importUsersForm.html.twig
    	Resources/views/Administration/importUsersIntoGroupForm.html.twig
    	Resources/views/Administration/layout.html.twig
    	Resources/views/Administration/logList.html.twig
    	Resources/views/Administration/outsideOfGroupUserList.html.twig
    	Resources/views/Administration/platformSettingsForm.html.twig
    	Resources/views/Administration/pluginList.html.twig
    	Resources/views/Administration/registrationManagement.html.twig
    	Resources/views/Administration/registrationManagementCompleteWorkspacesList.html.twig
    	Resources/views/Administration/registrationManagementGroupList.html.twig
    	Resources/views/Administration/registrationManagementUserList.html.twig
    	Resources/views/Administration/userCreationForm.html.twig
    	Resources/views/Administration/userList.html.twig
    	Resources/views/Administration/usersManagement.html.twig
    	Resources/views/Administration/usersOfGroupList.html.twig
    	Resources/views/Administration/widgetConfiguration.html.twig
    	Resources/views/Administration/widgets.html.twig
    	Resources/views/Authentication/forgotPassword.html.twig
    	Resources/views/Authentication/resetPassword.html.twig
    	Resources/views/Desktop/layout.html.twig
    	Resources/views/Form/simple_auto_complete.html.twig
    	Resources/views/Home/error.html.twig
    	Resources/views/Home/type.html.twig
    	Resources/views/Install/checkAdmin.html.twig
    	Resources/views/Install/checkupDb.html.twig
    	Resources/views/Install/execute.html.twig
    	Resources/views/Install/layout.html.twig
    	Resources/views/Install/sucess.html.twig
    	Resources/views/Jasmine/specRunner.html.twig
    	Resources/views/Layout/renderWarningImpersonation.html.twig
    	Resources/views/Layout/topBar.html.twig
    	Resources/views/Log/config_workspace_widget_form.html.twig
    	Resources/views/Log/view_list.html.twig
    	Resources/views/Log/view_list_item_resource.html.twig
    	Resources/views/Mail/form.html.twig
    	Resources/views/Message/layout.html.twig
    	Resources/views/Message/listReceived.html.twig
    	Resources/views/Message/listRemoved.html.twig
    	Resources/views/Message/listSent.html.twig
    	Resources/views/Message/show.html.twig
    	Resources/views/Profile/profile.html.twig
    	Resources/views/Profile/profileForm.html.twig
    	Resources/views/Resource/breadcrumbs.html.twigjs
    	Resources/views/Resource/configResourcesManager.html.twig
    	Resources/views/Resource/multipleRightsPage.html.twig
    	Resources/views/Resource/singleRightsForm.html.twig
    	Resources/views/Resource/thumbnail.html.twigjs
    	Resources/views/Text/editForm.html.twig
    	Resources/views/Text/history.html.twig
    	Resources/views/Text/index.html.twig
    	Resources/views/Theme/edit.html.twig
    	Resources/views/Theme/list.html.twig
    	Resources/views/Theme/preview.html.twig
    	Resources/views/Theme/templates/common.less.twig
    	Resources/views/Tool/desktop/agenda/agenda.html.twig
    	Resources/views/Tool/desktop/home/configuration.html.twig
    	Resources/views/Tool/desktop/home/homeLayout.html.twig
    	Resources/views/Tool/desktop/home/info.html.twig
    	Resources/views/Tool/desktop/home/widgetConfiguration.html.twig
    	Resources/views/Tool/desktop/home/widgetProperties.html.twig
    	Resources/views/Tool/desktop/parameters/parameters.html.twig
    	Resources/views/Tool/desktop/parameters/toolProperties.html.twig
    	Resources/views/Tool/desktop/resource_manager/resources.html.twig
    	Resources/views/Tool/workspace/agenda/agenda.html.twig
    	Resources/views/Tool/workspace/home/configuration.html.twig
    	Resources/views/Tool/workspace/home/home.html.twig
    	Resources/views/Tool/workspace/home/widgetConfiguration.html.twig
    	Resources/views/Tool/workspace/home/widgetProperties.html.twig
    	Resources/views/Tool/workspace/logs/logList.html.twig
    	Resources/views/Tool/workspace/parameters/parameters.html.twig
    	Resources/views/Tool/workspace/parameters/template.html.twig
    	Resources/views/Tool/workspace/parameters/toolRoles.html.twig
    	Resources/views/Tool/workspace/parameters/workspaceEdit.html.twig
    	Resources/views/Tool/workspace/parameters/workspaceOrderToolEdit.html.twig
    	Resources/views/Tool/workspace/resource_manager/resourceRightsCreation.html.twig
    	Resources/views/Tool/workspace/resource_manager/resources.html.twig
    	Resources/views/Tool/workspace/resource_manager/resourcesRights.html.twig
    	Resources/views/Tool/workspace/roles/roleCreation.html.twig
    	Resources/views/Tool/workspace/roles/roleEdit.html.twig
    	Resources/views/Tool/workspace/roles/roles.html.twig
    	Resources/views/Tool/workspace/roles/workspaceGroups.html.twig
    	Resources/views/Tool/workspace/roles/workspaceUsers.html.twig
    	Resources/views/Workspace/creationForm.html.twig
    	Resources/views/Workspace/layout.html.twig
    	Resources/views/Workspace/list.html.twig
    	Resources/views/Workspace/listWorkspacesByUser.html.twig
    	Resources/views/Workspace/listWorkspacesWithSelfRegistration.html.twig
    	Resources/views/Workspace/workspaceListByTagRegistrationPager.html.twig
    	Resources/views/WorkspaceTag/checkPotentialWorkspaceAdminTagChildren.html.twig
    	Resources/views/WorkspaceTag/checkPotentialWorkspaceTagChildren.html.twig
    	Resources/views/WorkspaceTag/manageAdminTag.html.twig
    	Resources/views/WorkspaceTag/manageTag.html.twig
    	Resources/views/WorkspaceTag/organizeWorkspaceAdminTag.html.twig
    	Resources/views/WorkspaceTag/organizeWorkspaceTag.html.twig
    	Resources/views/WorkspaceTag/workspaceAdminTagCreateForm.html.twig
    	Resources/views/WorkspaceTag/workspaceTagCreateForm.html.twig
    	Resources/views/layout.html.twig
    	Resources/views/less/bootstrap-default/variables.less
    	Resources/views/less/claroline/theme.less
    	Resources/views/less/claroline/variables.less
    	Resources/views/less/layout.less
    	Tests/Controller/AdministrationControllerTest.php
    	Tests/Controller/AuthenticationControllerTest.php
    	Tests/Controller/HomeControllerTest.php
    	Tests/Controller/MessageControllerTest.php
    	Tests/Controller/RegistrationControllerTest.php
    	Tests/Controller/ResourceControllerTest.php
    	Tests/Controller/Tool/RolesControllerTest.php
    	Tests/Controller/WorkspaceControllerTest.php
    	Tests/Converter/AuthenticatedUserConverterTest.php
    	Tests/Library/Installation/Plugin/InstallerTest.php
    	Tests/Library/Installation/Plugin/LoaderTest.php
    	Tests/Library/Installation/Plugin/ResourceCheckerTest.php
    	Tests/Library/Installation/Plugin/RoutingCheckerTest.php
    	Tests/Library/Installation/Plugin/ValidatorTest.php
    	Tests/Manager/ResourceManagerTest.php
    	Tests/Manager/RightsManagerTest.php
    	Tests/Manager/ToolManagerTest.php
    	Tests/Manager/WorkspaceManagerTest.php
    	Tests/Repository/ResourceNodeRepositoryTest.php
    	Tests/Repository/ResourceQueryBuilderTest.php
    	Tests/Repository/ResourceRightsRepositoryTest.php

commit 8d94a9ece94bfeeb5e6d71e3f385a0aa2b9a5dce
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Sep 7 20:35:44 2013 +0200

    Added .gitignore

commit bb9bfcf78bfee27376cd83aeb349673fc94934fb
Merge: 05f6b8a 292bf96
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Sep 7 20:08:22 2013 +0200

    Merge branch 'master' into main-core

    Conflicts:
    	.gitignore
    	Controller/MailController.php
    	Controller/ResourceController.php
    	Controller/ResourceRightsController.php
    	Controller/Tool/RolesController.php
    	Controller/Tool/WorkspaceResourceParametersController.php
    	DataFixtures/Demo/LoadDemoFixture.php
    	DataFixtures/Demo/LoadTypeData.php
    	DataFixtures/Required/LoadResourceTypeData.php
    	DataFixtures/Required/LoadThemeData.php
    	Entity/Resource/AbstractResource.php
    	Entity/Resource/ResourceRights.php
    	Entity/Resource/ResourceType.php
    	Form/ActivityType.php
    	Form/DirectoryType.php
    	Form/MailType.php
    	Form/ResourcePropertiesType.php
    	Form/TextType.php
    	Library/HttpFoundation/XmlResponse.php
    	Library/Installation/Plugin/Configuration.php
    	Library/Installation/Plugin/DatabaseWriter.php
    	Library/Resource/ResourceCollection.php
    	Library/Security/Utilities.php
    	Library/Security/Voter/ResourceVoter.php
    	Library/Testing/RepositoryTestCase.php
    	Library/Themes/ThemeParameters.php
    	Library/Workspace/TemplateBuilder.php
    	Listener/LogListener.php
    	Listener/Resource/ActivityListener.php
    	Listener/Resource/DirectoryListener.php
    	Listener/Resource/FileListener.php
    	Listener/Resource/TextListener.php
    	Listener/Tool/ResourceManagerImportExportListener.php
    	Listener/Tool/ResourceManagerListener.php
    	Manager/ResourceManager.php
    	Manager/RightsManager.php
    	Manager/ToolManager.php
    	Manager/UserManager.php
    	Manager/WorkspaceManager.php
    	Migrations/pdo_pgsql/Version20130819145625.php
    	Repository/ResourceNodeRepository.php
    	Repository/ResourceQueryBuilder.php
    	Repository/ResourceRightsRepository.php
    	Resources/doc/sections/resources.md
    	Resources/public/js/resource/manager.js
    	Resources/public/js/startup.js
    	Resources/public/js/table.js
    	Resources/public/js/theme/theme.js
    	Resources/translations/agenda.en.yml
    	Resources/translations/agenda.fr.yml
    	Resources/translations/platform.en.yml
    	Resources/translations/platform.fr.yml
    	Resources/translations/resource.en.yml
    	Resources/translations/resource.fr.yml
    	Resources/translations/theme.en.yml
    	Resources/translations/theme.fr.yml
    	Resources/views/Activity/index.html.twig
    	Resources/views/Administration/desktopToolNames.html.twig
    	Resources/views/Administration/groupCreationForm.html.twig
    	Resources/views/Administration/groupList.html.twig
    	Resources/views/Administration/groupSettingsForm.html.twig
    	Resources/views/Administration/importUsersForm.html.twig
    	Resources/views/Administration/importUsersIntoGroupForm.html.twig
    	Resources/views/Administration/layout.html.twig
    	Resources/views/Administration/logList.html.twig
    	Resources/views/Administration/outsideOfGroupUserList.html.twig
    	Resources/views/Administration/platformSettingsForm.html.twig
    	Resources/views/Administration/pluginList.html.twig
    	Resources/views/Administration/registrationManagement.html.twig
    	Resources/views/Administration/registrationManagementCompleteWorkspacesList.html.twig
    	Resources/views/Administration/registrationManagementGroupList.html.twig
    	Resources/views/Administration/registrationManagementUserList.html.twig
    	Resources/views/Administration/userCreationForm.html.twig
    	Resources/views/Administration/userList.html.twig
    	Resources/views/Administration/usersManagement.html.twig
    	Resources/views/Administration/usersOfGroupList.html.twig
    	Resources/views/Administration/widgetConfiguration.html.twig
    	Resources/views/Administration/widgets.html.twig
    	Resources/views/Authentication/forgotPassword.html.twig
    	Resources/views/Authentication/resetPassword.html.twig
    	Resources/views/Desktop/layout.html.twig
    	Resources/views/Home/type.html.twig
    	Resources/views/Layout/topBar.html.twig
    	Resources/views/Log/config_workspace_widget_form.html.twig
    	Resources/views/Log/view_list.html.twig
    	Resources/views/Log/view_list_item_resource.html.twig
    	Resources/views/Mail/form.html.twig
    	Resources/views/Message/listReceived.html.twig
    	Resources/views/Message/listRemoved.html.twig
    	Resources/views/Message/listSent.html.twig
    	Resources/views/Message/show.html.twig
    	Resources/views/Resource/breadcrumbs.html.twigjs
    	Resources/views/Resource/configResourcesManager.html.twig
    	Resources/views/Resource/multipleRightsPage.html.twig
    	Resources/views/Resource/singleRightsForm.html.twig
    	Resources/views/Resource/thumbnail.html.twigjs
    	Resources/views/Text/editForm.html.twig
    	Resources/views/Text/history.html.twig
    	Resources/views/Text/index.html.twig
    	Resources/views/Theme/edit.html.twig
    	Resources/views/Theme/list.html.twig
    	Resources/views/Theme/preview.html.twig
    	Resources/views/Theme/templates/common.less.twig
    	Resources/views/Tool/desktop/agenda/agenda.html.twig
    	Resources/views/Tool/desktop/home/configuration.html.twig
    	Resources/views/Tool/desktop/home/homeLayout.html.twig
    	Resources/views/Tool/desktop/home/info.html.twig
    	Resources/views/Tool/desktop/home/widgetConfiguration.html.twig
    	Resources/views/Tool/desktop/home/widgetProperties.html.twig
    	Resources/views/Tool/desktop/parameters/parameters.html.twig
    	Resources/views/Tool/desktop/parameters/toolProperties.html.twig
    	Resources/views/Tool/desktop/resource_manager/resources.html.twig
    	Resources/views/Tool/workspace/agenda/agenda.html.twig
    	Resources/views/Tool/workspace/home/configuration.html.twig
    	Resources/views/Tool/workspace/home/home.html.twig
    	Resources/views/Tool/workspace/home/widgetConfiguration.html.twig
    	Resources/views/Tool/workspace/home/widgetProperties.html.twig
    	Resources/views/Tool/workspace/logs/logList.html.twig
    	Resources/views/Tool/workspace/parameters/parameters.html.twig
    	Resources/views/Tool/workspace/parameters/template.html.twig
    	Resources/views/Tool/workspace/parameters/toolRoles.html.twig
    	Resources/views/Tool/workspace/parameters/workspaceEdit.html.twig
    	Resources/views/Tool/workspace/parameters/workspaceOrderToolEdit.html.twig
    	Resources/views/Tool/workspace/resource_manager/resourceRightsCreation.html.twig
    	Resources/views/Tool/workspace/resource_manager/resources.html.twig
    	Resources/views/Tool/workspace/resource_manager/resourcesRights.html.twig
    	Resources/views/Tool/workspace/roles/roleCreation.html.twig
    	Resources/views/Tool/workspace/roles/roleEdit.html.twig
    	Resources/views/Tool/workspace/roles/roles.html.twig
    	Resources/views/Tool/workspace/roles/workspaceGroups.html.twig
    	Resources/views/Tool/workspace/roles/workspaceUsers.html.twig
    	Resources/views/Workspace/creationForm.html.twig
    	Resources/views/Workspace/layout.html.twig
    	Resources/views/Workspace/list.html.twig
    	Resources/views/Workspace/listWorkspacesByUser.html.twig
    	Resources/views/Workspace/listWorkspacesWithSelfRegistration.html.twig
    	Resources/views/Workspace/workspaceListByTagRegistrationPager.html.twig
    	Resources/views/WorkspaceTag/checkPotentialWorkspaceAdminTagChildren.html.twig
    	Resources/views/WorkspaceTag/checkPotentialWorkspaceTagChildren.html.twig
    	Resources/views/WorkspaceTag/manageAdminTag.html.twig
    	Resources/views/WorkspaceTag/manageTag.html.twig
    	Resources/views/WorkspaceTag/organizeWorkspaceAdminTag.html.twig
    	Resources/views/WorkspaceTag/organizeWorkspaceTag.html.twig
    	Resources/views/WorkspaceTag/workspaceAdminTagCreateForm.html.twig
    	Resources/views/WorkspaceTag/workspaceTagCreateForm.html.twig
    	Resources/views/layout.html.twig
    	Resources/views/less/bootstrap-default/variables.less
    	Resources/views/less/claroline/theme.less
    	Resources/views/less/layout.less
    	Tests/Controller/AdministrationControllerTest.php
    	Tests/Controller/AuthenticationControllerTest.php
    	Tests/Controller/HomeControllerTest.php
    	Tests/Controller/MessageControllerTest.php
    	Tests/Controller/RegistrationControllerTest.php
    	Tests/Controller/ResourceControllerTest.php
    	Tests/Controller/Tool/RolesControllerTest.php
    	Tests/Controller/Tool/WorkspaceCalendarControllerTest.php
    	Tests/Controller/WorkspaceControllerTest.php
    	Tests/Manager/ResourceManagerTest.php
    	Tests/Manager/RightsManagerTest.php
    	Tests/Manager/ToolManagerTest.php
    	Tests/Manager/WorkspaceManagerTest.php
    	Tests/Repository/ResourceNodeRepositoryTest.php
    	Tests/Repository/ResourceQueryBuilderTest.php
    	Tests/Repository/ResourceRightsRepositoryTest.php
    	Tests/old/Controller/Resource/ResourceRightsControllerTest.php
    	Tests/old/Library/Installation/Plugin/DatabaseWriterTest.php
    	Tests/old/Listener/Resource/DirectoryListenerTest.php

commit 05f6b8a65a42001b02472bea7e2f233df9bbcb2a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Sep 7 18:39:44 2013 +0200

    Added .gitignore

commit 292bf96454b2cd6c92ff86524dbf3014ea062c23
Merge: 5dfb25c af5da84
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Sep 6 08:39:04 2013 -0700

    Merge pull request #256 from ngodfraind/exception-handling

    Exception handling for manager.js

commit cfa09e7ac187e7d8bec7a80050e78d1f1681ec6b
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Sep 6 15:25:54 2013 +0200

    Using EventManager to get all available action event for filter log + display message if no log found when filter

commit dc1372c179f22cb7f68987d3a12cb4f9c6707275
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Sep 6 15:16:22 2013 +0200

    change the path of the initparemeter of ressource-picker

commit 7eb85ce108e4f8feaaa717af6ae09ae0a9ff9aec
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Sep 6 15:14:22 2013 +0200

    submodule update

commit 8301c9e4a7a31c6d47f6b78c3ac9ee8c7f71c916
Merge: b4423cf 5dfb25c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Sep 6 14:58:10 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-125-widget-tabs

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Administration/layout.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/desktop/home/homeLayout.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/desktop/home/info.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/home/configuration.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/home/home.html.twig
    	src/plugin/Claroline/ForumBundle
    	src/plugin/ICAP/BlogBundle

commit af5da84c7e3ed3d2ce530e8c7cc296cc2cba8299
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Sep 6 14:56:50 2013 +0200

    Adding headers to the openDirectoryAction.

commit b4423cf27e9b02c1802b648c4d33160f0bae9c8a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Sep 6 14:34:24 2013 +0200

    Added user config for widgets in admin Home tabs

commit 9e365bdceef0895c3bc2c27d5d07bb124717f08c
Merge: a404cb1 5dfb25c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Sep 6 14:13:35 2013 +0200

    Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	src/plugin/Claroline/ForumBundle

commit 819a79321923c5a35f4b2875b072f97c3b5ce7af
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Sep 6 14:11:28 2013 +0200

    The ResourceMoveException is now thrown before the order was changed.

commit 5dfb25c04f9319cc0435da615077bd5e27c2bdcc
Merge: 8aa4df5 901dff3
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Sep 6 05:00:12 2013 -0700

    Merge pull request #255 from ngodfraind/master

    Adding getByMimeTypeAndParent function.

commit a404cb1d21170bb414fb977fc5ccc8616afa58d3
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Sep 6 13:53:36 2013 +0200

    submodule update

commit 901dff321a92f699ed4ebf2e962a2b910cd34afc
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Sep 6 13:48:35 2013 +0200

    Adding getByMimeTypeAndParent function.

commit a123e883f29c149429146255c296c6b4924966e2
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Sep 6 13:38:46 2013 +0200

    Added widgets configuration into Home tabs

commit 8aa4df542c7ea2410ac6ba6630ea04b436bf06e0
Merge: 741858c 86569ae
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Sep 6 04:25:52 2013 -0700

    Merge pull request #254 from ngodfraind/master

    Upgrade ForumBundle (Migrations fix)

commit 86569ae64d201651849c00d5514dd3efc3616f95
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Sep 6 12:04:54 2013 +0200

    Upgrade ForumBundle (Migrations fix)

commit 5e65d6b6c563f673ea0d359cf5d4a5a53a4575d8
Merge: a14d664 741858c
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Sep 6 10:42:53 2013 +0200

    Merge remote-tracking branch 'upstream/master' into resource-linker

commit 82841470c366475b3f8e08fec570469f3be7d508
Merge: 815b382 741858c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Sep 6 10:17:53 2013 +0200

    Merge remote-tracking branch 'upstream/master'

commit 815b382b48ef79f54f8170d946a2f9c93d55d57a
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Sep 6 10:17:22 2013 +0200

    GUI update (resources filter)

commit 05b891a0bd19f9e46babd3fb4c353e368411dc26
Merge: 3e0c8e9 741858c
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Sep 6 09:54:40 2013 +0200

    Merge remote-tracking branch 'upstream/master' into exception-handling

commit 3e0c8e9708d0bae662e71e151aeeee312b0886a4
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Sep 6 09:53:26 2013 +0200

    Adding alert to display errors in the resource manager.

commit 741858c15d6b5eb38ba74a6564633922b53583ff
Merge: 5a82659 d8a4b5b
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Sep 6 00:49:13 2013 -0700

    Merge pull request #253 from ngodfraind/master

    Fixing a bug happening when a user was created and the demo fixtures were lot loaded.

commit 8b4bc2ad6b81c58ee9c0ca72fddd800bc9120d82
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Sep 6 09:48:38 2013 +0200

    submodule update

commit 496c834dee6e87b3d84d04a6dd1ff5288c689e7f
Merge: 2d613d3 5a82659
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Sep 6 09:37:57 2013 +0200

    Merge remote-tracking branch 'upstream/master'

commit 2d613d30c1ca48a507c57944f200facf40c917b3
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Sep 6 09:36:25 2013 +0200

    submodules GUI update

commit d8a4b5b6ba411221c464b09845f3bfee0e7e17ff
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Sep 6 09:35:33 2013 +0200

    Fixing tests.

commit 5c51b76421be79440c983ff95e9032511ba06267
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Sep 6 09:28:43 2013 +0200

    Updating submodules.

commit be8b73610f4a4ab9782347f696fb8819a541363e
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Sep 6 09:20:44 2013 +0200

    Fixing a bug happening with the user creation if there was no fixture.

commit 77142426171eb62b96ddd6b0f19149c115497c0f
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Sep 6 08:58:59 2013 +0200

    Displaying ajax error (1)

commit 5a82659a11d009144a835eb834ff371e73e45cb1
Merge: fdb68c3 5a8d011
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Sep 5 06:44:36 2013 -0700

    Merge pull request #252 from ngodfraind/bugfix

    Fixing some bugs happening when resources are removed.

commit 5a8d01150800ef85c1cb9aa6030d0d50d0cbdd61
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Sep 5 15:40:25 2013 +0200

    Updating ForumBundle.

commit a7e81dc12ed1b2e70ef965c1cfff94b2e728ea37
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Sep 5 15:24:08 2013 +0200

    Moving class for configuring log in admin and workspace in log namespace + update label translation key

commit 3ecc1c15bf167f351733f7116cc4eb872ced6229
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Sep 5 15:12:02 2013 +0200

    "fixing" a bug happening when a user tried to remove a shortcut whose target was already removed.

commit 22f37359085acc2bf3dadaab50b0d53de778d087
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Sep 5 14:53:26 2013 +0200

    Update action name of existing event log to match current working when matching action name with filter in filter form

commit 2f6a26d2fa6788855ae541998cdf978408cb52b4
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Sep 5 14:39:02 2013 +0200

    Update documentation to match intention

commit ec6138526ad5dc2a6e1b5032fd513b1ff4a565f2
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Sep 5 14:38:31 2013 +0200

    Add phpDoc

commit 7bdee7ac1f3caea8f57c2bbe3d71479aac7498a6
Merge: fdb68c3 a7b0a62
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Sep 5 14:32:43 2013 +0200

    Merge branch 'improving-custom-action' into bugfix

commit a7b0a621bcf5ef2406cc275b9f404f7536b2eb95
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Sep 5 14:31:16 2013 +0200

    Fixes a bug happening when removing at least 2 directories with the resource manger.

commit a14d6641229374032c0fe6e66e8b9637eeac30fc
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Sep 5 14:30:08 2013 +0200

    fetch

commit fdb68c3b9799365c73007d983cee40cd45c2074c
Merge: 7d55a0c bef3f52
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Sep 5 05:20:32 2013 -0700

    Merge pull request #251 from easy-es/tinymce

    add tinymce in mail and text ressource

commit bef3f524a974bd5176c5c0b10620bff7da6e9257
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Sep 5 14:11:53 2013 +0200

    add tinymce in mail and text ressource

commit 7d55a0c54264f4abe283ab22959739d0f57f5025
Merge: f6f077d 109c19b
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Sep 5 04:37:21 2013 -0700

    Merge pull request #250 from solispauwels/master

    Breadcrumb update in resource manager and GUI update

commit 109c19baf1038071cdef9a609fed9ee56b53320e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Sep 5 13:28:21 2013 +0200

    Small fixes

commit f6f077db5ace10f177b749c62bcd1abeaef40805
Merge: c8c8e7e 463242a
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Sep 5 04:22:57 2013 -0700

    Merge pull request #247 from ngodfraind/improving-custom-action

    Improving custom action

commit 258f093914946d65fcf4ad412e4113706454c16a
Merge: b3321cf c8c8e7e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Sep 5 11:47:09 2013 +0200

    Merge remote-tracking branch 'upstream/master'

commit b3321cf3dbfad116e560bfe5acd1435d90199a78
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Sep 5 11:44:09 2013 +0200

    Breadcrumb update in resource manager

commit 715f91597e1c4aa6da04758431944aef8b753456
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Sep 5 11:33:24 2013 +0200

    Correct chart in workspage tool by adding actionrestriction where it's needed

commit 46cbbf3d078d77c8ff481828fbb63f4aabacf32e
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Sep 5 11:17:52 2013 +0200

    Remove useless code

commit a8a1fdaf47cab5ee11e1e28f967a3b64cc399fc5
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Sep 5 11:09:29 2013 +0200

    Readd removed method for getting admin logs

commit 393b5a9fd3818afd96a3fce92c25603abb2f75a5
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Sep 5 10:57:20 2013 +0200

    remove debug code

commit 91d958b3ac59a5a00bbb2f647b43db8a5153bd5e
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Sep 5 10:56:15 2013 +0200

    Correct some stuff + rename variable + starting refacto for not using hardcoded list of action

commit 9658ad5c9ce9e3aa84d7996cd5673eb0b2d04826
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Sep 5 10:54:34 2013 +0200

    correct workspace for LogHiddenWorkspaceWidgetConfig class

commit 463242aac0787eec57532895b3cc235d932948fb
Merge: 0e31070 c8c8e7e
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Sep 5 09:56:43 2013 +0200

    Merge remote-tracking branch 'upstream/master' into improving-custom-action

commit 0e3107096234ed2daf42929e53718eeb9962daec
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Sep 5 09:55:23 2013 +0200

    Fixing ResourceVoter move action.

commit 2d29bd3676d0461ca616d4d75038919a53cfb2e3
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Sep 5 09:43:03 2013 +0200

    Fixing manager.js for postgres.

commit c8c8e7eae6327a085a4d893d504731bc173f5e93
Merge: 3bea659 3b8ba3e
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Sep 5 00:42:21 2013 -0700

    Merge pull request #248 from easy-es/forum-message-number

    Forum message number

commit 3b8ba3e2504f0901373edf992c66a4d0c53094d6
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Sep 5 09:35:45 2013 +0200

    examplebundle upgrade

commit 6a8b2910d930714ac215791d2f48039236166178
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Sep 5 09:13:42 2013 +0200

    submodule update

commit 25a28b131b3056f71840a955f04a7a01da98eea5
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Sep 5 09:00:00 2013 +0200

    close #222 number of message and subject per page not negatif

commit 635b1a09aafbe566a221d86cde1c5b1a3dece0e9
Merge: d83bb8b 3bea659
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Sep 4 17:20:36 2013 +0200

    Merge remote-tracking branch 'upstream/master' into improving-custom-action

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceControllerTest.php
    	src/core/Claroline/CoreBundle/Tests/Controller/WorkspaceControllerTest.php

commit d83bb8b99687aa17b82900151c66dddf051e6618
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Sep 4 17:17:21 2013 +0200

    Updating the queries for postgres.

commit 3bea6592fce38db569ed6d48430da8d90107bbbe
Merge: 0ea7f9d b901ef1
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Sep 4 07:24:02 2013 -0700

    Merge pull request #243 from easy-es/tests-response

    change the assert equals value to content or statuscode

commit b901ef144f6d8cb65048c26d85b6b0b4ebc3bcd0
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Sep 4 16:12:59 2013 +0200

    fixed test

commit 1024645ab8418db21f6d759c6e8384eb2f7f8537
Merge: 1ef7333 0ea7f9d
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Sep 4 16:06:14 2013 +0200

    Merge remote-tracking branch 'upstream/master' into improving-custom-action

commit 1ef73330cbfed4cc49f0051526b4a8f5d99fcf07
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Sep 4 16:03:57 2013 +0200

    Fixing a bug happening when many menu entries shared the same rights in a plugin config.

commit 713f26d1532c7924f66570d9333c8a4cc839d935
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Sep 4 15:41:41 2013 +0200

    Updating submodules.

commit 55b7349b3f75e3b10ecc2d6bf212f033d2b0f97a
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Sep 4 15:29:57 2013 +0200

    test the response with assertinstanceOf

commit 0ea7f9d123e9e5f78592b5252ae10a644d0a8480
Merge: 9837fc9 e648f97
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Sep 4 06:14:27 2013 -0700

    Merge pull request #246 from solispauwels/master

    fix Home page when there are no demo fixtures

commit eb026a26b7e1a3ba98d9c5beb1be79fe14685bf3
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Sep 4 15:09:07 2013 +0200

    Correct typo

commit 1005865dd7c2215aeed384ba2afdc5d8420cbae0
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Sep 4 15:08:03 2013 +0200

    Correct link to plugin logs section

commit 9c0c64fb0f9b6544cad47d0b003d290c0717afc4
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Sep 4 15:06:21 2013 +0200

    Correct link between files

commit 47831c2ff01ef835062eefb740cd393f5e97e291
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Sep 4 15:05:46 2013 +0200

    Translations.

commit cb6cb7f8c2568c7e512ebd38ebd72aa134dc1756
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Sep 4 15:05:20 2013 +0200

    Correct link between files

commit 9b343d85e6ed5d9fa560ac80d89660f1f422af87
Merge: cb8392d 9837fc9
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Sep 4 14:48:09 2013 +0200

    Merge branch 'master' into log-event-improvement

commit cb8392d58d21863cce9cd99cde1ffb13a2d58392
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Sep 4 14:47:10 2013 +0200

    Update blog plugin with new displaying details files for log

commit 0cb4bd1174762cbfea7757f3696d6dc71591bf11
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Sep 4 14:46:33 2013 +0200

    Update documentation for creating and displaying custom event log in the event tracking system for plugin

commit 81721d6b76747027c45f50d8896cb12d2481435d
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Sep 4 13:59:39 2013 +0200

    Fixing workspace import/export.

commit e648f9708bbeb422a69dae18dbd05c4a97197901
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Sep 4 13:40:24 2013 +0200

    fix Home page with no demo fixtures

commit 9837fc9fb793a4e75679f24fb2e871d2f0c87af3
Merge: d5a0100 1158af4
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Sep 4 02:44:18 2013 -0700

    Merge pull request #245 from ngodfraind/bugfix

    Bugfix

commit 1158af46ea1066ccd7eadf610958269419f9cdfc
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Sep 4 11:34:08 2013 +0200

    Fixing XML encoding.

commit 0a301745403a84820467cedfe2c94a0537a0538b
Merge: b29b381 d5a0100
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Sep 4 11:28:53 2013 +0200

    Merge remote-tracking branch 'upstream/master' into bugfix

commit 738ec7e72b0620ed7047914a831ae07bf1ea50c8
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Sep 4 11:26:57 2013 +0200

    commit

commit b8dd8782e00c4029b0676de9d80e0067658706c0
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Sep 4 10:44:34 2013 +0200

    added assertInstanceof in tests

commit d5a01005e22ee4a343142c056fa8f0e0ece2df76
Merge: fb829cc 5b29243
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Sep 4 01:43:54 2013 -0700

    Merge pull request #244 from solispauwels/GUI

    GUI update

commit 5b29243858a469f6b19a914a56e480d6f76dadf3
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Sep 4 10:35:36 2013 +0200

    GUI update

commit 4422fb57dbbb37a520a385789ced7ddb39da3615
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Sep 3 17:35:14 2013 +0200

    Cleaning migration folder + doc.

commit 9d63d9cf3d6e0d8fc0a2e27eb136e06e9c4ff01a
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Sep 3 17:14:10 2013 +0200

    change the assert equals value to content or statuscode

commit 461c6eb7807e6d8ef53e230e4a65c7684e48ccd5
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Sep 3 17:10:56 2013 +0200

    Update bog plugin

commit 7a9f9d8232bc66dafd4413c8046863b364f545fe
Merge: 4ed5cd8 fb829cc
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Sep 3 16:56:06 2013 +0200

    Merge remote-tracking branch 'upstream/master' into improving-custom-action

commit 4ed5cd890d1168b94831c216965a95f64184bce0
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Sep 3 16:54:18 2013 +0200

    Intermediate commit (still need ws export/import fixes and voter tests)

commit fb829cc34b1a18989edbc59f23236d41b8b84aad
Merge: af3b649 972b0bf
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Sep 3 07:53:00 2013 -0700

    Merge pull request #242 from solispauwels/GUI

    bug fix in data fixture

commit 972b0bf24771f5a1b9ada4f301eb4bf7ebe6ad7c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Sep 3 16:33:08 2013 +0200

    bug fix

commit af3b649b592387f01e7417b3fdcc7df5e44cc32b
Merge: fe0d141 7141eec
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Sep 3 06:05:39 2013 -0700

    Merge pull request #241 from solispauwels/GUI

    Themes update & Theme generator to bootstrap3

commit 2efd8a957454ab50899f4140b6504c7163f56609
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Sep 3 15:03:37 2013 +0200

    Removing childType and childAction and adding isDisplayedinAdmin and isDisplayedInWorkspace

commit 2b45ac618dd167571c228039938f5af500ad35f1
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Sep 3 14:59:59 2013 +0200

    Move some translation text to translation log file

commit 7141eec3dfe42a3d1d772bed81959738af2f36a7
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Sep 3 14:48:19 2013 +0200

    Theme Generator update (move some files)

commit bff673b3e93fb01e48e3e5e884c41fdf2b3bf231
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Sep 3 14:19:21 2013 +0200

    Themes update & Theme generator to bootstrap3

commit fe0d141caec59d277a2c2bed975fe44bdf964518
Merge: 9558361 657baa1
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Sep 3 05:11:48 2013 -0700

    Merge pull request #240 from easy-es/input-search

    input search form : validate when "enter key " is pressed & previous result from the search

commit 657baa1a17959fb4dd140e1cb6f898746acddf12
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Sep 3 13:31:44 2013 +0200

    merged with master

commit ad8b1ceb5c6c647a6b156e033ccb816eb1272d85
Merge: 6828919 9558361
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Sep 3 13:27:38 2013 +0200

    Merge remote-tracking branch 'upstream/master' into input-search

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/roles/workspaceUsers.html.twig

commit 6828919216f80dfff80d3bbf28cdcc4abfbfa2fd
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Sep 3 13:20:08 2013 +0200

    icap restore upgrade

commit 17caac523d47f93f15b9f01be4c70c025324e0d8
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Sep 3 09:43:18 2013 +0200

    close #218

commit 9558361f182b2755de45685bc36e25fb9391712a
Merge: 0f665a0 23e210c
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Sep 2 07:54:35 2013 -0700

    Merge pull request #238 from ngodfraind/bugfix

    Various bugfixes (closes #237, closes #236, closes #233)

commit b29b381ffef51383e1d7d9c7d5256d2df94cfa28
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Sep 2 16:10:06 2013 +0200

    Removing a useless semi colon.

commit 23e210c7d27cd20cb8f74747367879276b1a55d7
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Sep 2 16:00:24 2013 +0200

    Various bugfixes (closes #237, closes #236, closes #233)

commit 98b54734a4ac5251d49c307e69a0a16061b1431b
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Sep 2 13:51:51 2013 +0200

    Remove useless code

commit 221229d49e220522f8d553e2a62d91f9dfb1cba7
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Sep 2 13:51:32 2013 +0200

    Use log domain for trnalsation

commit edf33bccebc27dc558f4b9258db13431c6a10b69
Merge: 555d9e4 0f665a0
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Sep 2 13:27:14 2013 +0200

    Merge branch 'master' into log-event-improvement

commit 555d9e45c2d58856e838d8e90cbf3ad116c41ea3
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Sep 2 13:26:17 2013 +0200

    Rename attribute ed in eventDispatcher

commit 22b4a5c0b8e7502d17bdf43a45aed679c8025315
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Sep 2 11:09:42 2013 +0200

    Update blog plugin after correction

commit a9f141dd41ac830aeae8baf00582004adf0445af
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Sep 2 11:09:26 2013 +0200

    Comment code for childupdate action until modification for better management for custom log + correct namespace in test

commit fa2edd1e9cf95b6eb632319c2b3689d1d10fb6f8
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Sep 2 10:50:03 2013 +0200

    Update blog plugin with custom log

commit b5c4632b69210e99357ca4160b5fba5f4dfe2f38
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Sep 2 10:49:42 2013 +0200

    Readd all stuff for event tracking in the CoreBundle

commit 7483532ec3a4e05a1372ae5003978b707c5ff6c8
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Sep 2 10:45:31 2013 +0200

    Fixing forms

commit 0f665a0c5674c64bfa0b556d5e86a42afe75aef3
Merge: 38b69dd 3a3af48
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Sep 2 01:25:26 2013 -0700

    Merge pull request #232 from solispauwels/GUI

    Breadcrumbs update

commit 3a3af488b5650a5847e1d2863be4ea4de5838452
Merge: db439c5 38b69dd
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Sep 2 10:11:39 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into GUI

commit db439c50bd0088a2f520bb5488b60e2ea014509b
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Sep 2 10:09:11 2013 +0200

    GUI update (breadcrumbs update)

commit 967da60c2611f5d2282b8b384b382328585c1aea
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Sep 2 09:31:41 2013 +0200

    fetch upstream/master

commit 1a9815aa29ec16fd3c3399fb10a03b6a6a08914e
Merge: a6054c4 38b69dd
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Sep 2 09:30:53 2013 +0200

    Merge remote-tracking branch 'upstream/master'

commit 38b69dd2c655201197ae2c5ab64dec1e4a8906a7
Merge: 3849e56 2175ad2
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Aug 30 04:23:10 2013 -0700

    Merge pull request #231 from ngodfraind/bugfix

    Fixing testInsertBefore.

commit 2175ad241de832d2db97ecc846a88cf1d2e4a666
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Aug 30 12:15:26 2013 +0200

    Updating blogbundle

commit aefe683fe49f371144dc857087eba95c327a0c20
Merge: 7ce7c17 3849e56
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Aug 30 12:11:40 2013 +0200

    Merge remote-tracking branch 'upstream/master' into improving-custom-action

commit 02dd4c4c4d87410c770f718921238a7b2026763c
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Aug 30 12:06:08 2013 +0200

    Fixing testInsertBefore.

commit 7ce7c17807fd5562ce24a580e1d21229980d6313
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Aug 30 11:39:31 2013 +0200

    Updating database.

commit c2279fe3d32d4b906b2d71acb6793879de858f52
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Aug 30 11:05:55 2013 +0200

    Finished HomeTabs configuration

commit a607a647469a316caf27f18e596a9a397d6c191a
Merge: f779a97 3849e56
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 29 15:56:21 2013 +0200

    Merge branch 'master' into log-event-improvement

commit 3849e5640cdb23f8f48b578e17df0a8e7f18e9bd
Merge: a69f9db 0b70567
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Aug 29 06:01:53 2013 -0700

    Merge pull request #230 from Vaince/master

    Log listing boostrap 3 integration. Debug LogNotRepeatableInterface behavior

commit a69f9db7b809d82bf987469fdf23c6fa30db3ef5
Merge: 410817d bf290ef
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Aug 29 05:44:19 2013 -0700

    Merge pull request #229 from easy-es/calendar

    close #223

commit 0b705673f6adf8938ba041b4d3f916b6a9fbe9a8
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Aug 29 14:37:38 2013 +0200

    Remove miscellaneous

commit d9eac6bf4f229156267dd384955045ad9a86fc10
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Aug 29 14:32:17 2013 +0200

    Minor css change

commit 40f2d2f828ee14e722201cc774a5bd5d8fc12e21
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Aug 29 11:10:02 2013 +0200

    Log listing boostrap 3 integration. Debug LogNotRepeatableInterface behavior

commit 90e1e23b6785ad66a9f75987fbd6cd2ec09a5fa2
Merge: 5621fc5 410817d
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Aug 29 10:34:52 2013 +0200

    Merge remote-tracking branch 'upstream/master'

commit bf290efff2a9f172c42853966424dd4ef049654e
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Aug 29 09:13:13 2013 +0200

    close #223

commit 410817d3801900b986c8a6e13d251754c238e6a7
Merge: d6659e0 e9558e5
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Aug 28 23:58:56 2013 -0700

    Merge pull request #228 from easy-es/resource-properties

    close #221

commit e9558e59c2feb8aaf28e683c7b7cf3080defab35
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Aug 29 08:57:07 2013 +0200

    roll back language of the platform

commit 68d1af3f859ef360fe33492122785b0bfabf7629
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Aug 29 08:54:10 2013 +0200

    close #221

commit a6054c4fdf9a9a6b774265e5af33324db4557155
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Aug 29 08:27:20 2013 +0200

     synchro master

commit d6659e039bbcb00ff685818b24446cc6dcb4f083
Merge: 3359bf2 a650d35
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Aug 28 11:08:21 2013 -0700

    Merge pull request #220 from stefk/travis-config

    Changed sh calls

commit 3359bf23e0084067eef928753f7e788abfeb229a
Merge: 4458327 1774e25
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Aug 28 09:21:37 2013 -0700

    Merge pull request #226 from stefk/postgres-migration-fix

    Added constraint existence check in postgres migration

commit f779a975495c9a92207d53c512a41d070aaa0874
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 28 17:40:27 2013 +0200

    Update blog plugin after correction

commit 3c123c3ef3c433618292c046a33aa1310176ede6
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 28 17:31:41 2013 +0200

    Adding tracking event logs in blogBundle

commit b91cdaf209ce9cff72c17dcc215e896e2fc9fac5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Aug 28 17:01:46 2013 +0200

    GUI update

commit f8ba8f9636945408f9f1c5d661c28b6cee527675
Merge: 2989e2e 4458327
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Aug 28 17:00:04 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into GUI

commit 2989e2e8869b9400b6b8f93ce77190544cc2b276
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Aug 28 16:53:25 2013 +0200

    Breadcrumb block

commit 1774e25a26c09b65c2a05159f83c08360bc710ef
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 28 16:50:29 2013 +0200

    Added constraint existence check

commit 39239ea0fd133413698673e58e3487f05204535a
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 28 16:43:02 2013 +0200

    Remove commented code

commit fca270e705d9de1db6fcd4a3fe659fd57900d2f4
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 28 16:42:35 2013 +0200

    Adding raw filter to display html value

commit 1bf59a5dbdc8dd0c5689d0be64ed52fe93a2dc25
Merge: 1ef6ea9 0f9754e
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Aug 28 07:22:39 2013 -0700

    Merge pull request #225 from stefk/fixed-static-method

    Restored static keyword (+ type hinting)

commit 44583278f9f56888f380dc01b8eb39deacfddfb6
Merge: 943f468 6765c21
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Aug 28 07:22:39 2013 -0700

    Merge pull request #225 from stefk/fixed-static-method

    Restored static keyword (+ type hinting)

commit 0f9754e7d535d972a4e8060a1d802e281ddc4881
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 28 16:12:40 2013 +0200

    Restored static keyword

commit 6765c21ff469fb74604eae661b08b94b05fe4034
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 28 16:12:40 2013 +0200

    Restored static keyword

commit 1ef6ea99f48db32b9bf94bb4414c16b002c75059
Merge: b184e0c 31d8204
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Aug 28 06:58:02 2013 -0700

    Merge pull request #224 from solispauwels/GUI

    GUI update (top bar errors + impersonalitation gui improvements)

commit 943f4681b4420f3c9c6a2fafe61648febfeafcdb
Merge: ed9148d 5424848
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Aug 28 06:58:02 2013 -0700

    Merge pull request #224 from solispauwels/GUI

    GUI update (top bar errors + impersonalitation gui improvements)

commit 9185c40cb453f42a890c416482558c92134d82df
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Aug 28 15:40:07 2013 +0200

    Updated migrations files

commit b184e0c3b3d4d16684ba6c1659f33468c0d88c7c
Merge: 5fcc741 919fd96
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Aug 28 06:36:58 2013 -0700

    Merge pull request #217 from ngodfraind/bugfix

    Bugfix

commit ed9148de288605157bcc10a38da195b4feacb832
Merge: 45dc606 dcf09e5
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Aug 28 06:36:58 2013 -0700

    Merge pull request #217 from ngodfraind/bugfix

    Bugfix

commit 5fcc7413371988c83652a1cd1471d64f578cc857
Merge: c2d43d2 03648e8
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Aug 28 06:36:46 2013 -0700

    Merge pull request #178 from easy-es/calendar

     calendar partial fixing bugs

commit 45dc6068a2a2c7f6717e4a0ed85cf6ec11baa7ea
Merge: a5e7c39 a47da74
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Aug 28 06:36:46 2013 -0700

    Merge pull request #178 from easy-es/calendar

     calendar partial fixing bugs

commit 54248485f92d1390ca614ed32d0c8cd73c82a93a
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Aug 28 15:35:12 2013 +0200

    GUI update, top bar responsive size error

commit 31d82046ba007bc3d1df53ba6f37bf23a98df91c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Aug 28 15:35:12 2013 +0200

    GUI update, top bar responsive size error

commit a650d35c0f5ca386e87e2e7dddac49d20f61e4f5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 28 15:25:43 2013 +0200

    Fixed sed command

commit 3f3551870dea94f28d1c844344428d8c41b09279
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 28 15:18:15 2013 +0200

    Moved setup back to .travis.yml

commit 2540544f1ffa6cb3aacff08440f0074b45099940
Merge: b5cb0d1 a5e7c39
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Aug 28 15:17:45 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-125-widget-tabs

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Tool/desktop/home/configuration.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/home/home.html.twig

commit 5621fc5a178990255f7098606196f494cc5631ee
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Aug 28 15:04:09 2013 +0200

    Update ReferenceBundle

commit b5cb0d1b526267d1f368c63f705277f0b271286e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Aug 28 14:54:36 2013 +0200

    Added Home tab creation and configuration

commit b916b0099ab220eeae9e7f77f7cb1f9820bbd370
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 28 14:21:18 2013 +0200

    Fixed script name

commit a3b57c49498bbb4ffe1f0491439f0b2918171da7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 28 14:18:41 2013 +0200

    Changed script and script call

commit 5cdde4c6f40db74a8e95b9b6c4aa3ee17b4258ff
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 28 14:11:09 2013 +0200

    Changed script path

commit f8d222316c29e69e83a5b5b9dd19a857e3659bc9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 28 14:02:36 2013 +0200

    Added travis setup script

commit e67f6b8ebb19b5e0b24c2c3a559f6ba3b79b5444
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 28 13:48:44 2013 +0200

    Fixed syntax with sh -c

commit 470ad058bf3ea8d602c66d1d73de80327b0de75a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 28 13:39:09 2013 +0200

    Changed sh calls

commit 1ce7bad3cb693277290d699a87b102e2b7e467d4
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Aug 28 10:32:52 2013 +0200

    Fix role impersonalitation bar and add one for user impersonalitation too

commit f1af3be0669132b10929d688ef169eecbe730afe
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Aug 28 10:32:52 2013 +0200

    Fix role impersonalitation bar and add one for user impersonalitation too

commit 919fd969b6b5deb4359bbb3ce27855c54741f4e2
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Aug 28 08:55:51 2013 +0200

    Fixing RegistrationController checkAccess.

commit dcf09e5d54526a561dab683c58795988c50c7708
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Aug 28 08:55:51 2013 +0200

    Fixing RegistrationController checkAccess.

commit 099dbf2f8c7ef04e04e9b8ddc943a25d57b79394
Merge: c577f02 c2d43d2
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 17:43:50 2013 +0200

    Merge remote-tracking branch 'upstream/master' into bugfix

    Conflicts:
    	src/plugin/ICAP/BlogBundle

commit 0fb5cc736fec4f983485f71bea50ce1d7ec5ad83
Merge: 7c35b7d a5e7c39
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 17:43:50 2013 +0200

    Merge remote-tracking branch 'upstream/master' into bugfix

    Conflicts:
    	src/plugin/ICAP/BlogBundle

commit c577f02f1cbdc7a965b9df47374a0aedcbaf3183
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 17:38:21 2013 +0200

    Adding Assert\NotBlank and AbstractResource name.

commit 7c35b7ddd17c5d1509c30e9933261a9c42e72bd3
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 17:38:21 2013 +0200

    Adding Assert\NotBlank and AbstractResource name.

commit 5698dcaa946833141ec0c8ac6305db349f7aa9a1
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 17:30:42 2013 +0200

    The admin can't impersonate himself.

commit 48cb4cc1f6c6e727a270a921d9e577b5f8b5db55
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 17:30:42 2013 +0200

    The admin can't impersonate himself.

commit 713819ec1156c3d5c5fe76cef20df9e82637f62c
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 17:23:16 2013 +0200

    Fixing the resource creation form on form error for manager.js

commit 8312929e337f10b22d12b3cf0d101cbf883f3ba5
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 17:23:16 2013 +0200

    Fixing the resource creation form on form error for manager.js

commit cd48455e143903e03c07974ec747ee300c9de2cd
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Aug 27 17:16:24 2013 +0200

    Update doc with event tracking system

commit a47da743924bf580db1eba235afb358db9651362
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Aug 27 16:50:43 2013 +0200

    fixed bug

commit 03648e86c285f0d789a746f3406befff47276762
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Aug 27 16:50:43 2013 +0200

    fixed bug

commit 2294efd5eeed20563368d6e2f2da4f15427ea4c8
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 16:35:00 2013 +0200

    Fixing HomeControllerTest

commit 594b732e3ca5ab4d6733664827b825a19f2ef8ea
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 16:35:00 2013 +0200

    Fixing HomeControllerTest

commit ea918e6563c475546847fe4966c458aa253a7979
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Aug 27 16:30:44 2013 +0200

    Change Event\Event namespace to just Event + adding section on logs in doc

commit 9e7c0fe8a8bce38d883a4115a1c4ae21667cdc54
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 16:25:59 2013 +0200

    Updating profiles.

commit aa66235a302d0b964aa0d6afc466bd8059fe2cda
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 16:25:59 2013 +0200

    Updating profiles.

commit c2d43d213e1a38146a2bfbb44fc82e74416bf51e
Merge: c6c5d61 9c65d76
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Aug 27 06:53:59 2013 -0700

    Merge pull request #215 from maxailloud/update-blog-plugin

    Update blog plugin + correct translation for month

commit a5e7c3905e679ef912ebf936dbb5ffb2923ac578
Merge: 5805075 8b4f901
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Aug 27 06:53:59 2013 -0700

    Merge pull request #215 from maxailloud/update-blog-plugin

    Update blog plugin + correct translation for month

commit aef0889dfd1cef891415d8c146a8768379e8f4ac
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Aug 27 15:53:47 2013 +0200

    checkstyle

commit c6e7b18391e3a0a9f01cc4784f6c17ef91906a6c
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Aug 27 15:53:47 2013 +0200

    checkstyle

commit 5e9192aa4d63f412e797708f35ed2d0dc8b675fa
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 15:49:39 2013 +0200

    Fixing an "insert before" bug.

commit ee83ba9b63015615217b4cbe66e67782acdfafbb
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 15:49:39 2013 +0200

    Fixing an "insert before" bug.

commit 8a72108afaab854c762be1253c20b59b46b71060
Merge: 346b77b 5805075
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Aug 27 15:45:40 2013 +0200

    Merge remote-tracking branch 'upstream/master' into calendar

    Conflicts:
    	src/plugin/ICAP/BlogBundle

commit 36e90e097128a6c8c01a04989c79dc96a8e0d492
Merge: 668f97e c6c5d61
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Aug 27 15:45:40 2013 +0200

    Merge remote-tracking branch 'upstream/master' into calendar

    Conflicts:
    	src/plugin/ICAP/BlogBundle

commit 346b77b33a37f7b6a538b42deacb0fe9542d08fb
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Aug 27 15:35:06 2013 +0200

    stable agenda

commit 668f97e59394dcb718a39aa7c9e14a470fcef243
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Aug 27 15:35:06 2013 +0200

    stable agenda

commit 5805075039501bd1d9f7e6f938109f40f0507522
Merge: 3b6d635 857b0f6
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Aug 27 06:23:29 2013 -0700

    Merge pull request #214 from solispauwels/GUI

    GUI update

commit 9c65d7694da2406d17f9bae5bd1d455c918651c7
Merge: 950cce6 ff1b653
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Aug 27 15:06:58 2013 +0200

    Merge branch 'master' into update-blog-plugin

commit 8b4f901345068a5e7f2e184762f76c05b070d910
Merge: 535a55a 3b6d635
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Aug 27 15:06:58 2013 +0200

    Merge branch 'master' into update-blog-plugin

commit 535a55a36ec7b39627180802aa6ecf750e6e113b
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Aug 27 15:06:22 2013 +0200

    Update blog plugin with new design of tree according to bootstrap3

commit 857b0f6d454b0bd076b38fcf4843743060760f33
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 27 15:05:17 2013 +0200

    submodule update

commit c6c5d6112cb073e73db7ef5dce4f87a53912b7e3
Merge: 4c58c36 ff1b653
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 27 15:02:02 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into GUI

commit 40d7b02637afcc5d8488df694f3c00a62dd5ea42
Merge: f2eacdf 3b6d635
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 27 15:02:02 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into GUI

commit 3b6d635ad1f99b0dc502253bb1fe9982813770ea
Merge: 9e912f7 b1e22b8
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Aug 27 05:59:30 2013 -0700

    Merge pull request #213 from ngodfraind/bugfix

    Bugfix

commit 4c58c36c814f7ccb043e485ac0100ad3058b45ef
Merge: 24748fa 14db76f
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 27 14:47:35 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into GUI

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Profile/profile.html.twig

commit f2eacdfd01fa2f8a6865a78a5fed3fd7d2755950
Merge: 7857bb3 9e912f7
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 27 14:47:35 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into GUI

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Profile/profile.html.twig

commit 24748fa2f8c48c6a9f4205d3a269b25db0a80811
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 27 14:42:10 2013 +0200

    GUI update

commit 7857bb345ed5dfd7fc6a083782b7335fba0bdb74
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 27 14:42:10 2013 +0200

    GUI update

commit 9e912f79a0391dba32fd7c37bfd14e755c9b5cd0
Merge: cdeec11 28ea139
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Aug 27 05:28:41 2013 -0700

    Merge pull request #212 from maxailloud/update-blog-plugin

    Update blog plugin with new design with bootstrap3

commit b1e22b8c4dead2662f764c659cfbec979280e97c
Merge: 70c7f2c 9e912f7
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 14:28:21 2013 +0200

    Merge remote-tracking branch 'upstream/master' into bugfix

commit ff1b65339e2ccb50d7b2d50fd64858d8ff311f15
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 14:09:45 2013 +0200

    adding a todo + updating plugins.

commit 70c7f2cc5503e927a7bfaaa5a22c4cabcb86cc48
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 14:09:45 2013 +0200

    adding a todo + updating plugins.

commit d06f1108affd502c8807c538c55b4859ef7c81bf
Merge: 5004448 14db76f
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 14:01:13 2013 +0200

    Merge remote-tracking branch 'upstream/master' into bugfix

commit 9da1980ab298d6aa35289b901f05a51b9356b013
Merge: a069f84 cdeec11
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 14:01:13 2013 +0200

    Merge remote-tracking branch 'upstream/master' into bugfix

commit 500444889e6b0a72267c95446a173ee1ceef59a7
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 13:57:38 2013 +0200

    new params for tool configuration: is_configurable_in_workspace & is_configurable_in_desktop (will replace hasOptions)

commit a069f84b7cea320e6fbc059eae9217ab11e25e3d
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 13:57:38 2013 +0200

    new params for tool configuration: is_configurable_in_workspace & is_configurable_in_desktop (will replace hasOptions)

commit 950cce6fa3041dcf4681c0ba27080ada425cea26
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Aug 27 13:32:49 2013 +0200

    Correct translation for months

commit 79f5541fe0dcef5bbca279a11370b9afb71e4625
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Aug 27 13:32:49 2013 +0200

    Correct translation for months

commit 28ea13919c19f868af5ed713eebb4755804f2449
Merge: 0c44259 cdeec11
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Aug 27 13:26:30 2013 +0200

    Merge branch 'master' into update-blog-plugin

    Conflicts:
    	src/plugin/ICAP/BlogBundle

commit 0c442590b755c8ee0d53c0a52b39e4022cad5c16
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Aug 27 13:24:43 2013 +0200

    Update blog plugin

commit 9ab70a09ffdcc940498e25c8488301b7f80aa9c9
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 13:19:16 2013 +0200

    Fixing a translation.

commit 0a8b0f8a124918c4b035ee8ca017efd042c01cef
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 13:19:16 2013 +0200

    Fixing a translation.

commit 492bf51e8c76f80d24c71a918fa1095168050f43
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 13:10:22 2013 +0200

    Check access for message show.

commit 51e33ef91a921dfee15f604a4c77da6eff273d1b
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 13:10:22 2013 +0200

    Check access for message show.

commit cdeec11b1d4c70c6c4db506c93a2cb996d61955e
Merge: 006d8a8 a54126a
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Aug 27 03:19:35 2013 -0700

    Merge pull request #211 from easy-es/forgot-password

    close #197

commit 14db76f892e25803d67d967a560439117a51af8a
Merge: be8d968 813b193
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Aug 27 03:19:35 2013 -0700

    Merge pull request #211 from easy-es/forgot-password

    close #197

commit 006d8a8c75485cb371e413458a216d0f16592d80
Merge: d1f5383 90903e1
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Aug 27 03:19:17 2013 -0700

    Merge pull request #210 from ngodfraind/bugfix

    Bugfix

commit be8d968e7399312df603428e5e4f92bc59cdb723
Merge: 42cb927 b82d838
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Aug 27 03:19:17 2013 -0700

    Merge pull request #210 from ngodfraind/bugfix

    Bugfix

commit b997fd9eee57981565a7e3b547c6846715fbae16
Merge: 8dbeb9d d1f5383
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 27 12:01:14 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-125-widget-tabs

commit 8dbeb9d6651df5dfbace741316cdbae3ca6fb1fd
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 27 12:00:43 2013 +0200

    Allowed creation of home tabs

commit a54126acdb7cca21036d1c1d6e1313abdd4adb9f
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Aug 27 11:51:52 2013 +0200

    fixed bug

commit 813b1932032e2c32e981d55561f608fc28832d16
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Aug 27 11:51:52 2013 +0200

    fixed bug

commit d1be455a90d25dd81bb53ba5cae3302efd1180a5
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Aug 27 11:49:31 2013 +0200

    change Twig Class

commit f8be584b4535180f3418ec1cb0b6513fe553b027
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Aug 27 11:49:31 2013 +0200

    change Twig Class

commit 9ad825bdb2abc712abbd2ae1a64a0e8b5c79585f
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Aug 27 11:46:56 2013 +0200

    delete renderemailTwigAction()

commit 86d6a0f3ed8485e7f6d0b52b285487ac293831d3
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Aug 27 11:46:56 2013 +0200

    delete renderemailTwigAction()

commit b141cd7b632e7be6bdbbb85a89e26f7172a6de20
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Aug 27 11:41:12 2013 +0200

    Update blog plugin with new design with bootstrap3

commit 2b560c3fdc5b92e09c7d75e092ffc7cfb59e86b9
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Aug 27 11:25:33 2013 +0200

    close #197

commit e7e7bfd3cb359b84eff250dec6ed53f5078758a0
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Aug 27 11:25:33 2013 +0200

    close #197

commit b82d838fbd1a7f8fa6f4f90bbb71ddfb61851629
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 11:17:21 2013 +0200

    Fixing resource picker for messages.

commit 90903e1fa47cdc0e36bcdae61bf4da1ef265d3ba
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 11:17:21 2013 +0200

    Fixing resource picker for messages.

commit 02fb9adb3234ee138d248f03e9aa6abe1e636748
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 09:15:17 2013 +0200

    Fixing AdministrationControllerTest

commit 8573f262271ca65562427317dcb8ff70ef8ac8ba
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 09:15:17 2013 +0200

    Fixing AdministrationControllerTest

commit b0e8c9fac4a0fd43f89fa423edf499f86c5abcec
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 09:11:07 2013 +0200

    Messages interface refactoring.

commit 77827323a84a2525ddcae161b844198023479e83
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 27 09:11:07 2013 +0200

    Messages interface refactoring.

commit d1f538389c218f66f063bb13ee14235848f97a64
Merge: 8056c83 30e0231
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Aug 26 23:33:19 2013 -0700

    Merge pull request #208 from ngodfraind/bugfix

    Fixing table modal.

commit 42cb9270a0447baf19227ee3fcba9459e946b114
Merge: 1ba791f 00910e0
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Aug 26 23:33:19 2013 -0700

    Merge pull request #208 from ngodfraind/bugfix

    Fixing table modal.

commit 8056c830eae01c19612826174e7ca25a22df43b0
Merge: da05d61 80d90fe
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Aug 26 23:32:56 2013 -0700

    Merge pull request #209 from maxailloud/bootstrap3_badge

    Update design for badge pages with bootstrap3

commit 1ba791f154c9fe2b821b1b762eb82968ae547a46
Merge: bab302a 5caf26c
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 17:07:02 2013 +0200

    Merge branch 'master' into bootstrap3_badge

commit 80d90fe9308d1f04918b43e43ad1f823da941880
Merge: ce8de46 e83ca9c
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 17:07:02 2013 +0200

    Merge branch 'master' into bootstrap3_badge

commit 5caf26cf7f6f643506740c392c2888cb2bed2232
Merge: ecf65ff dc3b382
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 17:06:27 2013 +0200

    Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	src/core/Claroline/CoreBundle/Repository/UserRepository.php

commit e83ca9cd7647c465b2584c0021ee36dcb615cdd2
Merge: d188ba6 da05d61
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 17:06:27 2013 +0200

    Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	src/core/Claroline/CoreBundle/Repository/UserRepository.php

commit bab302a26e5da666f0430e51d7fb83db13daf0b5
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 17:01:12 2013 +0200

    Update design for badge pages with bootstrap3

commit ce8de46ff79e1af9c94a10304ec66a699f15041f
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 17:01:12 2013 +0200

    Update design for badge pages with bootstrap3

commit 00910e0167cdfa475279e51c3408e65011616fb0
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 16:14:53 2013 +0200

    Fixing table modal.

commit 30e02319c1b8201b8fc9abd29ef7dd3b16de44db
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 16:14:53 2013 +0200

    Fixing table modal.

commit 6bfe9002ef37904e5e1f08a5dfd43a2ca910d05f
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 16:12:08 2013 +0200

    Adding breadcrumb in view/edit page

commit da05d6151709d1207d1b17e84c8823f9fc8f0cf8
Merge: 23f1282 f688ac0
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Aug 26 07:05:02 2013 -0700

    Merge pull request #206 from ngodfraind/bugfix

    Bugfix

commit 60a4ccadc4bcf4ffb9dbefdc3921d34d6552b2a0
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 16:01:18 2013 +0200

    Update simpleautocomplete field form to bootstrap3

commit f0bbf5c71fe0004d61437c0a646d08d1b4871f44
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 16:01:18 2013 +0200

    Update simpleautocomplete field form to bootstrap3

commit dc3b382e0e86a80747d6f55b048c3f2046b8d65a
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 15:47:47 2013 +0200

    Fixing some tests.

commit f688ac001e6d138733efaa18ba0f63e158deb88a
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 15:47:47 2013 +0200

    Fixing some tests.

commit 9940b90c50cdfa230a3ba723b90cac5f6bb9a6a1
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 15:43:24 2013 +0200

    Doc for lipsum

commit 63b1f2bfec27e47ce4164f80a84fd01fb38b0ebb
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 15:43:24 2013 +0200

    Doc for lipsum

commit 1c15cf9d597bba7c750769899d872015bd547d6c
Merge: 208e810 35ec61f
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 15:40:12 2013 +0200

    Merge remote-tracking branch 'upstream/master' into bugfix

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/manager.js
    	src/core/Claroline/CoreBundle/Resources/views/Resource/multipleRightsPage.html.twig

commit b7fc74429b46e520d0b5e5ea1aa916319f3fd6b9
Merge: f865c55 23f1282
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 15:40:12 2013 +0200

    Merge remote-tracking branch 'upstream/master' into bugfix

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/manager.js
    	src/core/Claroline/CoreBundle/Resources/views/Resource/multipleRightsPage.html.twig

commit 208e810b2f371f335a00435b5a10e52878ea909a
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 15:26:11 2013 +0200

    XmlResponse for authentication and registration.

commit f865c5517712cb71e5112b7c40faf63f62e56838
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 15:26:11 2013 +0200

    XmlResponse for authentication and registration.

commit f083379c6c5be5092c9a7d8e24730916a58ca7b1
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 15:20:22 2013 +0200

    Adding breadcrumb in the interface

commit 23f1282e4e82e5c95a0a1a54fa8b5a933e0395e8
Merge: eab208c c241842
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Aug 26 05:55:17 2013 -0700

    Merge pull request #207 from Vaince/master

    Debug drag'n drop upload with bootstrap 3

commit 35ec61f4c5cb961078aa1b46d527473b54406c6f
Merge: 83cf889 c9ef526
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Aug 26 05:55:17 2013 -0700

    Merge pull request #207 from Vaince/master

    Debug drag'n drop upload with bootstrap 3

commit eab208c472ea483f39d2e018d66f7203b1d14b14
Merge: edd5c2a b62ed12
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Aug 26 05:48:26 2013 -0700

    Merge pull request #205 from kitan1982/issue-126-announcements

    Issue 126 announcements

commit c24184246d007d6e0d0c3173b1671729eb0e386f
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Aug 26 14:31:02 2013 +0200

    Debug drag'n drop upload with bootstrap 3

commit c9ef526b24f7506be23d6ccb889b9339a005fb8b
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Aug 26 14:31:02 2013 +0200

    Debug drag'n drop upload with bootstrap 3

commit 1467dbfa0fa8a73dcb16012a71dc1995026a4223
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 14:27:31 2013 +0200

    Add panel-heading to all pages for badge admin

commit 2af3997d42814c9127d8da86106a8e26e4b8fb27
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 14:06:54 2013 +0200

    Update badge list in admin with bootstrap3

commit c8fd9b002e2d0ccdef6bfa3b568e026b928a5ef5
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 13:46:53 2013 +0200

    Updating lorem ipsum generation (max char size)

commit 358d5d00fc47adf81ee1a2585087180b3edac97f
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 13:46:53 2013 +0200

    Updating lorem ipsum generation (max char size)

commit 321a49c9aca55c7bc8e18e281609509ce4a59d9f
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 11:58:29 2013 +0200

    Adding missing translation + remove useless css

commit 3026d8d8c880f6783f0a2df7a70bc7a19e2f81cd
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 11:51:46 2013 +0200

    Refactoring messagery layout (draft)

commit 63d99d44afd69e771f684c2253db51949d7bc994
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 11:51:46 2013 +0200

    Refactoring messagery layout (draft)

commit bb7f3e9f1bd55bd89b51229ee9fe9704088e317b
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 11:40:11 2013 +0200

    Update date-picker to fit bootstrap3, js doesn't work but hey we got bootstrap3

commit 72759e79f8fe591f6d4de21284b8bbe441f5a7c2
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 11:40:11 2013 +0200

    Update date-picker to fit bootstrap3, js doesn't work but hey we got bootstrap3

commit bb3de003a0bbf86e2daa0f8809d91f8b648c42cf
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 11:39:02 2013 +0200

    Adding options to form for date field

commit a5b4fa0d0c5c345b6f9f1fb02277c546f486a8f4
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 11:38:42 2013 +0200

    Update date form format

commit 98b51f426954deb49085c83b88ea4ffd0928b8bf
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 11:38:42 2013 +0200

    Update date form format

commit dfaec735e4550f7a8ce178c7017b3872238a95c7
Merge: 2600cf5 edd5c2a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 26 11:14:47 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-125-widget-tabs

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Administration/layout.html.twig

commit 83cf8895c677c18e82de8a307f6367f9489ce58a
Merge: 3354aa7 6c558aa
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 26 10:51:05 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-126-announcements

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml

commit b62ed12526280c9f7c698a28602a5658c12f90c1
Merge: 08ae125 edd5c2a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 26 10:51:05 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-126-announcements

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml

commit 08ae1257184695fea562f3e286d35262f0cb7f25
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 26 10:45:12 2013 +0200

    Closes #126

commit 62687e4ced63d026bc821c032f052843b0881d60
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Aug 26 10:43:31 2013 +0200

    agenda stable version + partial tests

commit 9952f324b4b2d07b84f14d8045e9044eded319c1
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Aug 26 10:43:31 2013 +0200

    agenda stable version + partial tests

commit ad91fbd683471bac0413b1c058222639378a6bc9
Merge: 877d71c 6c558aa
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 10:41:01 2013 +0200

    Merge remote-tracking branch 'upstream/master' into bugfix

commit c894ad7ccb98648b709f988a39a9feca82bbb33b
Merge: 9f3ca7c edd5c2a
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 10:41:01 2013 +0200

    Merge remote-tracking branch 'upstream/master' into bugfix

commit 517d8957359402e5f051d8750e3108c62b9b259c
Merge: 85f2d35 edd5c2a
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Aug 26 10:39:52 2013 +0200

    Merge remote-tracking branch 'upstream/master' into calendar

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Tool/desktop/agenda/agenda.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/agenda/agenda.html.twig

commit e00d70d20aef8e5b8785052f1867fa048a57f8b9
Merge: 107881e 6c558aa
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Aug 26 10:39:52 2013 +0200

    Merge remote-tracking branch 'upstream/master' into calendar

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Tool/desktop/agenda/agenda.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/agenda/agenda.html.twig

commit 877d71c36937b2da9dd8ba6eed1b1fd43b6e816f
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 10:38:44 2013 +0200

    Fixing claro_resource_custom route

commit 9f3ca7cadde2a86b041bee970eb9110d87f696a7
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 10:38:44 2013 +0200

    Fixing claro_resource_custom route

commit 85f2d35226e4c611368d83d069159c9a76dbe98a
Merge: cd4303e d3453b2
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Aug 26 10:35:02 2013 +0200

    Merge remote-tracking branch 'upstream/master' into calendar

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Tool/desktop/agenda/agenda.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/agenda/agenda.html.twig
    	src/plugin/ICAP/BlogBundle

commit 107881ed5be7101c6b9719c8406a79fcb134a13d
Merge: 7f6b964 90210ca
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Aug 26 10:35:02 2013 +0200

    Merge remote-tracking branch 'upstream/master' into calendar

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Tool/desktop/agenda/agenda.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/agenda/agenda.html.twig
    	src/plugin/ICAP/BlogBundle

commit b0218c38ce39c7cd4bb66d6340c0bd5ba41a5508
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 10:32:33 2013 +0200

    Update award form with boostrap3

commit 4e51345f6a5351e09cee6f990a42c1d061739681
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 10:31:21 2013 +0200

    Update composer.lock with new version of frontEnBundle for new version of confirm-boostrap (+ other update of vendors)

commit 179ef6931e18f28885d76091095501f7f256ceae
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 10:30:52 2013 +0200

    Fixing a bug happening in testFindRoleByWorkspaceAction

commit 7783072754362e4959807d04bdac5793848ebff1
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 10:30:52 2013 +0200

    Fixing a bug happening in testFindRoleByWorkspaceAction

commit 07039e802e293e2c36aeab69a5a800a3ad8b0520
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 10:27:56 2013 +0200

    Resource rights form are now usable (gui and redirection still needs rework)

commit 08b34de15a7a30bf038bc996ddea0e68497e969f
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 26 10:27:56 2013 +0200

    Resource rights form are now usable (gui and redirection still needs rework)

commit 353223dd887c986f036743a62de8afe7f42a0dd6
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 26 10:08:40 2013 +0200

    deleted src/plugin/Claroline/AnnouncementBundle

commit 3ed3b30c516e3fbf6f6ef5080001a6ba53b6f285
Merge: f70c822 6c558aa
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Aug 26 09:53:21 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into GUI

commit eea63c095266bacd8827eff3d8a88717cc0f5857
Merge: b1b9f35 edd5c2a
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Aug 26 09:53:21 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into GUI

commit f70c8229cb1d725596143fc62d2bfcebf976adf2
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Aug 26 09:48:33 2013 +0200

    GUI update

commit b1b9f3569839ca349b01ea3f66c0bc01614f4208
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Aug 26 09:48:33 2013 +0200

    GUI update

commit 3354aa744fe5c325b8a84a927092795c85c34b7a
Merge: 5b2efea e67b4b2
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 26 09:43:45 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-126-announcements

    Conflicts:
    	composer.lock
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/manager.js
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Activity/index.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Resource/multipleRightsPage.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/resource_manager/resourcesRights.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Workspace/layout.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/macros.html.twig
    	src/plugin/Claroline/AnnouncementBundle

commit 1bfadd7b54ba8ece7748fa8970dfa6e18115b16a
Merge: 3d638fb ba8ce6d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 26 09:43:45 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-126-announcements

    Conflicts:
    	composer.lock
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/manager.js
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Activity/index.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Resource/multipleRightsPage.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/resource_manager/resourcesRights.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Workspace/layout.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/macros.html.twig
    	src/plugin/Claroline/AnnouncementBundle

commit 105627343f8f3cb2d82f00bee5aa4a5dc9cec358
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 09:19:17 2013 +0200

    Change title form award form

commit b56af8eba5a45c6a4d6ba762026718856ba66006
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 09:17:09 2013 +0200

    Correct translation + correct displaying/hidding award form + removing link on badge image

commit edd5c2a28ed2a5e9cd7963f204fd377de857237d
Merge: ba8ce6d 61a0a3a
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Aug 26 00:13:07 2013 -0700

    Merge pull request #203 from kitan1982/user-csv-bug-fix

    User csv bug fix

commit ecf65ff53815babc421552d6e45b1ee6455a05ab
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 08:53:28 2013 +0200

    Correct/add method for using idciExporter with group and user

commit d188ba66e73b4fc6c4e9c5c58cb6ffcc522d3eb2
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 26 08:53:28 2013 +0200

    Correct/add method for using idciExporter with group and user

commit 6c558aa155abea5ccec89c132f9eaea6bd1a2ce4
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 26 08:52:31 2013 +0200

    checkstyle

commit 61a0a3a582e793410a1731a24a140ae70d44da6d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 26 08:52:31 2013 +0200

    checkstyle

commit a6da8c108b6c383ce89b9c7cd70a36fe1163af8e
Merge: 12cf349 e67b4b2
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 26 08:46:40 2013 +0200

    Merge remote-tracking branch 'upstream/master' into user-csv-bug-fix

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml

commit 0685c2e412f3fba3742d72d93c222dfcdb98fe15
Merge: f72d9e4 ba8ce6d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 26 08:46:40 2013 +0200

    Merge remote-tracking branch 'upstream/master' into user-csv-bug-fix

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml

commit e67b4b269ea46ebf62af3a5d1597d10c0f472dc9
Merge: 7356c55 87cf47a
Author: stefk <stephaneklein221@gmail.com>
Date:   Sun Aug 25 23:44:12 2013 -0700

    Merge pull request #202 from solispauwels/GUI

    GUI update

commit ba8ce6d1552b15af2f4e63b85ee43b94c2df01dd
Merge: bc671eb 84e8b41
Author: stefk <stephaneklein221@gmail.com>
Date:   Sun Aug 25 23:44:12 2013 -0700

    Merge pull request #202 from solispauwels/GUI

    GUI update

commit bc671eb0f629ff2155f1f4bcccd0d490891961f0
Merge: d3453b2 e98591c
Author: stefk <stephaneklein221@gmail.com>
Date:   Sun Aug 25 23:43:23 2013 -0700

    Merge pull request #201 from maxailloud/master

    Correct regression from incorrect merge

commit 12cf349b2e9f3ff70616face53ba2291e8aa46a4
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 26 08:42:28 2013 +0200

    Fixed users import test

commit f72d9e4f04cb8a39e53ca1167fa5f4e132742d98
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 26 08:42:28 2013 +0200

    Fixed users import test

commit 7356c55884efdac9adb7a224fe2f5aabcf9e0e4c
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 17:40:51 2013 +0200

    Readd variable format to simpleautocomplete field form

commit e98591c338635edeb677ce82d9f5bac442613af2
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 17:40:51 2013 +0200

    Readd variable format to simpleautocomplete field form

commit b5d7663ae21d7cf798186ddbe223f9e7fb0c1632
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 17:09:37 2013 +0200

    Correct flash_message style for error message, danger now and not error anymore

commit 7e864f1d458fde182bb7ada5ba06c182c1837edf
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 17:09:37 2013 +0200

    Correct flash_message style for error message, danger now and not error anymore

commit 2b4094201e2d4b30c9464f0e3eb17fb06d66f6b4
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 17:01:17 2013 +0200

    Readd translation

commit c1eb38932960b5bde62b74e3b02b33ad565c3154
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 17:01:17 2013 +0200

    Readd translation

commit 9e642fd6f4c2ff8257584f28b8d0f20da2001c52
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 16:40:18 2013 +0200

    Re-adding link to badge admin in menu + correct strict dispatcher name in logController + correct simpleautocomplete template after merge

commit d3906813bf10bd8f4a2942f9e01ff66f40cc37a5
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 16:40:18 2013 +0200

    Re-adding link to badge admin in menu + correct strict dispatcher name in logController + correct simpleautocomplete template after merge

commit 98380fc22df34321e5b8d182db2676fd62c160e3
Merge: 8078573 90210ca
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 16:11:06 2013 +0200

    Merge remote-tracking branch 'upstream/master'

commit 56c416939681d83b34ec53f1414ebc0a13eb6ca6
Merge: 6e17e9e d3453b2
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 16:11:06 2013 +0200

    Merge remote-tracking branch 'upstream/master'

commit 807857391677f12db8c01f241d487191b2247867
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 16:10:12 2013 +0200

    Reorganize topbar and correct it

commit 6e17e9e8b989d0256f4afe8a53baa1fe0f093861
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 16:10:12 2013 +0200

    Reorganize topbar and correct it

commit 87cf47a8b03819e225b448d1e28315c0c0b933d3
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 16:01:57 2013 +0200

    change responsive sizing (col-md-* instead of col-lg-*)

commit 84e8b41ae951f8fbd79d1988c9eaffd79676d4e1
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 16:01:57 2013 +0200

    change responsive sizing (col-md-* instead of col-lg-*)

commit 670ec3f0072b3c1316154f69f899fd2bb76a110c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Aug 23 15:56:30 2013 +0200

    Closes #190

commit 9d531bf38fb19f491c7f85abc90ff5fcbb931aba
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Aug 23 15:56:30 2013 +0200

    Closes #190

commit 9421f0c890c9c52365ee7545e8dd8f1cd9e6e506
Merge: 990dcba 90210ca
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Aug 23 15:48:17 2013 +0200

    Merge remote-tracking branch 'upstream/master' into user-csv-bug-fix

commit c5b5d19f99dc1d4a4d5189b500b4e5eaaa987976
Merge: 7cda85d d3453b2
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Aug 23 15:48:17 2013 +0200

    Merge remote-tracking branch 'upstream/master' into user-csv-bug-fix

commit 990dcbab4e0395b6a6618b9e975f2384cef32dab
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Aug 23 15:46:44 2013 +0200

    Added explanation for users import

commit 7cda85d72df259b888992c1d3d8d31eb48f13f69
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Aug 23 15:46:44 2013 +0200

    Added explanation for users import

commit cd4303ed0868cda55de8d65c507f331a43ce00d7
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Aug 23 15:36:33 2013 +0200

    stable version of the agenda

commit 7f6b9647a732f3ebb5bdd0039ab38c1ab057a82b
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Aug 23 15:36:33 2013 +0200

    stable version of the agenda

commit d3453b2f4595b4a263cafc9ce2e9f819a5fbd047
Merge: b700a4f 50ee305
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Aug 23 06:32:23 2013 -0700

    Merge pull request #200 from ngodfraind/bugfix

    Fixing checkstyle for dnd.js

commit 90210ca085ce4e8639259aab300c23cf8427333c
Merge: 6a59ce4 10e121c
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Aug 23 06:32:23 2013 -0700

    Merge pull request #200 from ngodfraind/bugfix

    Fixing checkstyle for dnd.js

commit 10e121c814db94b098994bc0517d5b9460b34bd1
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Aug 23 15:20:09 2013 +0200

    Fixing RegistrationControllerTest

commit 50ee305024722b7e3303c2170d33b67c4fce37fd
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Aug 23 15:20:09 2013 +0200

    Fixing RegistrationControllerTest

commit ee3572b6214dfb4315c39848c3d2e5b9e93d0625
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Aug 23 15:17:20 2013 +0200

    dnd.js => dragndrop.js

commit 41ae8f9bf78750f79f7908bd135e686ad7fd2527
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Aug 23 15:17:20 2013 +0200

    dnd.js => dragndrop.js

commit e2e5f14857b008013205be76ecda3bd097997111
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Aug 23 15:10:04 2013 +0200

    Fixing checkstyle for dnd.js

commit e16136c7f7fc10e294e399ab8417470c9c8675de
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Aug 23 15:10:04 2013 +0200

    Fixing checkstyle for dnd.js

commit b700a4fe2eb759ce2297963ef48fbb470e0cc49b
Merge: 566f334 9994883
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Aug 23 06:05:06 2013 -0700

    Merge pull request #199 from maxailloud/master

    Correcting coding style

commit 4491c8a651f800f821addcac32564c2e9082fe7c
Merge: 81b5938 87d083e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 14:50:47 2013 +0200

    Merge branch 'bootstrap3' into GUI

commit 0294a6d2b563e1d0cd11e1d056ebb2ccb1e898bc
Merge: ac59ee3 396f5dc
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 14:50:47 2013 +0200

    Merge branch 'bootstrap3' into GUI

commit 81b59388ef2687c89df1a0497860c6b14b195782
Merge: 9f38f31 1103afd
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 14:45:11 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into GUI

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Workspace/renderToolList.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/layout.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/less/claroline/theme.less
    	src/core/Claroline/CoreBundle/Resources/views/less/layout.less

commit ac59ee36c0d02f316cb296a16f568460abc8061e
Merge: c02f7e2 566f334
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 14:45:11 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into GUI

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Workspace/renderToolList.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/layout.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/less/claroline/theme.less
    	src/core/Claroline/CoreBundle/Resources/views/less/layout.less

commit 6a59ce46dbcec1d4cd1da977ec35350af8d939fe
Merge: 41a1824 1103afd
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 14:45:10 2013 +0200

    Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Administration/registrationManagementSelectedWorkspacesAndRoles.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/roles/workspaceGroups.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/roles/workspaceUsers.html.twig

commit 9994883c30cb16be1552ec3ca957ab1cfc06cf21
Merge: 783f0db 566f334
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 14:45:10 2013 +0200

    Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Administration/registrationManagementSelectedWorkspacesAndRoles.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/roles/workspaceGroups.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/roles/workspaceUsers.html.twig

commit 41a18243688dfb8952cfdc3e650cfd60b6b974e7
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 14:40:22 2013 +0200

    Correcting coding style

commit 783f0db0d8c3bfc713c5930ee246c475457ba31f
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 14:40:22 2013 +0200

    Correcting coding style

commit 87d083e6a1e095f564a640fef5a8b76136df7d33
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 14:26:56 2013 +0200

    gui update

commit 396f5dc2af67d22db3dd7ae6cecc995e30aae0f4
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 14:26:56 2013 +0200

    gui update

commit e8ea09e5ff7f0a4ffc1cc9ace6e99792d7026e4b
Merge: 842d7cc 1103afd
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Aug 23 14:21:03 2013 +0200

    Merge remote-tracking branch 'upstream/master' into user-csv-bug-fix

commit 569fca1480415080940fa18508e8d93c22d92cbf
Merge: d168e2f 566f334
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Aug 23 14:21:03 2013 +0200

    Merge remote-tracking branch 'upstream/master' into user-csv-bug-fix

commit 566f3346147893392b11843c6018a34affc036e7
Merge: f88787d 87e1ce3
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Aug 23 05:18:00 2013 -0700

    Merge pull request #168 from solispauwels/bootstrap3

    Bootstrap update version 3

commit 1103afdfea339db18af0ea0be5c230a41e0f2ce9
Merge: 97cef0e 658096e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 13:59:42 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into bootstrap3

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Message/show.html.twig

commit 95323da627c8197d85832fa6eac8b2f72d9eae37
Merge: 815fe45 f88787d
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 13:59:42 2013 +0200

    Merge remote-tracking branch 'upstream/master'

commit 87e1ce3c07c26f8e68557d0cb6ce7872cef4e418
Merge: 34f8b4e f88787d
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 13:59:42 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into bootstrap3

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Message/show.html.twig

commit 842d7cc2ffc0f774233458e1524d0f9c2e858d29
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Aug 23 13:54:03 2013 +0200

    Fixed email bug in users import. Closes #192

commit d168e2f4cff6683e9d6b4c7dd7bef26a840cf8db
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Aug 23 13:54:03 2013 +0200

    Fixed email bug in users import. Closes #192

commit 97cef0e158fc7fe5c73f8652e1d22ae553d93cb0
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 13:51:33 2013 +0200

    submodule update

commit 34f8b4e80ef682570ba307e274a4a7bee6000967
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 13:51:33 2013 +0200

    submodule update

commit 658096e9770c04456afea71cca1f4dcd35c1d461
Merge: a89cd65 1ce8d78
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Aug 23 04:51:22 2013 -0700

    Merge pull request #195 from ngodfraind/bugfix

    Bugfix

commit f88787d83f8438c8a65fa5d89499ea415b681df3
Merge: 5d67309 f97632c
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Aug 23 04:51:22 2013 -0700

    Merge pull request #195 from ngodfraind/bugfix

    Bugfix

commit c62400c33601f6792ef53cec0dafb0c7af85e0bb
Merge: 8b73c72 a89cd65
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 11:59:37 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into bootstrap3

    Conflicts:
    	composer.lock
    	src/core/Claroline/CoreBundle/Resources/public/js/table.js
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Administration/layout.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Form/simple_auto_complete.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Layout/topBar.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Profile/profile.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/less/layout.less

commit 60a3901d1f8bad0818f506f2cbf327efb01c6a3e
Merge: 745dd0a 5d67309
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 11:59:37 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into bootstrap3

    Conflicts:
    	composer.lock
    	src/core/Claroline/CoreBundle/Resources/public/js/table.js
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Administration/layout.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Form/simple_auto_complete.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Layout/topBar.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Profile/profile.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/less/layout.less

commit 2600cf58af80e2a6a12907b80dd45749c9b711ca
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Aug 23 11:37:23 2013 +0200

    Added HomeTab creation and edition

commit 5d673090bf4ac72e7043d43876c00085a3aea21d
Merge: b6904cc a235151
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Aug 23 02:21:37 2013 -0700

    Merge pull request #198 from maxailloud/master

    Update blog after coding style correction

commit 8b73c72608a0d1862397b7785d00591c5c976daf
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 11:11:33 2013 +0200

    Delete debug comments + responsive fix

commit 745dd0a8d709a5cb31482e1b01a3aa49434f9bda
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 11:11:33 2013 +0200

    Delete debug comments + responsive fix

commit 9068cdafd5c10af3621e5ac279c96e02d3449a63
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 11:04:39 2013 +0200

    Check style and use strict

commit 834126c8684cbae15fca382a731ecf03b31a637c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 11:04:39 2013 +0200

    Check style and use strict

commit 815fe4517bb90462063fee345c0b6a09e3de2142
Merge: a235151 b6904cc
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 10:59:33 2013 +0200

    Merge remote-tracking branch 'upstream/master'

commit a235151bdf3f460c1b3981ffc7294852ab83adb8
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Aug 23 10:57:22 2013 +0200

    Update blog after coding style correction

commit f97632c2655f35691ec7d7373834dd1f6c6099af
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Aug 23 10:56:21 2013 +0200

    updating examplebundle

commit 1ce8d780d5a37db4a1bd0518faa93cc2c2a6449a
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Aug 23 10:48:51 2013 +0200

    Resource custom action redirection + examplebundle update.

commit 255cfb4f493e7387363c1e9b92004a5e3c403b32
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Aug 23 10:48:51 2013 +0200

    Resource custom action redirection + examplebundle update.

commit 798d34257ed90acbc0503bb53fdc06e6610bca0d
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 10:01:03 2013 +0200

    Widget update bootstrap3

commit 5d8565a24315bfcb691b2b3751f4b1a164c191bb
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 10:01:03 2013 +0200

    Widget update bootstrap3

commit 4aea6065aae0f791900b813d0588fe94e2559bae
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 10:00:31 2013 +0200

    delete submodule announcement bundle

commit d7e03a120a62b806b238e22afdbb31ff51caba7c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 23 09:53:39 2013 +0200

    Delete reference to announcement bundle

commit a89cd65db6fc5f9ae490a5224b9f167f5f6036bc
Merge: 636845a ce58cb5
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Aug 23 00:18:16 2013 -0700

    Merge pull request #186 from maxailloud/open_badge

    Open badge

commit b6904ccafae2a1ad2228c1a2d355a1b103470f66
Merge: 3f129d7 b38c689
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Aug 23 00:18:16 2013 -0700

    Merge pull request #186 from maxailloud/open_badge

    Open badge

commit 1521f4e99c7c4eb47a9d83a44e52a0b8078dfcc0
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 17:32:53 2013 +0200

    Renaming resourceId by nodeId.

commit 6363cd1403201204bfd1b4882b3d5d2a241d2462
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 17:32:53 2013 +0200

    Renaming resourceId by nodeId.

commit 30c3ccfe7c59f097ed58370a3e620517887cc319
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 17:23:29 2013 +0200

    Fixing wrong image url.

commit 9cfc4a1d8722a22598b223edb8919d8136f4cf9f
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 17:23:29 2013 +0200

    Fixing wrong image url.

commit 3f129d7bbc4590e705db4375ad9387e75da2e2dd
Merge: c8f49ca c2cd47c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 08:16:46 2013 -0700

    Merge pull request #194 from ngodfraind/messages-bug-fix

    Fixing 'use strict' for table.js

commit c8f49caf3f415181da6a3c5c496b62b48eab74a5
Merge: 1fa0204 10def44
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Aug 22 08:12:46 2013 -0700

    Merge pull request #193 from ngodfraind/master

    Fix an impersonation bug.

commit 636845a16c2aac46334a7b98463bd4c50124a3e1
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 17:05:37 2013 +0200

    Fixing 'use strict' for table.js

commit c2cd47c81ba24404d603f40d9df4dd82e679e87b
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 17:05:37 2013 +0200

    Fixing 'use strict' for table.js

commit 7781cf652b3770d7c3538d49360dfd2431a21e91
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Aug 22 16:59:13 2013 +0200

    Bootstrap3 update

commit 21f6dd2f98cc79fb1306460b8e98ff03167301ae
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Aug 22 16:59:13 2013 +0200

    Bootstrap3 update

commit 10def444a551a935f0d96f3b8d4e012be8f3558f
Merge: d1d1280 1fa0204
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 16:53:11 2013 +0200

    Merge remote-tracking branch 'upstream/master'

commit 98085b6dab1e3f7477a53c3602761c977c6be7bb
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 16:50:59 2013 +0200

    Fixing a bug happening when a user impersonating a role from a workspace removed the workspace.

commit d1d12806661850f49b1e31001874e3b60740ea13
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 16:50:59 2013 +0200

    Fixing a bug happening when a user impersonating a role from a workspace removed the workspace.

commit b38c6892cf867bb3c4a7ada186d4ceebfaae45bc
Merge: 66dbc4c 1fa0204
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 16:43:44 2013 +0200

    Merge branch 'master' into open_badge

commit 1fa02042cecc1339ebb3de595910e4829ae28a40
Merge: 34097e2 604076a
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Aug 22 07:38:57 2013 -0700

    Merge pull request #191 from maxailloud/master

    Update blogBundle with the useless migration files deleted

commit b271dae2bc995133d997071393a816a0c0a84409
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Aug 22 16:24:36 2013 +0200

    update composer

commit 9f5210e929c6002309f2da6e838c84d49c9462b3
Merge: 2fb99d3 5aeb7a6
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Aug 22 16:10:25 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into bootstrap3

    Conflicts:
    	composer.lock
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/manager.js
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Activity/index.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Resource/multipleRightsPage.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/resource_manager/resourcesRights.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Workspace/layout.html.twig

commit 5ce1748138b19d31f8930e34f2e04a1041e3875d
Merge: 0be5c23 34097e2
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Aug 22 16:10:25 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into bootstrap3

    Conflicts:
    	composer.lock
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/manager.js
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Activity/index.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Resource/multipleRightsPage.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/resource_manager/resourcesRights.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Workspace/layout.html.twig

commit 604076a2574840be5b29f3a723de7db2c4eee3f9
Merge: c6269db 34097e2
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 16:10:16 2013 +0200

    Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	src/plugin/ICAP/BlogBundle

commit c6269dbb250c561e53c1530a2477a529e7b934a8
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 16:06:31 2013 +0200

    Update blogBundle with the useless migrtion files deleted

commit 2fb99d38c270c3918c666898b4032a55a67c0506
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Aug 22 15:55:30 2013 +0200

    Bootstrap3 update

commit 0be5c234ba0755e7e131803266f2dcf4297ae461
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Aug 22 15:55:30 2013 +0200

    Bootstrap3 update

commit 66dbc4c5c9605100f4f54ddb78ecbcf6dbc0e3d3
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 15:26:47 2013 +0200

    Use of php-cs-fixer to fix coding style

commit 0defca098e24d407657ba193b2060970a7a8ceb6
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 14:59:34 2013 +0200

    Update gitignore to remove useless statement

commit 9ad76e8af1d999a0abd26e7cd86162d1605038de
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 14:44:25 2013 +0200

    Correct coding style + adding missing translations told in pull request

commit 34097e2d53f43b98546b98bc638b0d2f880680b8
Merge: 2fa4f09 6680d92
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Aug 22 05:40:39 2013 -0700

    Merge pull request #189 from ngodfraind/downgrade-blogbundle

    Downgrade blogbundle

commit 6680d92d196ad5fe99e796419853ba2e5ec969f7
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 14:36:45 2013 +0200

    Downgrade BlogBundle

commit 68e1b32f0eee9c1703c8786c61a7fa65429a5a0a
Merge: 7d313e0 2fa4f09
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 14:15:34 2013 +0200

    Merge remote-tracking branch 'upstream/master'

commit 7d313e0a02f04c5765273ece9b2fc0d63a913168
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 14:12:41 2013 +0200

    upgrading ForumBundle.

commit c460c9163bb4258b87c6bf9a0f7a3dabe206f7db
Merge: 0925366 aa6ff05
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 13:24:52 2013 +0200

    Merge remote-tracking branch 'upstream/master'

commit ce58cb520bd29fbe2933ed506ea8f406eb841c88
Merge: ca7ef7a 5aeb7a6
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 11:12:21 2013 +0200

    Merge branch 'master' into open_badge

commit 71c83229829b513b67b5a815f93f84e1d139bbc0
Merge: f89c866 2fa4f09
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 11:12:21 2013 +0200

    Merge branch 'master' into open_badge

commit ca7ef7af6fcb1e6faaac0a0de18ca4012e8701b1
Merge: 20571a2 0fc98a9
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 11:10:21 2013 +0200

    Merge branch 'master' into open_badge

commit f89c866bc83b4f6001121f398dce24d9c5e68349
Merge: bcaf308 dc2f231
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 11:10:21 2013 +0200

    Merge branch 'master' into open_badge

commit 5aeb7a63f92a9391032811feb8b4255ed983f0bd
Merge: 0fc98a9 3324a5a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 02:09:57 2013 -0700

    Merge pull request #185 from ngodfraind/widget-refactoring

    Adding widget UML schéma.

commit 2fa4f09847b3e7837b34cec617961070bad35734
Merge: dc2f231 37d5638
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 02:09:57 2013 -0700

    Merge pull request #185 from ngodfraind/widget-refactoring

    Adding widget UML schéma.

commit 3324a5a6e81c9e162078b7479ac4c652b4b00230
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 11:04:09 2013 +0200

    Adding widget UML schéma.

commit 37d5638c5b4a9ba91e0b2f0aa1996e393793780d
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 11:04:09 2013 +0200

    Adding widget UML schéma.

commit bcaf3083691ca9c32f7b038d4b336858ec4c107f
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 11:02:34 2013 +0200

    Correct displaying message + change order for displaying lastname and firstname

commit 20571a2ef8ea4987405fb9cb36515dfc000a89b1
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 10:44:19 2013 +0200

    Factorisation of the template for displaying badges

commit 6b4549ec19ea7bae8e339feb6e8f3cded481a2c1
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 10:44:19 2013 +0200

    Factorisation of the template for displaying badges

commit f66d4593416ea1de1e2eb9e44ede98287913dcdf
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 10:19:11 2013 +0200

    Remove default translation domain from custom form field

commit 29c38878d89930ca7318ee1cb6e4bc829f3c809d
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 10:19:11 2013 +0200

    Remove default translation domain from custom form field

commit 96a5daffe43c7cf5c15ae78349e46efd34e9fd83
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 10:18:34 2013 +0200

    Move translation for badge in the badge bundle

commit 330b4e4e23991336c38f3e1c1e59dc2a63220bd9
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Aug 22 10:18:34 2013 +0200

    Move translation for badge in the badge bundle

commit 0fc98a9514d6920e69b65cbbefa17530eb482dee
Merge: 92dcbee 277e547
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Aug 22 00:50:54 2013 -0700

    Merge pull request #184 from ngodfraind/master

    Post authentication and registration.

commit dc2f231fea2562ea3880ceff0f9182f7977268f5
Merge: 30c1a17 0925366
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Aug 22 00:50:54 2013 -0700

    Merge pull request #184 from ngodfraind/master

    Post authentication and registration.

commit 09253662351dfc18d59027f4a6bd05fb386d2a5c
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 09:06:21 2013 +0200

    Fixing PR.

commit 277e5472c166ad15e5912a08c03301cea605b0b9
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Aug 22 09:06:21 2013 +0200

    Fixing PR.

commit 43d939bb56597dcdfb289d22b7b85e4a7ae8d9d8
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Aug 21 17:34:57 2013 +0200

    Post authentication and registration.

commit 7e17aa958cb69e06c6cbaa8ae17a6d9776f07fa8
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Aug 21 17:34:57 2013 +0200

    Post authentication and registration.

commit aa7e2ab849022fc3c237f539d9983e23eca9af18
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 21 17:26:10 2013 +0200

    Update vendor (idciExporterBundle escpecially)

commit 6595625ff7390e5d3111e67df51e6a84470e87cb
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 21 16:44:45 2013 +0200

    Modify simpleautocomplete template to take care of idciExporterBundle modification (incoming modification at the moment, pull request sended)

commit 5f2ce42f76d48d2d1930889bae4b16635e7fa8cb
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 21 16:44:45 2013 +0200

    Modify simpleautocomplete template to take care of idciExporterBundle modification (incoming modification at the moment, pull request sended)

commit 6059d9139b4a41f9928d6b27c246bf4c7aee3b5f
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 21 16:44:01 2013 +0200

    Add badge.css in git just because

commit 4b269e108ca017f2c64885f2abd2e98e08a0b7a4
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 21 16:43:19 2013 +0200

    Remove useless line

commit 8afbab959178721abfc3b30ee1eb45e4e263ba1a
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 21 16:43:03 2013 +0200

    Add new migration files for badgebundle

commit 86ae55fb385c72186062db0fd9eb0fbc04e9f8dd
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 21 16:42:39 2013 +0200

    Correct translation file

commit 88d7b3d269b736eb3db71938f37c8034ab794656
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 21 16:42:39 2013 +0200

    Correct translation file

commit 92dcbee5e08d2e0b2bf533ac896d9b82aaf5ba88
Merge: 24eb321 bd0516a
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Aug 21 07:02:55 2013 -0700

    Merge pull request #183 from maxailloud/update-blog-plugin

    Update blog plugin

commit 30c1a1705a4a77614b35223818185c3f84ee4080
Merge: 9ba1231 152f867
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Aug 21 07:02:55 2013 -0700

    Merge pull request #183 from maxailloud/update-blog-plugin

    Update blog plugin

commit 8c6b9b61a0e7d393b174d7a9c8942f9e08f4c2e5
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 21 15:37:48 2013 +0200

    Update translation files to add missing translation

commit 316dc7ed3415864d916c8c33ef6913888c1f53aa
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 21 15:37:48 2013 +0200

    Update translation files to add missing translation

commit 03df5bf2fddd4092415fb4dd4eea4b20a7166919
Merge: 0d50f1a 24eb321
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 21 15:36:16 2013 +0200

    Merge branch 'master' into open_badge

    Conflicts:
    	app/AppKernel.php
    	app/config/config.yml
    	src/core/Claroline/CoreBundle/Entity/User.php
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Administration/layout.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Layout/topBar.html.twig

commit 19272c4bc46c1b1ac27192f6482a4908dd0a3c55
Merge: 425f71e 9ba1231
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 21 15:36:16 2013 +0200

    Merge branch 'master' into open_badge

    Conflicts:
    	app/AppKernel.php
    	app/config/config.yml
    	src/core/Claroline/CoreBundle/Entity/User.php
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Administration/layout.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Layout/topBar.html.twig

commit 152f86709928d6280db8c1aa1f9db9222e2c169c
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 21 15:08:25 2013 +0200

    Update blog plugin

commit bd0516a6121e905169885cf7a7ba09bdf9c8ef1c
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 21 15:08:04 2013 +0200

    Add month name in translation files

commit 23b91e5267d74eea466412efd09bd774c0cdc791
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Aug 21 15:08:04 2013 +0200

    Add month name in translation files

commit 9ba12314c72fa7bfb04c5601f844effe8f2d6c95
Merge: b1551ef 6e5ffe9
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Aug 20 23:53:10 2013 -0700

    Merge pull request #80 from claroline/uploadFileDnD

    Upload file with drag n drop

commit 24eb321b39ae9c471478d467e4fdfdca61c52633
Merge: 3d79630 aa3fbeb
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Aug 20 23:53:10 2013 -0700

    Merge pull request #80 from claroline/uploadFileDnD

    Upload file with drag n drop

commit b1551effd3edbac27df6762dc743e77189792856
Merge: aa6ff05 b4652ab
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Aug 20 23:52:55 2013 -0700

    Merge pull request #181 from Vaince/master

    Update log and ReferenceBundle to follow CoreBundle Refactoring

commit 3d638fb3c17aac2b375abe1a596abbd7fc64d61b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 20 17:37:18 2013 +0200

    Submodule update

commit 5b2efea2bd2b2e871f67aae149f37e7b8d6bfd32
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 20 17:24:18 2013 +0200

    Refactored with bootstrap3. Closes #126

commit a4ed463c927e86613b02a55c89d7147dda40a9e5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 20 17:24:18 2013 +0200

    Refactored with bootstrap3. Closes #126

commit eb24bb68c024881cbc25110fcfabe85b481913d7
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 20 17:22:10 2013 +0200

    Submodule update

commit 6e5ffe9eafe66500673056db3a5b8db34bdbc601
Merge: 5b81a10 36b0bcd
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 20 07:41:36 2013 -0700

    Merge pull request #182 from ngodfraind/dragndrop

    Dragndrop

commit aa3fbeb7f4d99e7c7e90c155bb77bd49a6f4beac
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 20 16:10:11 2013 +0200

    Updating and fixing drag & drop upload.

commit 36b0bcd5967de80e42eb0eaaa9d3a57b40e6ce38
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 20 16:10:11 2013 +0200

    Updating and fixing drag & drop upload.

commit b4652ab55ac4dbb3c9daa0267951c78657c38a25
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Aug 20 15:33:20 2013 +0200

    Update ReferenceBundle

commit 3d796304caf266ff2620358f2aed209b2f720cac
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Aug 20 15:26:37 2013 +0200

    Debug subscribe/unsubscribe to role logs (workspace name issue)

commit 6b398275e288a088d8a3dd8d66f33837762d2c35
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Aug 20 15:26:37 2013 +0200

    Debug subscribe/unsubscribe to role logs (workspace name issue)

commit a1172fe6c3f62b40b3342288382fd441205faf47
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Aug 20 14:58:02 2013 +0200

    Debug resourceNode refactoring

commit c914bcad26d0c381f5ac3e76b9fea464a6d4f04d
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Aug 20 14:58:02 2013 +0200

    Debug resourceNode refactoring

commit 9f811edbc20a73121c31877673a2746cfc8bc52b
Merge: 43ee3f8 c31bb08
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 20 11:58:04 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-126-announcements

    Conflicts:
    	composer.lock
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/manager.js
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Activity/index.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Resource/multipleRightsPage.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/resource_manager/resourcesRights.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Workspace/layout.html.twig

commit c26846ae13ea25c724ac759c51940eb33d988cc0
Merge: 82431a8 aa6ff05
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 20 11:58:04 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-126-announcements

    Conflicts:
    	composer.lock
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/manager.js
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Activity/index.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Resource/multipleRightsPage.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/resource_manager/resourcesRights.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Workspace/layout.html.twig

commit 82431a8e10f9bc74910bbd8874fdc51ae7d1205c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 20 11:31:08 2013 +0200

    Submodule update

commit 5604a17f1cf6803763cc8140432263e3fb5df360
Merge: 347e0e7 c31bb08
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 20 08:57:12 2013 +0200

    Merge remote-tracking branch 'origin/master' into HEAD

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/resource_manager/resources.html.twig

commit 07d014a479c8d88ed9cf27eca40f9b19cbdb5196
Merge: 5b81a10 a385acf
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 20 08:57:12 2013 +0200

    Merge remote-tracking branch 'origin/master' into HEAD

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/resource_manager/resources.html.twig

commit aa6ff05e701dd1327d09b5689ed1966fb29d84e8
Merge: 844ddcf a385acf
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Aug 19 23:50:02 2013 -0700

    Merge pull request #180 from ngodfraind/master

    Removing the resource hierarchy.

commit a385acfff8cdfaef60986d0e54f9bb1ee5744251
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 17:32:08 2013 +0200

    Fixing pull request.

commit c31bb08b0c457b1883ceb866905f05395d2c006f
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 17:32:08 2013 +0200

    Fixing pull request.

commit 5a14fa8f88a5cdf6055a5fa786edda863fd8db73
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 16:52:37 2013 +0200

    Fixing manager.js merge.

commit fd409fc415582d1559999dc383bebd40901fdf80
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 16:52:37 2013 +0200

    Fixing manager.js merge.

commit 9849a458939ba4c66d335c748169b8e1b69f9052
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 16:45:03 2013 +0200

    Fixing tinymce resource picker.

commit ce92fef6ea3e20e36dde454f2aed70ff686bb8ab
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 16:45:03 2013 +0200

    Fixing tinymce resource picker.

commit 4ef1b53c9dd117242a0c4f449b3337824b918adc
Merge: f88a36f 844ddcf
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 16:38:14 2013 +0200

    Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	composer.lock
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/manager.js
    	src/core/Claroline/CoreBundle/Resources/views/Resource/breadcrumbs.html.twigjs
    	src/core/Claroline/CoreBundle/Tests/Manager/ResourceManagerTest.php

commit a8d916c170f584fa8afed4991c2591f292373013
Merge: 4e02117 d8998a4
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 16:38:14 2013 +0200

    Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	composer.lock
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/manager.js
    	src/core/Claroline/CoreBundle/Resources/views/Resource/breadcrumbs.html.twigjs
    	src/core/Claroline/CoreBundle/Tests/Manager/ResourceManagerTest.php

commit b56c4527a0daed00c75fc5049fddb352ebfe04fa
Merge: 844ddcf 65967bd
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Aug 19 16:37:53 2013 +0200

    Merge branch 'calendar' of https://github.com/easy-es/Claroline into calendar

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/Tool/WorkspaceAgendaController.php
    	src/core/Claroline/CoreBundle/Resources/public/js/tool/calendar.js

commit c354f13c5b36d75d8bc14effaf8fb5cb3f1545ad
Merge: d8998a4 847a87b
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Aug 19 16:37:53 2013 +0200

    Merge branch 'calendar' of https://github.com/easy-es/Claroline into calendar

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/Tool/WorkspaceAgendaController.php
    	src/core/Claroline/CoreBundle/Resources/public/js/tool/calendar.js

commit f88a36fa55201302e4077d01450f01989c92f16d
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 16:11:35 2013 +0200

    Fixing resource creation test.

commit 4e02117276db11886dfa018bc6547e367031eabe
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 16:11:35 2013 +0200

    Fixing resource creation test.

commit c7c5a991619b4a0dc509b6e78a64f129c73b2201
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 16:06:57 2013 +0200

    Update doc.

commit f8c9b94113244938ab613e13541836718960fd89
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 16:06:57 2013 +0200

    Update doc.

commit b4f2f593811567352de56183a9935f73b3985b45
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 15:32:56 2013 +0200

    Fixing resource log creation.

commit 7886d44542d86c71988044c7c271d954b7bebc00
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 15:32:56 2013 +0200

    Fixing resource log creation.

commit 95cd6c3496fbc35d5ca9b602125f50e87d2e7247
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 15:00:52 2013 +0200

    Cleaning migrations.

commit 0469dca54eebbd2b89c512421f64cef43ad2c574
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 15:00:52 2013 +0200

    Cleaning migrations.

commit c16406746b2acded2b49fa7c2f4deda3f7aeae3f
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 14:45:41 2013 +0200

    Updating submodules + migrations.

commit 166e9d38d3f63623b4d146eb991460c6dbb2f48b
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 14:45:41 2013 +0200

    Updating submodules + migrations.

commit 5a6a2cbe470a43a8cd7856de53d4cb4a4fd642ec
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 14:33:50 2013 +0200

    Various bug fixes.

commit 92552bc8f8b24e53552ea7f2b0b662b1cc2dc5e1
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 14:33:50 2013 +0200

    Various bug fixes.

commit 844ddcf343bfcdb32e8665a25561a4c5d6dd19f7
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Aug 19 14:06:31 2013 +0200

    restore config tinymce4

commit 428e8e0a75e6be798cc0d429a6697b1c661a3997
Merge: b062f70 64f88fb
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Aug 19 04:40:25 2013 -0700

    Merge pull request #179 from claroline/update_blog_plugin

    Update blog plugin

commit 4970d8bd7d197c0759ac1478291ba2555907d3a8
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 19 13:22:03 2013 +0200

    Submodule update

commit 64f88fbccae472a615b645ce9e86a781e89103ab
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 19 11:39:39 2013 +0200

    Remove symfony config file for blog plugin

commit 0c1ede628b64f189a12b8149990238524d2c2bd2
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 19 11:34:53 2013 +0200

    Blog plugin update with field infos nullable

commit 3668ef4887ca471983eccaa5775e7d9424e5603b
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 19 11:04:37 2013 +0200

    Update composer.lock

commit d8998a47aa82e42988037a78d3765effdb4f3b2a
Merge: cad6a0a 793bb04
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 19 11:04:03 2013 +0200

    Merge branch 'master' into update_blog_plugin

    Conflicts:
    	app/config/config.yml
    	composer.lock
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php

commit 286e58ae860aebbd3b8eb2e3e4eece6014caff5a
Merge: d3cf9fd b062f70
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Aug 19 11:04:03 2013 +0200

    Merge branch 'master' into update_blog_plugin

    Conflicts:
    	app/config/config.yml
    	composer.lock
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php

commit 65967bd8d999084305a7dcf42e3a276e1c68d1ad
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Aug 19 10:13:48 2013 +0200

    partial fix bug event worked

commit 847a87bf66cbda5a2cc1564871397de1129dd6b8
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Aug 19 10:13:48 2013 +0200

    partial fix bug event worked

commit 2d28056e88aa46ad02e71f4f16b2b7e57794236b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 19 09:42:19 2013 +0200

    Submodule update

commit 43ee3f81fd13f73591e38a86c8bbb0b2f640d76e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 19 09:37:14 2013 +0200

    Refactored Mail & Messsage forms with bootstrap3

commit 928459e9c7b7a69b20397959fb1288c32a9527e0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 19 09:37:14 2013 +0200

    Refactored Mail & Messsage forms with bootstrap3

commit 22ac10a8cfc78721ae431f8425feb877d6bd3764
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 09:13:20 2013 +0200

    Fixing resource reordering + logs.

commit c8f69df6a8e06e4b13b0fa9a34f0c8138b5865cb
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 19 09:13:20 2013 +0200

    Fixing resource reordering + logs.

commit 38f5c02fb5e054b9edac5a5289467ed010c0c157
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Aug 14 17:25:22 2013 +0200

    Refactored templates with bootstrap3

commit bd1aa391ed2d8779a458f46dfa981afba3ba3b7b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Aug 14 17:25:22 2013 +0200

    Refactored templates with bootstrap3

commit 0b78dcb4e3249115c7d53e654bba9affae35e135
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Aug 14 11:04:44 2013 +0200

    Submodule update

commit 0959b8c850cdf5969968b96372c9d2bd4ac3ce5f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Aug 14 11:03:01 2013 +0200

    Refatored resource create form with bootstrap3

commit d80c56944887b488a3233cbaf6b25e6e887f9ded
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Aug 14 11:03:01 2013 +0200

    Refatored resource create form with bootstrap3

commit d7028fe53e87f51fd8f7cfde8f21a3b56a7c678e
Merge: d44adf8 ea5acb1
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Aug 14 08:41:17 2013 +0200

    Merge branch 'bootstrap3' of https://github.com/solispauwels/Claroline into issue-126-announcements

commit e4516cab7b968274115c577427530b7c45448e1d
Merge: 202b077 85c3043
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Aug 14 08:41:17 2013 +0200

    Merge branch 'bootstrap3' of https://github.com/solispauwels/Claroline into issue-126-announcements

commit d44adf8e4eec204dcf5e573fd946a7341b0c8e5c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 13 17:28:16 2013 +0200

    Fixed editRoleAction

commit 202b077446dda926104bfe43bafc6d349dd5db60
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 13 17:28:16 2013 +0200

    Fixed editRoleAction

commit ea5acb182851144bfc99440d8574c653aedefd80
Merge: 4307e9b 306ae05
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 13 17:00:58 2013 +0200

    Merge branch 'bootstrap-3' of https://github.com/kitan1982/Claroline into bootstrap3

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/WorkspaceTag/checkPotentialWorkspaceAdminTagChildren.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/WorkspaceTag/checkPotentialWorkspaceTagChildren.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/WorkspaceTag/manageAdminTag.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/WorkspaceTag/manageTag.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/WorkspaceTag/workspaceAdminTagCreateForm.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/WorkspaceTag/workspaceTagCreateForm.html.twig

commit 85c3043ff7f8a85356a62216c087a063a5ce213b
Merge: cf51e47 b9ee6b8
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 13 17:00:58 2013 +0200

    Merge branch 'bootstrap-3' of https://github.com/kitan1982/Claroline into bootstrap3

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/WorkspaceTag/checkPotentialWorkspaceAdminTagChildren.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/WorkspaceTag/checkPotentialWorkspaceTagChildren.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/WorkspaceTag/manageAdminTag.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/WorkspaceTag/manageTag.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/WorkspaceTag/workspaceAdminTagCreateForm.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/WorkspaceTag/workspaceTagCreateForm.html.twig

commit 4307e9babc3a01458f3e6b179e718cd0812d3b1c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 13 16:39:59 2013 +0200

    GUI update for bootstrap3

commit cf51e47c120b23fe03ea6cfb3a2f3bd0a1ac4aa3
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 13 16:39:59 2013 +0200

    GUI update for bootstrap3

commit b36894128808c387b9e514112d85fbe30507a002
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 13 11:19:01 2013 +0200

    Updating composer.lock + removing fetch eager from parent in ResourceNode + fixing most controllers.

commit d5028ed593a6a8b70a5d8eaaa8d4571d5e3b3419
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Aug 13 11:19:01 2013 +0200

    Updating composer.lock + removing fetch eager from parent in ResourceNode + fixing most controllers.

commit 306ae051857d52801e7b7ee741586666e1c1eaab
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 13 09:30:42 2013 +0200

    Refactored workspaceTag with bootstrap3

commit b9ee6b8fde952823084bdd8408d18a29e926dc31
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 13 09:30:42 2013 +0200

    Refactored workspaceTag with bootstrap3

commit 4a6d09bd29ee1f331b09ee4ac8e595899b2a6a31
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 13 09:01:16 2013 +0200

    Fixed self-registration + tests

commit 12a959a889c139927335abbf1b9acb746e243127
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 13 09:01:16 2013 +0200

    Fixed self-registration + tests

commit 7d5026cf15a23f2e956862f37ccb85a12f26a94c
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 12 15:19:39 2013 +0200

    First commit. Updating database +tests.

commit d00d6d92c7b4e26862b0cc4935efe647c2784369
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 12 15:19:39 2013 +0200

    First commit. Updating database +tests.

commit f38db5bb8acf91ee27bca6ac62b895d731ffc79e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Aug 12 15:03:03 2013 +0200

    submodule update

commit 9ba18cb367e78f79fdc3d9c36e9fe292313a67de
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Aug 12 15:00:03 2013 +0200

    Buttons update to bootstrap3

commit fc22b09e8e345e4974ead2cfb0dd51760d25085c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Aug 12 15:00:03 2013 +0200

    Buttons update to bootstrap3

commit 06fb5523428fe8e03327f9ebd88d41a111d362d0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 12 14:06:32 2013 +0200

    Submodule update

commit 4e20e68e371be05c04ea196b6d099058bd47f378
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 12 14:04:23 2013 +0200

    Refactored PagerFactory with option for max nb elements per page

commit 4a0e291033b51410f5d96958e1c4f297165b44be
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 12 14:04:23 2013 +0200

    Refactored PagerFactory with option for max nb elements per page

commit 29862b0c14dd676b9867c5e6711458af72991b07
Author: jorge <jorge@crunchbang.(none)>
Date:   Sat Aug 10 18:11:17 2013 +0200

    Modals update to bootstrap3

commit ca7f5035b8db166ba12b59f1279430c9d256a604
Author: jorge <jorge@crunchbang.(none)>
Date:   Sat Aug 10 18:11:17 2013 +0200

    Modals update to bootstrap3

commit 398d744e8f87365fdddf61d18f3669d4961987cb
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 9 15:54:02 2013 +0200

    Bootstrap3 Update twig files

commit 5927c899a1ba5dd3ca2f961d29034212f354c2c3
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Aug 9 15:54:02 2013 +0200

    Bootstrap3 Update twig files

commit 6489ed62112878565528fd0309f5e64833194d3d
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Aug 8 17:07:57 2013 +0200

     calendar partial fixing bugs

commit c56002a3c3afbe19a3b5fa567af3dfe399824880
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Aug 8 17:07:57 2013 +0200

     calendar partial fixing bugs

commit 0b4c4a8e75b94a8d452e390f146c7836c03d74d6
Merge: 8c39048 793bb04
Author: jorge <jorge@crunchbang.(none)>
Date:   Tue Aug 6 22:48:52 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into bootstrap3

commit 776707f219ecc628f559a68650925903d9eca949
Merge: dccccb8 b062f70
Author: jorge <jorge@crunchbang.(none)>
Date:   Tue Aug 6 22:48:52 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into bootstrap3

commit 9f38f31d74180c5834bd6ffd213108a4f31468fe
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 6 17:14:57 2013 +0200

    GUI update (impersonalitation interface)

commit c02f7e2ac0e49b83cd37e7513f8451d1323d693f
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 6 17:14:57 2013 +0200

    GUI update (impersonalitation interface)

commit e5ced42df7b306630d27e6345e1d23a5758ce0bd
Merge: 690414d 793bb04
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 6 16:24:31 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-126-announcements

commit c3539ca7f27d548a4edf6035fda8a2d5582e3d40
Merge: 217719a b062f70
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 6 16:24:31 2013 +0200

    Merge remote-tracking branch 'upstream/master' into issue-126-announcements

commit 217719a89687b25f6a42c00422f98290388e32ab
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 6 16:24:13 2013 +0200

    Submodule update

commit 690414de4135affb702504741960f5a4d4ed1aa9
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 6 16:23:47 2013 +0200

    Fixed error in MessageController injection

commit 961450be521adfb9445a1802ea56f37333bb112d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Aug 6 16:23:47 2013 +0200

    Fixed error in MessageController injection

commit b062f7024ea530675c0a5be9cd554b4de641b160
Merge: a709845 92ad8c5
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Aug 6 05:11:22 2013 -0700

    Merge pull request #176 from solispauwels/GUI

    Gui update + Rename Calendar to Agenda

commit 793bb043afb4fdd71273410a6f402bbcbf35f5ab
Merge: ef68e95 2e20711
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Aug 6 05:11:22 2013 -0700

    Merge pull request #176 from solispauwels/GUI

    Gui update + Rename Calendar to Agenda

commit 2e207111babd48f35818339a177bf7a1ba404cad
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 6 11:41:54 2013 +0200

    Camel case correction

commit 92ad8c5360b9ad3ded6d7fc09734d04bd53a93dc
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 6 11:41:54 2013 +0200

    Camel case correction

commit 495919eda299b68405dffee090bb287adb263b9d
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 6 11:37:23 2013 +0200

    Style correction

commit b5f48c0c8b7bc60651a4988c541f4de019010963
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 6 11:37:23 2013 +0200

    Style correction

commit a7098451395bbbfa3a37ab936d2ff4f472e16596
Merge: 0435ae2 6fc4571
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Aug 6 02:20:45 2013 -0700

    Merge pull request #177 from stefk/checkstyle

    Checkstyle

commit dccccb85a9a3b73f3bd3aa70a5275d21307e56d3
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 6 11:19:28 2013 +0200

    composer update

commit ef68e9532ebf8d4639b559775a2b4dd7f565e8f2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 6 11:11:32 2013 +0200

    Chekstyle

commit 6fc4571325393a6d03e9ae59ca4e358be8d40a7d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 6 11:11:32 2013 +0200

    Chekstyle

commit 8c39048ef5db62fd41253fecf7245122aa444689
Merge: 504097c 3c469e4
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 6 10:51:47 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into bootstrap3

    Conflicts:
    	composer.json
    	composer.lock
    	src/core/Claroline/CoreBundle/Resources/views/layout.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/less/bootstrap-default/common.less
    	src/core/Claroline/CoreBundle/Resources/views/less/bootstrap-edit/common.less
    	src/core/Claroline/CoreBundle/Resources/views/less/bootswatch-cyborg/common.less
    	src/core/Claroline/CoreBundle/Resources/views/less/claroline/common.less

commit 5cecb5d652269268434a92fe9657d9429f52764a
Merge: 34316f8 0435ae2
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 6 10:51:47 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into bootstrap3

    Conflicts:
    	composer.json
    	composer.lock
    	src/core/Claroline/CoreBundle/Resources/views/layout.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/less/bootstrap-default/common.less
    	src/core/Claroline/CoreBundle/Resources/views/less/bootstrap-edit/common.less
    	src/core/Claroline/CoreBundle/Resources/views/less/bootswatch-cyborg/common.less
    	src/core/Claroline/CoreBundle/Resources/views/less/claroline/common.less

commit 7f0b8b386b6554fca1f20b69998ce24fb282dd7f
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 6 10:41:08 2013 +0200

    GUI update - fix translation problem

commit 661267af0207add6f7fdabacc07236b2e6b931b6
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 6 10:41:08 2013 +0200

    GUI update - fix translation problem

commit 7ad2627cc3122aae7a426654bf9391b3323a7a93
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 6 09:21:04 2013 +0200

    GUI Update

commit cbc2a1227551924347f521b9781fd6e21640194d
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Aug 6 09:21:04 2013 +0200

    GUI Update

commit 8a2a97dd74a9fbe437b55fa160296e45005fe8dc
Merge: c2eab0b 3c469e4
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Aug 5 16:05:29 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into GUI

    Conflicts:
    	src/core/Claroline/CoreBundle/Entity/Home/Type.php
    	src/core/Claroline/CoreBundle/Resources/config/routing.yml

commit e9c50c2281a5174b54d6587000d856fe8151ace5
Merge: 25753a1 0435ae2
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Aug 5 16:05:29 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into GUI

    Conflicts:
    	src/core/Claroline/CoreBundle/Entity/Home/Type.php
    	src/core/Claroline/CoreBundle/Resources/config/routing.yml

commit c2eab0b0fa9dec1ddb1d9935d4b17a3dc53f1132
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Aug 5 15:55:36 2013 +0200

    GUI update

commit 25753a142a1104cb5625880a2a196f15473ab1a6
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Aug 5 15:55:36 2013 +0200

    GUI update

commit 0435ae266c8881e296cbe2802385b2641307606d
Merge: 965720e b88418e
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Aug 5 06:29:39 2013 -0700

    Merge pull request #175 from stefk/migration-bundle-integration

    Migration bundle integration

commit b88418e5b0857fa094a03e74508136c6af333596
Merge: 4e5e53c 965720e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 15:18:24 2013 +0200

    Merge remote-tracking branch 'upstream/master' into migration-bundle-integration

commit 4e5e53cf0eda947aff9f7964a6c74cab80d9d377
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 15:16:35 2013 +0200

    Excluded migration dir from static analysis tools

commit d0336c9386266ddaee1fcef099f238435c238ca4
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 5 15:13:24 2013 +0200

    Renamed var foundRole

commit a7c47f8e70755d96f7df761612cede9db0e6d347
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 5 15:13:24 2013 +0200

    Renamed var foundRole

commit 6074795656d32e6f854b88613741abd2ea01e702
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 5 15:11:01 2013 +0200

    Fixed some bugs with created roles

commit de2996bc7e9a74ab0df007c2ee1c5408688ba21f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 5 15:11:01 2013 +0200

    Fixed some bugs with created roles

commit 965720e6c9468c2e44e3b77251056a74379d459b
Merge: c324dd8 a17013c
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Aug 5 05:59:51 2013 -0700

    Merge pull request #174 from easy-es/tinymce

    close #131

commit a17013c24830897d7bbd67e3351190fc31587442
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Aug 5 14:49:05 2013 +0200

    upgrade submodule

commit 3c469e4af0f65c6c201f6f3cfd0c70987665dc4c
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Aug 5 14:38:31 2013 +0200

    fixed tests

commit 548f2f57ee0d6dfbee759c83634aece4ae971025
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Aug 5 14:38:31 2013 +0200

    fixed tests

commit 0bf72df0a0e80f4d77d0953e6796c0aefdb75536
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 13:59:50 2013 +0200

    Updated migration bundle

commit b02774921b799e421d6fee59b51262cc1fbbc612
Merge: aa22818 f85f477
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Aug 5 12:07:50 2013 +0200

    Merge remote-tracking branch 'upstream/master' into tinymce

    Conflicts:
    	composer.lock
    	src/core/Claroline/CoreBundle/Resources/public/js/tinymce/config.js
    	src/plugin/Claroline/ExampleBundle

commit 7d255ce55e4e796e45a75727c8c5fa9b2b2b6208
Merge: f3128e5 c324dd8
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Aug 5 12:07:50 2013 +0200

    Merge remote-tracking branch 'upstream/master' into tinymce

    Conflicts:
    	composer.lock
    	src/core/Claroline/CoreBundle/Resources/public/js/tinymce/config.js
    	src/plugin/Claroline/ExampleBundle

commit aa22818d803ebaefa185d487de089c99a8488027
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Aug 5 11:58:36 2013 +0200

    upgrade tinymce bundle

commit f3128e598f5872c7f8d87bb7fde49fa9d1ccbcde
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Aug 5 11:58:36 2013 +0200

    upgrade tinymce bundle

commit c324dd80fb7e2c6ef04f44110db422d4ae1cc8ce
Merge: 9f5aef2 cacce2c
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Aug 5 02:47:44 2013 -0700

    Merge pull request #172 from stefk/migration-bundle-integration

    Migration bundle integration

commit f85f4772a453e79881e96fbcef69e99e3ac8c2ea
Merge: 6290f40 da8dbb7
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Aug 5 02:47:44 2013 -0700

    Merge pull request #172 from stefk/migration-bundle-integration

    Migration bundle integration

commit e14a8677b7040589fe973c9423805a7667db4a6d
Merge: cacce2c 9f5aef2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 11:47:23 2013 +0200

    Merge remote-tracking branch 'upstream/master' into migration-bundle-integration

commit 9f5aef2f4d62cf9338813c8eeb617cf358df7552
Merge: abe834d 7650181
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Aug 5 02:46:46 2013 -0700

    Merge pull request #173 from ngodfraind/workspace-groups

    Workspace groups

commit 6290f40d0138e20b0a70a1fcec80fc7391fc24e9
Merge: 1c84039 26cfa9a
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 5 11:29:58 2013 +0200

    Merge remote-tracking branch 'upstream/master' into workspace-groups

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/Tool/WorkspaceParametersController.php
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php
    	src/core/Claroline/CoreBundle/Converter/MultipleIdsConverter.php
    	src/core/Claroline/CoreBundle/Manager/RoleManager.php
    	src/core/Claroline/CoreBundle/Tests/Converter/MultipleIdsConverterTest.php

commit 76501818c24adbda32a5a23942207b90bfd83b56
Merge: 9d092da abe834d
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 5 11:29:58 2013 +0200

    Merge remote-tracking branch 'upstream/master' into workspace-groups

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/Tool/WorkspaceParametersController.php
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php
    	src/core/Claroline/CoreBundle/Converter/MultipleIdsConverter.php
    	src/core/Claroline/CoreBundle/Manager/RoleManager.php
    	src/core/Claroline/CoreBundle/Tests/Converter/MultipleIdsConverterTest.php

commit cacce2c0b08227bc1bc3ed119c3da7bfb841e3ab
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 11:28:25 2013 +0200

    Submodule update

commit da8dbb7fb4caff84ea3c5c9eb0a2a644cc708298
Merge: df763eb 26cfa9a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 11:27:30 2013 +0200

    Merge remote-tracking branch 'upstream/master' into migration-bundle-integration

    Conflicts:
    	composer.lock

commit 6eeb2d1b30623ce492376c09fad85d86537f41e1
Merge: 06cfb7a abe834d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 11:27:30 2013 +0200

    Merge remote-tracking branch 'upstream/master' into migration-bundle-integration

    Conflicts:
    	composer.lock

commit 06cfb7aed2ee542ff0a0ecff96185a3009608c56
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 11:23:54 2013 +0200

    Submodule update

commit df763eb4c03488bbb262c07177c4d6cd2691ea7a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 10:39:37 2013 +0200

    Fixed mapping and regenerated migrations

commit d566a5225ad074bbacc753ba096a48a4bd8b0d80
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 10:39:37 2013 +0200

    Fixed mapping and regenerated migrations

commit 1c84039227b7bbc70e7c0f5bd8eeb9df7c48113b
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 5 11:07:04 2013 +0200

    Tests for RolesController and User|Group Repository.

commit 9d092daadb7a626ee27b1a2d9b5b25f225552d3c
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 5 11:07:04 2013 +0200

    Tests for RolesController and User|Group Repository.

commit abe834df1c7934817d951054d28497da55004c6a
Merge: 88daa77 1ce4f3f
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Aug 5 01:51:26 2013 -0700

    Merge pull request #171 from kitan1982/admin-registration-into-workspace-via-tag-116

    Admin registration into workspace via tag 116

commit 26cfa9a3edbce2fbca7ce6867785b3b3c4e3d77a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 5 10:25:52 2013 +0200

    Disabled selected workspaces list during registration

commit 1ce4f3feb56b81f700a61c7bdb4f35615d1d082d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 5 10:25:52 2013 +0200

    Disabled selected workspaces list during registration

commit aa9c5a06c41baba1eee40e81f91cc853e4cda763
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 10:18:05 2013 +0200

    Switched to migration bundle migrator

commit 9d0682c1db0727b716e9eb38bd7f7be8b47962da
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 10:18:05 2013 +0200

    Switched to migration bundle migrator

commit 77b6d89ab39d89fae50c403a296433975212e467
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 5 10:09:50 2013 +0200

    checkstyle

commit 9c22b01812d0bab35182d870f14d51ff42088a2e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 5 10:09:50 2013 +0200

    checkstyle

commit 44ca5816fa8a93c1c59843fecbb12c8f6133ac0e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 5 09:59:55 2013 +0200

    Resized width of select box. Closes #116

commit 23b60d9ec0c487bc9f8c8e5391b5533a1058cea8
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 5 09:59:55 2013 +0200

    Resized width of select box. Closes #116

commit aa38c80f9ae3d5353546801855a337849fc1c16f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 09:53:01 2013 +0200

    Fixed test

commit a4af3b308f6522244e7b9ebe4aeaa3c8f87b61ee
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 09:53:01 2013 +0200

    Fixed test

commit 3882660080d3716a57c1888a51b845cc5b665538
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 5 09:39:04 2013 +0200

    Added workspace search in registration

commit 881b75318e2c3298acda98b18d26b4c16dcfa9e0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Aug 5 09:39:04 2013 +0200

    Added workspace search in registration

commit bb19f8d26af8eb144df7ba10b20d419fcc48baef
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 09:38:54 2013 +0200

    Regenerated migration classes

commit b459040e538255c4b4002732dd1d43f6a1df1f52
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 09:38:54 2013 +0200

    Regenerated migration classes

commit d90a47237d15b823568edd9d0a64b514a26bb28d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 09:36:47 2013 +0200

    Fixed entity mapping

commit b0c63bf2b41d2b7960819c11299ff9b0173e5198
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 09:36:47 2013 +0200

    Fixed entity mapping

commit 8cec524cf6e31819e03baa63ac4899094ed157c8
Merge: 16c6acd ab095ce
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 5 09:03:55 2013 +0200

    Merge remote-tracking branch 'upstream/master' into workspace-groups

    Conflicts:
    	composer.json
    	composer.lock
    	src/core/Claroline/CoreBundle/Form/Factory/FormFactory.php
    	src/core/Claroline/CoreBundle/Manager/UserManager.php
    	src/plugin/Claroline/RssReaderBundle

commit e95ddf87aff53f46e03196b3edb6dc42a6c87daa
Merge: 697e6d2 88daa77
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Aug 5 09:03:55 2013 +0200

    Merge remote-tracking branch 'upstream/master' into workspace-groups

    Conflicts:
    	composer.json
    	composer.lock
    	src/core/Claroline/CoreBundle/Form/Factory/FormFactory.php
    	src/core/Claroline/CoreBundle/Manager/UserManager.php
    	src/plugin/Claroline/RssReaderBundle

commit d30ce8a121c380ea362fabdd2307439585b9e459
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 5 08:47:42 2013 +0200

    Updated migration bundle

commit e812dda0ed7a4c507005aaebc9bf419090ee1ced
Merge: 751f655 ab095ce
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Aug 2 11:53:03 2013 +0200

    Merge remote-tracking branch 'upstream/master' into admin-registration-into-workspace-via-tag-116

commit 0215ec34f27011da4f990fae444910065d54a94a
Merge: 6fa8ff8 88daa77
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Aug 2 11:53:03 2013 +0200

    Merge remote-tracking branch 'upstream/master' into admin-registration-into-workspace-via-tag-116

commit 751f6556db917ad5a4b472d742b3708710d4b9b3
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Aug 2 11:51:42 2013 +0200

    Added pager for workspaces list + user registration into workspace in admin + tests

commit 6fa8ff8e1ace40af5cf5e3646c127ed90db58aa1
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Aug 2 11:51:42 2013 +0200

    Added pager for workspaces list + user registration into workspace in admin + tests

commit 6468fff0a2edf20cb9e804afd7ea1df7c6a27fec
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 31 11:34:16 2013 +0200

    Updated migration bundle

commit de9ce888bb1c39c42625d8388b061bb7a8c883db
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 31 11:29:36 2013 +0200

    Simplified mapping using default values

commit c52a4664feeb93894cca42e2cb8d081ad44a84ed
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 31 11:29:36 2013 +0200

    Simplified mapping using default values

commit dbeaabca7e72e74161c744b59335a671b7413ed3
Merge: 58c4172 88daa77
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 31 09:37:01 2013 +0200

    Merge remote-tracking branch 'upstream/master' into GUI

commit 88daa7771b489d86a1e2eaf57e8e734a6b99aa72
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 31 09:33:59 2013 +0200

    Submodule Update

commit 485bd0a2adb16f69d0d9b1bf0c8a140bc4e95930
Merge: 3e7bd8d ab095ce
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 31 09:19:06 2013 +0200

    Merge remote-tracking branch 'upstream/master' into GUI

commit 58c4172af7fa62f43f2d3ef5dd638d31235607db
Merge: bab7f03 2691e62
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 31 09:19:06 2013 +0200

    Merge remote-tracking branch 'upstream/master' into GUI

commit 702d67ef445f335733160d89f59b80d625cd10b2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 31 08:34:44 2013 +0200

    Removed outdated generated migrations

commit 399ac882e6128322fa7f49f67fdfec7d0a4b70b9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 31 08:34:44 2013 +0200

    Removed outdated generated migrations

commit 2691e626c01444663b288ee0a8b4bfef9c265f8d
Merge: 9149dbf 286210b
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jul 30 23:30:33 2013 -0700

    Merge pull request #167 from easy-es/forgot-password

    Forgot password

commit df40985702e459f3337913223f4e5b0815eb82a6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 17:24:39 2013 +0200

    Added entity default values and regenerated migrations

commit 906812a2464d59ffaeba74a5512bc0d43182ad5c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 17:24:39 2013 +0200

    Added entity default values and regenerated migrations

commit e20d48c7987523e35bd5e953caedd3d9ce9ce422
Merge: 53211e5 965aeef
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 30 17:07:10 2013 +0200

    Merge branch 'tinymce-bundle-upgrade' of https://github.com/stefk/Claroline into tinymce

    Conflicts:
    	app/config/config.yml
    	composer.lock

commit ce9ce7f878ec83d7613303604143c532bd3665da
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 16:59:10 2013 +0200

    Made fields nullable and regenerated migrations

commit dacfbe888082af2aa5acb481ada9cd81104910a6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 16:59:10 2013 +0200

    Made fields nullable and regenerated migrations

commit ab095ceae6d2607f41d00ecae0721d2094f8370b
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 30 16:57:00 2013 +0200

    checkstyle and translations

commit 286210be4bdf6e99fc13ef0b6278d025ce347775
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 30 16:57:00 2013 +0200

    checkstyle and translations

commit 3e7bd8da648e67f32820f028172498533b7e3333
Merge: a69751f 05e73a1
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 30 16:49:22 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into GUI

commit bab7f03411d6bb187740845b1465a72d36ad95a3
Merge: d3111b8 9149dbf
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 30 16:49:22 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into GUI

commit f6d00f2df28061a241d8f92ea95bb404422bd344
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 30 16:09:09 2013 +0200

    merge with master

commit 1999f50f50b9f3493ce1a086b61c056c52d4d63f
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 30 16:09:09 2013 +0200

    merge with master

commit 701f005960ab7963209d7e459f6334ae88455f76
Merge: a8533c3 05e73a1
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 30 16:08:38 2013 +0200

    Merge remote-tracking branch 'upstream/master' into forgot-password

commit bcae66c498db100ded72c09eb09611600c802610
Merge: f3d56fa 9149dbf
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 30 16:08:38 2013 +0200

    Merge remote-tracking branch 'upstream/master' into forgot-password

commit 3902cdc73b2d8f3c2806b039768ce61f000089f6
Merge: fadf8d7 05e73a1
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 30 16:06:34 2013 +0200

    Merge remote-tracking branch 'upstream/master' into tinymce

commit 53211e59cdad833cebb5771b5faa08e71ed7466a
Merge: bae4eee 9149dbf
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 30 16:06:34 2013 +0200

    Merge remote-tracking branch 'upstream/master' into tinymce

commit 9149dbf491c4eb5b511b0ec0b33113ebed7f22e0
Merge: 7da1f22 8c90a17
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jul 30 07:04:24 2013 -0700

    Merge pull request #170 from solispauwels/bootstrap2

    Twitter bootstrap change of git repository

commit 05e73a11146c4c208046f90e6ebc213b5bdaaef3
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 30 15:21:39 2013 +0200

    Bootstrap update (change repository)

commit 8c90a17b86d83f354324874a47464b1eb749d77a
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 30 15:21:39 2013 +0200

    Bootstrap update (change repository)

commit 9374a5899a19bd408c9eb093f8231ebcd52d7ca4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 14:53:55 2013 +0200

    Fixed many-to-many mapping

commit b23da34a43b282c9ef2ab3f8a365b7e461611542
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 14:53:55 2013 +0200

    Fixed many-to-many mapping

commit 4996a0a77164eca2a5a78c0da41291c230c802d8
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 30 14:35:22 2013 +0200

    Twitter bootstrap change of git repository

commit d3111b892386367eda5b0bf759cfaa953f460e03
Merge: ae38746 7da1f22
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 30 14:05:22 2013 +0200

    Merge branch 'master' of https://github.com/solispauwels/Claroline into GUI

commit 2f70ee71cf98f03e4d3b8ed0af94a870f6f1143e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 13:52:24 2013 +0200

    Fixed constraint names

commit 39f670cede7921c1c50aae54e0ebb3ecffa67a9f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 13:52:24 2013 +0200

    Fixed constraint names

commit 504097c9781735c8873d4ac8824fd59ff955bce2
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 30 13:23:02 2013 +0200

    Bootstrap update version 3

commit 34316f8c66235878cfbca8cfbf7170942c32c532
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 30 13:23:02 2013 +0200

    Bootstrap update version 3

commit a69751f00c07e13200f78ccd65881f30383d35e1
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 30 10:33:19 2013 +0200

    GUI update

commit ae387466c49d560c1c24aabd6066c26cc4ef6119
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 30 10:33:19 2013 +0200

    GUI update

commit 02ddc2be1040665f8bec8a2177b0249f3909d26c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 10:04:47 2013 +0200

    Quick fix allowing old migrations to run along with new ones

commit dd4847ab9717810a1f17f1eb16b8aff548c8595a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 10:04:47 2013 +0200

    Quick fix allowing old migrations to run along with new ones

commit a8533c39b8264dd23d63fdbe3b3d87d9e4bd1728
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 30 10:02:27 2013 +0200

    add translations

commit f3d56fa177522db32facf03a0f2730742b4dab47
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 30 10:02:27 2013 +0200

    add translations

commit 0461477834ae99257a5db8f6dd60ced38cda8d27
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 09:25:11 2013 +0200

    Regenerated migration classes

commit 16aad685cf2477f9ab156425423f66f60a7b9ed0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 09:25:11 2013 +0200

    Regenerated migration classes

commit 3f6e7c32a6b45184bd8d8ff936b7c13ee531566c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 09:16:35 2013 +0200

    Made migration driver-specific

commit b9ad4746971e51eb30a849c33328fe3ae8a0e7dc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 09:16:35 2013 +0200

    Made migration driver-specific

commit a44d98b33cab676d1c31e1989c3e3ff2133dc5da
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 09:15:08 2013 +0200

    Replaced dbal migration by generated migrations classes

commit 7cf0969099bae50843b5530b9dea9b703a2fb954
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 09:15:08 2013 +0200

    Replaced dbal migration by generated migrations classes

commit fc8b1d89fc7c361cba00be3bf3291542667fd8a8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 09:13:12 2013 +0200

    Updated migration bundle

commit 32727044373b62db1792503585778ce0131f74a4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 09:12:52 2013 +0200

    Fixed mapping errors

commit 1241ab8c2f7887c85a5478b42632aeef8a5dd664
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 30 09:12:52 2013 +0200

    Fixed mapping errors

commit 7da1f2278711fd687ffa6297880fde34dad80646
Merge: aa616fd a440659
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jul 29 07:28:38 2013 -0700

    Merge pull request #166 from ALouis38/plugininnova

    Adding submodule Innova/DirectoryBundle

commit a495f7a667cbbcbeae873321963b1ea6ada49c35
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jul 29 16:05:33 2013 +0200

    add formtype

commit bf4f30f46b78b472fb402f1ce721c412e283df13
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jul 29 16:05:33 2013 +0200

    add formtype

commit 965aeefaefa664c6a453eaec59c631aaf2fc1877
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 29 14:33:50 2013 +0200

    Updated tinymce config

commit 86a466fc1a4f9cee857c66cdd5119c7eba6e2c5f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 29 14:33:27 2013 +0200

    Updated tinymce bundle

commit f3eb43ba6fc74464e1da63d787f97d142ded0c79
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 29 13:32:44 2013 +0200

    Synced db mapping

commit 37c53628255b8050a212171ca7429779a4b888d3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 29 13:32:44 2013 +0200

    Synced db mapping

commit befa9a367466975dca2d207c28d506179a4422d9
Merge: c7765dd aa616fd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 29 09:39:57 2013 +0200

    Merge remote-tracking branch 'upstream/master' into migration-bundle-integration

commit c7765dd5604270326e94708cf6821fcd49e8c199
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 29 09:39:35 2013 +0200

    Moved vsfStream to require-dev + updated migration bundle

commit a4406592a96823955a7bb559df91e00290582808
Author: Louis <louis@koala2>
Date:   Mon Jul 29 09:18:21 2013 +0200

    Adding submodule Innova/DirectoryBundle

commit 16c6acd59c098afa2b32ab0ae585237fb8aaecb2
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Jul 26 15:33:58 2013 +0200

    Adding tests for managers.

commit 697e6d237531acd4c1fee3fea79ae725455375ed
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Jul 26 15:33:58 2013 +0200

    Adding tests for managers.

commit d3cf9fd1e8e15c2802787f31a4d373af1d3c9441
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 26 13:17:55 2013 +0200

    Update blog plugin

commit fadf8d723fa3474f724e9fa33a805941d1518ae8
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Jul 26 11:26:00 2013 +0200

    tinymce

commit bae4eee9ea73becc7fbeb730fd457b742eb8b43f
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Jul 26 11:26:00 2013 +0200

    tinymce

commit cad6a0a91cffed029d2761adcbb8af8e50c61681
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 26 09:16:19 2013 +0200

    Deletin ICAPLyon1SimpleTagBundle, tag deal manually in blogBundle more easier to deal, + add config file for blogBundle => need to find a way to do this automatically in the plugin system + update blogBundle

commit c40cc40742e589e6dbc00b885e9075fc27774c43
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 26 09:16:19 2013 +0200

    Deletin ICAPLyon1SimpleTagBundle, tag deal manually in blogBundle more easier to deal, + add config file for blogBundle => need to find a way to do this automatically in the plugin system + update blogBundle

commit aa616fdb9b17a3b0fe88b83d45a33cce66bbcce9
Merge: 8fd1adc c547cfb
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jul 25 23:39:32 2013 -0700

    Merge pull request #158 from easy-es/forgot-password

    Forgot password

commit ccd51fcd5ce3b353b5cbdd9481519ca691491f57
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 26 08:34:59 2013 +0200

    Updated dependencies

commit 38332899b5ca2d85043cb55cf97ffb983ab3b3ef
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 25 15:13:39 2013 +0200

    Refactoring role management for groups in a workspace.

commit 1dc863a9784ed474c5545d385a7c56753fd69222
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 25 15:13:39 2013 +0200

    Refactoring role management for groups in a workspace.

commit e5a9226741f8614fc7a938f4d755a73c807d595f
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 25 14:34:39 2013 +0200

    add constraint email

commit c547cfb7147045c0296d76d0288f03d4f2b4816b
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 25 14:34:39 2013 +0200

    add constraint email

commit fb3119f50e6849c347549714d4c349e19bb97b01
Merge: 05696c3 303eef7
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 25 11:38:35 2013 +0200

    Merge remote-tracking branch 'upstream/master' into workspace-groups

    Conflicts:
    	.gitignore
    	src/core/Claroline/CoreBundle/Controller/Tool/UserController.php
    	src/core/Claroline/CoreBundle/Manager/UserManager.php
    	src/core/Claroline/CoreBundle/Resources/views/Administration/userList.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Administration/usersOfGroupList.html.twig
    	src/core/Claroline/CoreBundle/Tests/Manager/ResourceManagerTest.php
    	src/core/Claroline/CoreBundle/Tests/Manager/RoleManagerTest.php
    	src/core/Claroline/CoreBundle/Tests/Manager/WorkspaceManagerTest.php

commit d44bf3eb5caf0edb9f3272fbdeb82c013d4932e0
Merge: 15d474d 8fd1adc
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 25 11:38:35 2013 +0200

    Merge remote-tracking branch 'upstream/master' into workspace-groups

    Conflicts:
    	.gitignore
    	src/core/Claroline/CoreBundle/Controller/Tool/UserController.php
    	src/core/Claroline/CoreBundle/Manager/UserManager.php
    	src/core/Claroline/CoreBundle/Resources/views/Administration/userList.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Administration/usersOfGroupList.html.twig
    	src/core/Claroline/CoreBundle/Tests/Manager/ResourceManagerTest.php
    	src/core/Claroline/CoreBundle/Tests/Manager/RoleManagerTest.php
    	src/core/Claroline/CoreBundle/Tests/Manager/WorkspaceManagerTest.php

commit 2913501346532b52b1d9f8563f8118a1020075d8
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 25 11:32:06 2013 +0200

    fixed tests

commit d9adfbd0217043f1dd405bf059632929154c26da
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 25 11:32:06 2013 +0200

    fixed tests

commit 05696c307329fc349ec8bd8a0016fd9016ed3431
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 25 11:22:46 2013 +0200

    Reafactoring permissions for user in a workspace.

commit 15d474d6a9c50cfc1247599f6c9849553ffb234f
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 25 11:22:46 2013 +0200

    Reafactoring permissions for user in a workspace.

commit c28c20d6d2181dad95e09e69b7218968fb6c7866
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 25 09:51:18 2013 +0200

    hash_time migration

commit d7f8fae20ac093fce15bd8486fce6b62bd527170
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 25 09:51:18 2013 +0200

    hash_time migration

commit a4daa7e32de31f4688beddefad61a5aea006798b
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 25 09:19:35 2013 +0200

    deleted files

commit f142e37d79e68099f0c12afa0f396cc931e378ae
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 25 09:19:35 2013 +0200

    deleted files

commit 24b2d68cccd2767a3fbe2a5b5b19cdf8e25c45bf
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 24 17:24:34 2013 +0200

    delete old file and checkstyle

commit 6bd1c0a0176acf02e62f0c79d3cae7a06c0672fa
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 24 17:24:34 2013 +0200

    delete old file and checkstyle

commit 3ba2b42dd1a4ec37b53027ef63b6a932bbf67a4a
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 24 17:11:05 2013 +0200

    refactoring

commit 25524767a3e157dd9733c32038028ac7298266dd
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 24 17:11:05 2013 +0200

    refactoring

commit e5c36fc0c408cf358aa8beb50d7163e586486874
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 24 16:39:46 2013 +0200

    change mock implementation

commit 1600aa568f3449e597ad206c39fad847e2313422
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 24 16:39:46 2013 +0200

    change mock implementation

commit 22535cef5690c24e0aea8ae49a0fa0acc281a2ac
Merge: f804f70 303eef7
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 24 16:38:37 2013 +0200

    Merge remote-tracking branch 'upstream/master' into forgot-password

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/AuthenticationController.php
    	src/core/Claroline/CoreBundle/Entity/User.php

commit 3357ed4e731a4bdee653022b0744b52c7725d6a6
Merge: 67b1ed1 8fd1adc
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 24 16:38:37 2013 +0200

    Merge remote-tracking branch 'upstream/master' into forgot-password

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/AuthenticationController.php
    	src/core/Claroline/CoreBundle/Entity/User.php

commit f804f70d0efb786aaf5ecf9e1499c3e53c2d709d
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 24 16:35:04 2013 +0200

    removed unused code + typo

commit 67b1ed1b06b77a39aae0c96b666a206394a9f7f4
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 24 16:35:04 2013 +0200

    removed unused code + typo

commit fd1377550b134be3eccec4aae0a86168da8a0a12
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 24 16:32:20 2013 +0200

    test for forgot password implementation

commit 3efcdad97d5e5936e2adba0faa60295832e7ce42
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 24 16:32:20 2013 +0200

    test for forgot password implementation

commit af22d2b8d58f2d2bea4142fd0ec448f2c1b944cb
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 24 11:57:22 2013 +0200

    Added tests for displayable workspaces repository functions

commit a74dbae82c319e7d5a3ecb4e8d1081100b519b5c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 24 11:57:22 2013 +0200

    Added tests for displayable workspaces repository functions

commit 0ad34b9856f2a2ecc8f85d43c6267c2185a1d5ea
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 24 11:56:27 2013 +0200

    Refactored workspaces list with displayable workspaces only

commit 66fed38300657449a26e858c66d009b968c07d9b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 24 11:56:27 2013 +0200

    Refactored workspaces list with displayable workspaces only

commit 8fd1adc0b0311a94524a4a2a7790be561ef15ac6
Merge: 53f46da e2525b7
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Jul 24 02:14:18 2013 -0700

    Merge pull request #157 from kitan1982/fix-issue-152

    Fix issue 152

commit e2525b7b999eb4255354993dbca09a002d495a96
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 24 10:50:03 2013 +0200

    Submodule update

commit 303eef7b02ce5d7ee78be65299ebcc4811bcc922
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 24 10:47:46 2013 +0200

    Fixed some bugs in resources manager. Closes #152

commit 0938f8c0b63e2df9b305669529eb87bc812fc4ec
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 24 10:47:46 2013 +0200

    Fixed some bugs in resources manager. Closes #152

commit d63c0bb90b573aab3076aa82c82fe39abd7fb59a
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 23 17:26:07 2013 +0200

    fixed bugs

commit af193e082deb1cd36faf4fb0f0af84fb32409f6a
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 23 17:26:07 2013 +0200

    fixed bugs

commit 90e503e29e07975e21a1bdc910facd033e5a7f44
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 23 16:51:06 2013 +0200

    Added migration bundle to kernel

commit 53f46daab001c18c39e4055cd77997740ee2dbf4
Merge: a832e15 a35a5ef
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jul 23 07:44:39 2013 -0700

    Merge pull request #156 from kitan1982/allow-workspace-self-registration

    Allow workspace self registration

commit b98ffa33a32c11239ecd0ae09f5728de3c44e137
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 23 16:34:10 2013 +0200

    Refactored mock calls in WorkspaceControllerTest

commit a35a5ef73429098c30198e88e69742c8c8abed6d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 23 16:34:10 2013 +0200

    Refactored mock calls in WorkspaceControllerTest

commit 7d5ab2085a6be220ef6c5c1f282d5819974c000b
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 23 16:19:49 2013 +0200

    checkstyle missing

commit cd1bc93a45ad03e68c8aa903708563a73288433c
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 23 16:19:49 2013 +0200

    checkstyle missing

commit d14fd1ed8898850fc96df696e732b215cb7f003b
Merge: 96fde23 a5f505e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 23 16:18:23 2013 +0200

    Merge remote-tracking branch 'upstream/master' into allow-workspace-self-registration

commit 0716239c39a606793e952b6aa0f1edd916749b8e
Merge: 911ce8b a832e15
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 23 16:18:23 2013 +0200

    Merge remote-tracking branch 'upstream/master' into allow-workspace-self-registration

commit 96fde23c2be0f0f82b3802d922d4d540b02a4ac0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 23 16:17:52 2013 +0200

    Beginned testing UserController

commit 911ce8bf64820deaed7d30e252a8dfbcd26afb4e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 23 16:17:52 2013 +0200

    Beginned testing UserController

commit a832e154577c8776ac572023bd25fceb2eed05d2
Merge: 201896d 3793459
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jul 23 07:07:53 2013 -0700

    Merge pull request #146 from kitan1982/import-users-from-csv-to-group

    Import users from csv to group

commit 379345917f9aeca25cfe13da13fcab75c3660001
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 23 15:55:03 2013 +0200

    Merge remote-tracking branch 'upstream/master' into import-users-from-csv-to-group

commit e3ca45eb93cf875e977aebbbca3267a3de74ae03
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 23 15:48:12 2013 +0200

    Submodule update

commit a5f505e1dab61ac17a2156d43707cabcc4f49c0d
Merge: 809eaaf 6f3a9c6
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 23 15:47:29 2013 +0200

    Merge remote-tracking branch 'upstream/master' into import-users-from-csv-to-group

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Manager/UserManagerTest.php

commit 5efa9c03a4c5f4778b18d9518aa95f9911aa52fb
Merge: 751d951 201896d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 23 15:47:29 2013 +0200

    Merge remote-tracking branch 'upstream/master' into import-users-from-csv-to-group

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Manager/UserManagerTest.php

commit 3319aa310604b59b4300ad7514308096074ed1f7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 23 15:30:19 2013 +0200

    Added github-protocols setting

commit b75a7366a585011618131ee2b82bdc795cd3608d
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 23 15:28:55 2013 +0200

    checkstyle

commit c28df97b0a5348c3574608f95a9bb85d6a45050f
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 23 15:28:55 2013 +0200

    checkstyle

commit 47b032f8db095712b08f076f6d5e6806f5b7fe52
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 23 15:26:29 2013 +0200

    Added tests for WorkspaceController

commit 0fc1941f2fbf5033b2f963b4a86ac7433de26ee9
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 23 15:26:29 2013 +0200

    Added tests for WorkspaceController

commit dc4860b996123baa048222f57a860b914c190fea
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 23 15:03:35 2013 +0200

    Added migration bundle to dependencies

commit 201896d9937c82f27618c861443fa298d459dd7a
Merge: 399f383 270e325
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 23 05:41:40 2013 -0700

    Merge pull request #155 from stefk/mockery-tests-memory

    Reduced mockery tests memory footprint

commit 6f3a9c683da3905b4cff24f2ec88f7ead546891c
Merge: 2569781 fddb878
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 23 05:41:40 2013 -0700

    Merge pull request #155 from stefk/mockery-tests-memory

    Reduced mockery tests memory footprint

commit 270e325e942578ec300776840c1544af87b1383a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 23 14:30:08 2013 +0200

    Removed call to 5.4 only method

commit fddb87852eadcb3811e90ad71a674207596d5c15
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 23 14:30:08 2013 +0200

    Removed call to 5.4 only method

commit 371674e30b05a288d2091c3c95c36370e1030d84
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 23 14:10:35 2013 +0200

    Added partial mock support

commit 72f3031a67dab9c9a85c373784d9e03e9dc627c0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 23 14:10:35 2013 +0200

    Added partial mock support

commit 131e2160423b05d16441e8be5d5450f7ab7b6d36
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 23 11:43:15 2013 +0200

    Reduced mockery tests memory footprint

commit 9c66c433dadf4f650b1c94237734e6a93cb48e8a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 23 11:43:15 2013 +0200

    Reduced mockery tests memory footprint

commit 3cb5223efcf6e6a25d28bbd9547cdb98f9094fbe
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 23 11:23:42 2013 +0200

    forgot password implementation

commit c573d2931e4735b208b8104da11af23996d85f29
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 23 11:23:42 2013 +0200

    forgot password implementation

commit d724e3975a8e88bffc89c0bc9cddfaeaa53fbb07
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 23 09:33:32 2013 +0200

    Added workspace self-registration

commit a7b8ac25b66490a5a0b211af133aac6a14ca0026
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 23 09:33:32 2013 +0200

    Added workspace self-registration

commit 399f383ca1708da064e2f4e7f07ef5f4c7d1b865
Merge: 4cb10a3 fa73fe1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 23 00:13:17 2013 -0700

    Merge pull request #153 from stefk/restore-demo-fixtures

    Restore demo fixtures

commit 25697813f34202108bcf1bddd67a8d14605db019
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 23 08:41:18 2013 +0200

    Removed commented code and double quotes

commit fa73fe145319fc9c6536e9a09014bfe529656127
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 23 08:41:18 2013 +0200

    Removed commented code and double quotes

commit ac25e785d7591a625520ffe492d369cdd2b1059b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 23 08:37:00 2013 +0200

    Fixed message fixture

commit bcf607941fa6fb93dc21c0836918b8e7533e4527
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 23 08:37:00 2013 +0200

    Fixed message fixture

commit 0d50f1a043af59dcca2643451da96518d0d30d32
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 22 16:43:54 2013 +0200

    Adding method to get all logManager action event

commit 425f71e05a687248f123443ac9de5d25e88628c4
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 22 16:43:54 2013 +0200

    Adding method to get all logManager action event

commit a30294690eafdc9bed1c8d33713e2563d881f43f
Merge: 5daabb3 d1682e9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 22 13:21:26 2013 +0200

    Merge remote-tracking branch 'upstream/master' into restore-demo-fixtures

commit c7305ff621311c857dac39105035614452d0b7fe
Merge: 10edbbd 4cb10a3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 22 13:21:26 2013 +0200

    Merge remote-tracking branch 'upstream/master' into restore-demo-fixtures

commit 315d8914e5103c6d54943358509a8a7a98411904
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 22 11:05:23 2013 +0200

    Added displayable workspaces page + selfRegistration config

commit 4bf8a8c479734ae05687ce66d764d9514f5d36cb
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 22 11:05:23 2013 +0200

    Added displayable workspaces page + selfRegistration config

commit 4cb10a303697f2bac42c4263d27bd1471c8dc69d
Merge: 96c0d87 907e603
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jul 22 01:19:23 2013 -0700

    Merge pull request #151 from solispauwels/GUI

    Default Theme update

commit d1682e9b65d7dd3891c5388e0cbf2f115f037f2e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jul 22 09:43:59 2013 +0200

    Default Theme update

commit 907e60334310c0b20f6e9816167344e673d39b26
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jul 22 09:43:59 2013 +0200

    Default Theme update

commit 96c0d8706d5d5d5af7ac830c9e0350bc24d04832
Merge: d4037b1 6e42742
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 22 00:36:38 2013 -0700

    Merge pull request #150 from stefk/gitignore-fix

    Fixed weird netbeans bug

commit d4037b16a00bad67e272df52e8de178dea46f1c8
Merge: 1063061 125365d
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jul 22 00:27:03 2013 -0700

    Merge pull request #149 from stefk/plugins-update

    Plugins update

commit 6e42742e8bd9c89d7f2e2e8f001cc65c50ed4bdf
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 22 09:26:44 2013 +0200

    Fixed weird netbeans bug

commit 125365d905ff849c11b54b162b6ad4420bd55c7a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 22 09:12:17 2013 +0200

    Submodule update

commit ff9fe8a180c6269babff69f305877d86c4ca4fb9
Merge: df8193b 1063061
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 22 09:01:29 2013 +0200

    Merge remote-tracking branch 'upstream/master'

commit df8193b649cc2e7cec7eda2e99b632cc2ce96cc6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 22 08:59:09 2013 +0200

    Submodule update

commit 83ba81b84a2b41abf671cb32c91f774ca480cb0a
Merge: 6f17542 1063061
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 22 08:54:58 2013 +0200

    Merge remote-tracking branch 'upstream/master' into workspace-groups

commit b1bc09f77f995f18047506a19a124f10a37ad48a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 19 15:06:19 2013 +0200

    Added self-registration in workspace parameters

commit aef2cab7ccd921236d1b52ab0c408a2aeb891694
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 19 15:06:19 2013 +0200

    Added self-registration in workspace parameters

commit 9bf6648afcf0f1e5cc3405c6bd9e805f682f5137
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Jul 19 14:03:34 2013 +0200

    Listing for user and groups per role.

commit 6f1754214af40aecb1114c8843101bbd3515fbbc
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Jul 19 14:03:34 2013 +0200

    Listing for user and groups per role.

commit 68fbed8cf1d7505b4a985fa3189ec44491246692
Merge: e10b668 1063061
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 19 11:53:59 2013 +0200

    Merge remote-tracking branch 'upstream/master' into allow-workspace-self-registration

commit 1063061f1423a9f94d7741dcc45e1233f60cd592
Merge: faca451 09b505c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 19 02:51:50 2013 -0700

    Merge pull request #148 from kitan1982/rss-reader-bugs-fixes

    Submodule update

commit dba0a5cd63da278db604083a5844d3a562484e39
Merge: 57c710a 3d464b5
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 19 11:39:41 2013 +0200

    Merge branch 'master' into open_badge

    Conflicts:
    	.gitignore

commit ffee7bf609ee215f6465c6ff6f309e4e0c828083
Merge: 30746cb faca451
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 19 11:39:41 2013 +0200

    Merge branch 'master' into open_badge

    Conflicts:
    	.gitignore

commit 09b505ca62f7d27328393c57781adf7702d7f346
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 19 11:29:31 2013 +0200

    Submodule update

commit ee460ec6bfc89e884d0e2c3a81d86cb6b23f0886
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 19 10:05:03 2013 +0200

    Refactored AbstractWorkspace entity

commit e10b668ef491d9e3a75f011a436a110fa079680f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 19 10:05:03 2013 +0200

    Refactored AbstractWorkspace entity

commit cdd612e9a8907b078f5fa05495bb027f9c871210
Merge: 8728dd7 3d464b5
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 18 15:47:45 2013 +0200

    Merge remote-tracking branch 'upstream/master' into workspace-groups

commit 2e136dc6c148c27e0001aa9b3df56b2deb9ba5b8
Merge: b631aae faca451
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 18 15:47:45 2013 +0200

    Merge remote-tracking branch 'upstream/master' into workspace-groups

commit 8728dd7da6b27ca457ed9ffff67cf171a90efbb2
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 18 15:46:09 2013 +0200

    Refactoring message/users/groups display tables.

commit b631aae94c919edf3f163e31c2511c7cec2940f9
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 18 15:46:09 2013 +0200

    Refactoring message/users/groups display tables.

commit 809eaafa8c9b75b2d525ce1efdc0f6465306f1b9
Merge: 0be134f 3d464b5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 18 15:04:16 2013 +0200

    Merge remote-tracking branch 'upstream/master' into import-users-from-csv-to-group

commit 751d9511dd833b36dae6420ea467087881d1a35b
Merge: 606a29e faca451
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 18 15:04:16 2013 +0200

    Merge remote-tracking branch 'upstream/master' into import-users-from-csv-to-group

commit 0be134f72343228228178f630eab06e8aaae6c65
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 18 15:03:40 2013 +0200

    Added tests for AdministrationController. Closes #117

commit 606a29ec42cd4e1a8e4d2a4241338d10d2444953
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 18 15:03:40 2013 +0200

    Added tests for AdministrationController. Closes #117

commit 3d464b56bfe3608a0cd5a8ae65be5cd38097faee
Merge: 29bbd96 35e2087
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 18 03:04:32 2013 -0700

    Merge pull request #144 from solispauwels/assetics

    Restructure some web files :D

commit faca451e27988335740fc5ea53443a2ef125e9f7
Merge: 4df303c 15396fb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 18 03:04:32 2013 -0700

    Merge pull request #144 from solispauwels/assetics

    Restructure some web files :D

commit 29bbd96b9852937c19b43772e6d6cf3a15719d65
Merge: 6cdf240 f1633c4
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 18 03:02:10 2013 -0700

    Merge pull request #143 from purplefish32/responsiveiframes

    [WIP] Responsive iframes on the homepage

commit 4df303c46756af3f6eaa4a6b367d7948775b23e3
Merge: c1062a9 368b2a2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 18 03:02:10 2013 -0700

    Merge pull request #143 from purplefish32/responsiveiframes

    [WIP] Responsive iframes on the homepage

commit 35e208707914188c98fcd92b66ffc0788763bda4
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 18 11:50:51 2013 +0200

    Delete entities from another branch

commit 15396fb5df031135544e447f8237ad44c87e814a
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 18 11:50:51 2013 +0200

    Delete entities from another branch

commit 5fe06eefe2acc38a3fda16296f489ffd4b830724
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 18 11:50:14 2013 +0200

    Delete entities from another branch

commit 95b534ed0592a2f5e74ca64c2f652e28967676ef
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 18 11:50:14 2013 +0200

    Delete entities from another branch

commit f1633c4971fdb2aaa6eb46d17ffadd4c073b746a
Author: Donovan Tengblad <purplefish32@gmail.com>
Date:   Thu Jul 18 11:45:05 2013 +0200

    Responsive iframes on the homepage

commit 368b2a27abc3b1961764451e89f3cc387fee9eed
Author: Donovan Tengblad <purplefish32@gmail.com>
Date:   Thu Jul 18 11:45:05 2013 +0200

    Responsive iframes on the homepage

commit 644957301d686c120cdf575dba6298888a3a6063
Merge: 4499212 6cdf240
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 18 11:33:19 2013 +0200

    Merge remote-tracking branch 'upstream/master' into assetics

    Conflicts:
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php

commit 4326da623f6f1be5360a37d4ca0b2204a1c6b189
Merge: d414a3e c1062a9
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 18 11:33:19 2013 +0200

    Merge remote-tracking branch 'upstream/master' into assetics

    Conflicts:
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php

commit 4499212b9c1e8892933dbfd68a47bdb91343d0a2
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 18 11:29:43 2013 +0200

    Restructure some web files

commit d414a3ea6bd4249b4a9c47a4272acb4a4e4cbb54
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 18 11:29:43 2013 +0200

    Restructure some web files

commit 6cdf240c4a49791634e0921f77b6a6d0843beacd
Merge: 0c1113a 5fd574a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 18 01:49:22 2013 -0700

    Merge pull request #141 from easy-es/button-connexion

    close #137

commit c1062a95dc7d27562402e5b0486a2d13a93ff062
Merge: ff1eb81 347a2ed
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 18 01:49:22 2013 -0700

    Merge pull request #141 from easy-es/button-connexion

    close #137

commit 30746cbd836ac01023eb2cfe1003bcba0f7ec7d9
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 18 10:45:08 2013 +0200

    Adding pagination to badge list + refacto repository to take care of the executeQuery option

commit 57c710aa2d34d522922fc0bd8939f2678e195390
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 18 10:44:03 2013 +0200

    Throw exception if setting current page on pager don't work

commit 6f3c1141dfb88c58956ccec983b3768e2d9abf76
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 18 10:44:03 2013 +0200

    Throw exception if setting current page on pager don't work

commit 89595270b256c1e76f1d0d35d7f53a067d15907d
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 18 10:42:41 2013 +0200

    Delete userId from the form as we set the user on the object pass to the form

commit 5fd574ac0f3d24b801d0ce48ed095f5c22e014b0
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 18 10:42:35 2013 +0200

    close #137

commit 347a2edf4dee816aaaae5a0e85f4e2e906fcb43a
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 18 10:42:35 2013 +0200

    close #137

commit c6fc0519d8e5d37a78a6c9e796dd9fc588bd0217
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 18 10:39:12 2013 +0200

    Getting realpath for badge image to display good path if an error occured

commit 32a6375d20112003a50dfa5db472706b48b7ac3c
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 18 10:27:53 2013 +0200

    close #137

commit a7290dacad0b731b28dd5184351c97d5b7f10b57
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 18 10:27:53 2013 +0200

    close #137

commit d5488ef2a50331ed91cd7575ce247d7ec14ceb11
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 18 10:05:16 2013 +0200

    Display error message when badge claimed doesn't exist

commit 4cf37ea21f3e18b1e4a4155c48e0f5172d03d3dc
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 18 10:05:16 2013 +0200

    Display error message when badge claimed doesn't exist

commit 69e8eb129b20faa6965a5a35e18e91bc74e95746
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 18 09:56:02 2013 +0200

    Re-add my_badges link (remove in merge)

commit 5cb5424bac73ca4febd88fcd7fe651e77732a236
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 18 09:56:02 2013 +0200

    Re-add my_badges link (remove in merge)

commit f4ba9213e1e0919d99816fbb9ff6ae2ff74f5dde
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 18 09:39:44 2013 +0200

    Update entities to pass the validation

commit aae9dfc13e4085c17eabdd4e46eae321d015033f
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 18 09:39:44 2013 +0200

    Update entities to pass the validation

commit 294adaa476cd57e45c0c6d909d2328620bb8ffbb
Merge: 67df49e 0c1113a
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 18 09:21:09 2013 +0200

    Merge branch 'master' into open_badge

    Conflicts:
    	app/config/config.yml
    	composer.lock
    	src/core/Claroline/CoreBundle/Entity/User.php
    	src/core/Claroline/CoreBundle/Form/SimpleAutoCompleteType.php
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Form/simple_auto_complete.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Layout/topBar.html.twig

commit 9fde398e8a32a69eacbaf32b20bcb8e7c84884dc
Merge: dbc3ab2 ff1eb81
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 18 09:21:09 2013 +0200

    Merge branch 'master' into open_badge

    Conflicts:
    	app/config/config.yml
    	composer.lock
    	src/core/Claroline/CoreBundle/Entity/User.php
    	src/core/Claroline/CoreBundle/Form/SimpleAutoCompleteType.php
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Form/simple_auto_complete.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Layout/topBar.html.twig

commit ff1eb81faca2fa2166813e248ac58183e4412629
Merge: ad0969b 9fad4fe
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 17 17:35:42 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit ad0969bd7ea9e220048930cf3ac130266f285519
Merge: 8431a58 ab4c1d6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 17 17:33:01 2013 +0200

    Merge branch 'taxonomybundle' of https://github.com/purplefish32/Claroline into
    purplefish32-taxonomybundle

    Conflicts:
    	composer.json
    	composer.lock

commit 0c1113ac6ebddf6f75de1efb81822e2b77e60108
Merge: 1266ec6 999cc32
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 17 08:23:05 2013 -0700

    Merge pull request #140 from stefk/log-manager-bug-fix

    Fixed typo

commit 9fad4fe7ae3a9a82d3821862ec66277123834a5e
Merge: 8431a58 fe6532d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 17 08:23:05 2013 -0700

    Merge pull request #140 from stefk/log-manager-bug-fix

    Fixed typo

commit 999cc32427338e9a9aa5006b8788356b88a4e108
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 17 16:46:00 2013 +0200

    Fixed typo

commit fe6532d74212b5834646f62e2dc99e529d38ce34
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 17 16:46:00 2013 +0200

    Fixed typo

commit 8431a58f2a9b847087fc40410abad63645fab8ba
Merge: 170290f ad16e68
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Jul 17 07:03:02 2013 -0700

    Merge pull request #138 from claroline/blog_plugin

    Blog plugin

commit ab4c1d6b7c44d443fed523c2c1105b4926be8d8d
Author: Donovan Tengblad <purplefish32@gmail.com>
Date:   Wed Jul 17 15:53:54 2013 +0200

    Install TaxonomyBundle via composer

commit 5daabb3a082bf04850a98d37c1ed593b78629e83
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 17 15:40:27 2013 +0200

    Refactored demo fixture

commit 10edbbd8f8aab7f2a7bfbd6c0910dc4dc730b9b8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 17 15:40:27 2013 +0200

    Refactored demo fixture

commit f8d9a56f8f08c8a5cc881f523e36b16cb5a5d161
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 17 15:37:52 2013 +0200

    Refactored use order in UserManager

commit c7c1f3954735d8eedd388868dd00309a7e3ee3e2
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 17 15:37:52 2013 +0200

    Refactored use order in UserManager

commit 73cb8abe0feb12b2876deb44aa6c5423e099173b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 17 15:31:42 2013 +0200

    Added flashbag for users import

commit b77cf2ba4a832041cd0ffe147609d3ae247dde65
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 17 15:31:42 2013 +0200

    Added flashbag for users import

commit ad16e68544479614b87ce8b2ac475ce026cd6497
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jul 17 15:15:07 2013 +0200

    BlogBundle with copy action

commit 6723b0010fdf1ea498639448b76e9774d9172ede
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 17 14:31:40 2013 +0200

    Added remaining tests for UserManager

commit d9dca6830b61951be58f33ddcb806392ed24d1d9
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 17 14:31:40 2013 +0200

    Added remaining tests for UserManager

commit 1266ec682764188a2e366d3909325a14755606fd
Merge: 6c83de2 b3eb517
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jul 17 13:53:55 2013 +0200

    Merge branch 'master' into blog_plugin

commit 6b4f66a75c17320583dde1e047ee1c8e74c24ffe
Merge: 16f0de2 170290f
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jul 17 13:53:55 2013 +0200

    Merge branch 'master' into blog_plugin

commit d193f3086aa600db2ab21e59449877e3be47d239
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 17 11:46:44 2013 +0200

    Added tests for GroupManager

commit 05316e3115dceff4f8f98c31d793a9e97ed57636
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 17 11:46:44 2013 +0200

    Added tests for GroupManager

commit 7a4b322a1d0fd8c0ecda863115efb240893a1502
Merge: ee327c0 b3eb517
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 17 10:53:15 2013 +0200

    Merge remote-tracking branch 'upstream/master' into userprofile

commit f94b0bfaa862803d310dfead4df65fdceec820f0
Merge: 3a8131c 170290f
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 17 10:53:15 2013 +0200

    Merge remote-tracking branch 'upstream/master' into userprofile

commit ee327c02bc6658dd79eac5ea23549463c082ea4d
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 17 10:51:52 2013 +0200

    Node entities draft

commit 3a8131cba37507020a8494ce28536edbbbb04233
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 17 10:51:52 2013 +0200

    Node entities draft

commit 0e76e030eb706992cc137618806a1c0e60709d30
Merge: 0ee6ea7 b3eb517
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 17 10:18:14 2013 +0200

    Merge remote-tracking branch 'upstream/master' into import-users-from-csv-to-group

    Conflicts:
    	src/core/Claroline/CoreBundle/Entity/Group.php
    	src/core/Claroline/CoreBundle/Manager/GroupManager.php

commit 0ed2087e15082a1ee8ddc1f534ad209e1903ed8c
Merge: 54d39bd 170290f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 17 10:18:14 2013 +0200

    Merge remote-tracking branch 'upstream/master' into import-users-from-csv-to-group

    Conflicts:
    	src/core/Claroline/CoreBundle/Entity/Group.php
    	src/core/Claroline/CoreBundle/Manager/GroupManager.php

commit 0ee6ea7860a1ec8e18035be93f5565449394ffda
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 17 10:14:50 2013 +0200

    Added users import into a group + some tests

commit 54d39bd89970524b880359e1c7fae9e6678f81e3
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 17 10:14:50 2013 +0200

    Added users import into a group + some tests

commit 2402e0ee44a2d2d35c0439365c91ee81d1bcf8ce
Merge: 272093a b3eb517
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Jul 17 10:04:40 2013 +0200

    Merge remote-tracking branch 'upstream/master' into workspace-groups

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/Tool/WorkspaceParametersController.php
    	src/core/Claroline/CoreBundle/Manager/RightsManager.php
    	src/core/Claroline/CoreBundle/Tests/Manager/ResourceManagerTest.php

commit a5f78460118f4fe2489758a5fba49fa8f0e4a427
Merge: 2313744 170290f
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Jul 17 10:04:40 2013 +0200

    Merge remote-tracking branch 'upstream/master' into workspace-groups

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/Tool/WorkspaceParametersController.php
    	src/core/Claroline/CoreBundle/Manager/RightsManager.php
    	src/core/Claroline/CoreBundle/Tests/Manager/ResourceManagerTest.php

commit 170290f9a0d343669816f2c03f0ff33142690d92
Merge: 7524aa9 31bb9b5
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 17 01:02:10 2013 -0700

    Merge pull request #136 from stefk/checkstyle

    Checkstyle

commit 272093a85b7e2f13a23226ef8f9a20e60a4801b2
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Jul 17 10:00:45 2013 +0200

    Roles can be created in a workspace.

commit 23137449c404081712f6c0a101f714cbbd4a5ddd
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Jul 17 10:00:45 2013 +0200

    Roles can be created in a workspace.

commit b3eb517e9439081aa1ae1eb8d49acab67a056b69
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 17 09:56:42 2013 +0200

    Corrected doc and quote usage

commit 31bb9b593e7d5dbc640d5ebdaeb2c6844ff064da
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 17 09:56:42 2013 +0200

    Corrected doc and quote usage

commit ee7ceec9bbef4966764b108daa5d400d7d3faf1a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 17 09:50:26 2013 +0200

    Checkstyle corrections

commit 6ee8b8e7c0ee438b8adb022491dfcfe4c198610e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 17 09:50:26 2013 +0200

    Checkstyle corrections

commit 6c83de2d0b2409a2435659999d7c42ee9a171947
Merge: 6849166 d62b55b
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 16 17:30:17 2013 +0200

    Merge branch 'master' into blog_plugin

commit 16f0de2cefd734d1d8d2b62f2f72bf364a1f8bb0
Merge: 4a99287 7524aa9
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 16 17:30:17 2013 +0200

    Merge branch 'master' into blog_plugin

commit 3862b4308de1a91737f06640beba914eb4b6818a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 16 17:19:03 2013 +0200

    Applied php-cs-fixer

commit 3c213a554b100ab892f1527e1da630ecb466191b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 16 17:19:03 2013 +0200

    Applied php-cs-fixer

commit 7524aa9155d881fc6f3ed4fcfc27676323cc7b45
Merge: cf0042d 6740d97
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 16 08:09:06 2013 -0700

    Merge pull request #135 from stefk/dispatcher-doc

    Dispatcher reorganization and documentation

commit d62b55bf77b65e5e9b76df12f513f2cc91703ea4
Merge: 408de65 b85919f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 16 08:09:06 2013 -0700

    Merge pull request #135 from stefk/dispatcher-doc

    Dispatcher reorganization and documentation

commit 6740d972502a3d43a7ad83b1c84aacace06bd966
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 16 16:49:27 2013 +0200

    Fixed typo

commit b85919fb4c8e2fe5fb8b693fcb3a8c87f83ab01b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 16 16:49:27 2013 +0200

    Fixed typo

commit a2ff9e5ce2bb882d19d974662b88ee0662efc396
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 16 16:47:51 2013 +0200

    Reorganized and documented strict dispatcher

commit 06c08a2346d7f39c1fac32fc56a9d4df218c5b89
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 16 16:47:51 2013 +0200

    Reorganized and documented strict dispatcher

commit 408de651add6b3a3113cb1779e4059d0c6d2a916
Merge: 2eb0360 826eeda
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jul 16 05:56:01 2013 -0700

    Merge pull request #134 from ngodfraind/workspace-export-refactoring

    WorkspaceManager tests.

commit cf0042dc61163cf27e726a8dc801017df662fc84
Merge: 9a38e75 39261d6
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jul 16 05:56:01 2013 -0700

    Merge pull request #134 from ngodfraind/workspace-export-refactoring

    WorkspaceManager tests.

commit 39261d6d21b5f2ac87e350027d765a4634e76b1b
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Jul 16 14:47:56 2013 +0200

    Updating submodules.

commit 826eeda74ab51685ec93ade9ce749d6c7c116e03
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Jul 16 14:07:43 2013 +0200

    WorkspaceManager tests.

commit 9b97721c289019a363d31a113c22e2bf752b4965
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Jul 16 14:07:43 2013 +0200

    WorkspaceManager tests.

commit 2eb0360cde2bd45b7675efb0c205c2c691f707a3
Merge: 23e2628 82488de
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jul 16 02:55:05 2013 -0700

    Merge pull request #122 from solispauwels/HomeController

    Home Contoller fix small bug

commit 9a38e752b661687049d9aa6c0652498eb5c75dd2
Merge: 5cb9eda 34d8740
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jul 16 02:55:05 2013 -0700

    Merge pull request #122 from solispauwels/HomeController

    Home Contoller fix small bug

commit 23e262820fca136fe8586c3fcfdf7348cdd8e5ff
Merge: 91a4905 cc0dff5
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jul 16 02:54:46 2013 -0700

    Merge pull request #120 from kitan1982/refactoring-writer-and-genereic-repository

    Refactoring writer and generic repository

commit 5cb9eda46f05da190416b5c268af83e792181471
Merge: 86bdadd ed8c9b5
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jul 16 02:54:46 2013 -0700

    Merge pull request #120 from kitan1982/refactoring-writer-and-genereic-repository

    Refactoring writer and generic repository

commit 4a99287bafcf114c2a40f2e9eadf6fd4bee0da77
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 16 11:44:45 2013 +0200

    Update blogbundle with default topbar

commit cc0dff5ca5a22ea536cc29139bc6be255b183d49
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 16 11:39:10 2013 +0200

    Updated phpunit.xml + set var  to private in RepositoryTestCase

commit ed8c9b58bf19f6cfdb5cb0a17d6371feb300027f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 16 11:39:10 2013 +0200

    Updated phpunit.xml + set var  to private in RepositoryTestCase

commit 82488defe5f8c962f2f9c585aff0009a91d5db4c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 16 11:38:06 2013 +0200

    Home Contoller fix small bug

commit 34d87405cd97a1cc3b6ac89a53c021e4121696fe
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 16 11:38:06 2013 +0200

    Home Contoller fix small bug

commit 914faede97e59fae040f6811b96a17810d9645fc
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 16 11:24:43 2013 +0200

    Unskipped tests in ResourceTypeRepositoryTest and ToolRepositoryTest

commit de7eca65cca2f3bc83bb84acbd0b625434a3e81c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 16 11:24:43 2013 +0200

    Unskipped tests in ResourceTypeRepositoryTest and ToolRepositoryTest

commit 9e065361227470257a20d135cd3257551197d057
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 16 10:55:14 2013 +0200

    Removed Database folder and refactored accordingly

commit f55d35942ff51720fbbf57e5cbf7a69860c2cdf0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 16 10:55:14 2013 +0200

    Removed Database folder and refactored accordingly

commit 91a49050edcff9c3a142cde247b5240b4eb94125
Merge: ff26e0d 1dc300f
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jul 16 01:50:50 2013 -0700

    Merge pull request #115 from claroline/refactoring-for-unit-tests-jorge

    Refactoring for unit tests jorge

commit 86bdaddb3437936e1de91358b13f86ac85f59a9e
Merge: 1ba314b 9996216
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jul 16 01:50:50 2013 -0700

    Merge pull request #115 from claroline/refactoring-for-unit-tests-jorge

    Refactoring for unit tests jorge

commit 1dc300f976d0fa236963514d31978d66bd8fea88
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 16 10:42:14 2013 +0200

    HomeControler update

commit 999621640522bca4a9f0260a05e0fb7f205cd91e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 16 10:42:14 2013 +0200

    HomeControler update

commit a006c81fc93f43b4d5455de378bc745ce73a5a56
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 16 10:25:25 2013 +0200

    Removed remaining calls to claroline.database.generic_repository service

commit 22c9e2711df2d45a77b8d0213c75528d416dd2ea
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 16 10:25:25 2013 +0200

    Removed remaining calls to claroline.database.generic_repository service

commit d91e674d20f2d0c23840cd8d880b1c0c2e5637ec
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 16 10:16:25 2013 +0200

    HomeControler doc update

commit bfdf91c66e7b1d897d6c0aca21f617ebc15d1dc6
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 16 10:16:25 2013 +0200

    HomeControler doc update

commit ff26e0da85d0f93c38f32719623c1b21f3413ae4
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 16 10:07:00 2013 +0200

    Remove caret on login link

commit 1ba314bd147ceb576655836e43c0666e842ba7a9
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 16 10:07:00 2013 +0200

    Remove caret on login link

commit 013036bdf4c216a62a29d463f2bad4c9fc51c947
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 16 10:05:49 2013 +0200

    Removed remaining call to claroline.database.writer service

commit b951b3ca8821f4cafe07133a3ae194219fd7b886
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 16 10:05:49 2013 +0200

    Removed remaining call to claroline.database.writer service

commit 7e06e6cee2eae6f367e73aa1dc1b3b5620ee3529
Merge: 631f410 a91ec4d
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 16 10:03:09 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/ResourceManager.php
    	src/plugin/UJM/ExoBundle

commit ce267e5614da911dcd335891df65af2659e5d9c2
Merge: 9ffa5a0 9ec351d
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 16 10:03:09 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/ResourceManager.php
    	src/plugin/UJM/ExoBundle

commit 68491663603938fc86b240516cb3469725843814
Merge: 15e75e3 a91ec4d
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 16 09:57:46 2013 +0200

    Merge branch 'master' into blog_plugin

    Conflicts:
    	app/AppKernel.php
    	app/config/config.yml
    	composer.json
    	composer.lock
    	src/plugin/Claroline/RssReaderBundle
    	src/plugin/ICAP/ReferenceBundle
    	src/plugin/UJM/ExoBundle

commit f44c4fa49b02ea86eab2ea0fca1810fdda577b88
Merge: f7f531f df1f49b
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 16 09:57:46 2013 +0200

    Merge branch 'master' into blog_plugin

    Conflicts:
    	app/AppKernel.php
    	app/config/config.yml
    	composer.json
    	composer.lock
    	src/plugin/Claroline/RssReaderBundle
    	src/plugin/ICAP/ReferenceBundle
    	src/plugin/UJM/ExoBundle

commit 631f41077e6c86e82fac21b96aada1c847ca181d
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 16 09:57:34 2013 +0200

    Home test update + replace writer to Persistence obj

commit 9ffa5a0f9c59f6fa107de195401a90af482984aa
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 16 09:57:34 2013 +0200

    Home test update + replace writer to Persistence obj

commit 9ff7db59f4dd51c6117f7ab2d23ea72a17aad043
Merge: a91ec4d fe7ad69
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jul 16 00:42:30 2013 -0700

    Merge pull request #112 from kitan1982/test-remaining-workspace-tag-repositories

    Test remaining workspace tag repositories

commit bb91a1b6dfe3479e3442ac1869970707f2a5a32c
Merge: df1f49b 538eede
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jul 16 00:42:30 2013 -0700

    Merge pull request #112 from kitan1982/test-remaining-workspace-tag-repositories

    Test remaining workspace tag repositories

commit fe7ad6905422df6e3eef2a6b33c621c67a8bbd99
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 16 09:26:28 2013 +0200

    Refactored WorkspaceTagHierarchyRepositoryTest

commit 538eede09a86a98615c05a5f58dbf92aee50d258
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 16 09:26:28 2013 +0200

    Refactored WorkspaceTagHierarchyRepositoryTest

commit 57148f31eca43e94e7d062fee012fe406194c307
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 16 09:14:46 2013 +0200

    Refactored RelWorkspaceTagRepositoryTest

commit 29d9f72b5984676e5c06d542957bab73d84209e9
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 16 09:14:46 2013 +0200

    Refactored RelWorkspaceTagRepositoryTest

commit df1f49b8239dc360a3f5208910c100f100e73428
Merge: 2cce925 6f43d15
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jul 15 23:31:18 2013 -0700

    Merge pull request #108 from stefk/sso-bundle

    Added sso bundle

commit 6f43d1590e710cd8ba6630ba6558d7bbc04b2297
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 17:55:15 2013 +0200

    Added sso bundle

commit f7f531f43ed04010d09800c78ac883f418a84efc
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 15 17:39:37 2013 +0200

    Update BlogBundle

commit 15e75e3bd897b0fad2494e80b3e5e67984c54c9b
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 15 17:38:29 2013 +0200

    Update vendors + deleting ckeditorBundle as we use tinymce + add translation for simplettagbundle in messages.**.yml

commit dd1df37df53852294ca85dd7c596d146cc63ecfc
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 15 17:38:29 2013 +0200

    Update vendors + deleting ckeditorBundle as we use tinymce + add translation for simplettagbundle in messages.**.yml

commit 2cce925971bc502d8a8352b2cf41dcff85f3abd6
Merge: 5f0563b 9ec351d
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jul 15 08:34:27 2013 -0700

    Merge pull request #107 from claroline/refactoring-for-unit-tests

    Refactoring for unit tests

commit 5f0563b6e6cfe1d574b54c9fc0ec8cc7df998337
Merge: c63e6dd 3f06dc8
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jul 15 07:56:42 2013 -0700

    Merge pull request #106 from kitan1982/master

    Fixed bug in Rss configuration

commit a91ec4d84e485dd56aada5419a4a3059aa426d5b
Merge: 3b6a15e cbc0e91
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 16:55:49 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 9ec351db886e493a56d9670752452905b100cb39
Merge: 3011efd 5f0563b
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 16:55:49 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 3b6a15eaef84a9452a34226e57b794e875c68df8
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 16:54:44 2013 +0200

    Using instanceof instead of get_class

commit 3011efda9adf8571d60cd870189e47cd125a42b6
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 16:54:44 2013 +0200

    Using instanceof instead of get_class

commit c63e6ddfc946bb5879789637b442893800e8366e
Merge: eff4cc0 2372050
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jul 15 07:49:16 2013 -0700

    Merge pull request #105 from claroline/button-connexion

    change the button connexion

commit 4eeb2e76436c5b908b77ce166695938a3cf9c07f
Merge: b325e6e f6af80d
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 16:46:16 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

    Conflicts:
    	src/plugin/Claroline/RssReaderBundle

commit 4d193c0f6b91456fc5c266d1132bc68d2dcea9cd
Merge: 12fb22c eff4cc0
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 16:46:16 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

    Conflicts:
    	src/plugin/Claroline/RssReaderBundle

commit b325e6e19441ec05edf6ed2d15fd1d2c06dd7b86
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 16:39:28 2013 +0200

    Fixing resource rights editions for the root.

commit 12fb22cdd8059c3b9bab9b4cbcec3678d19052b2
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 16:39:28 2013 +0200

    Fixing resource rights editions for the root.

commit 2372050112a07226c5766f3db786a93bc2ccfbef
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jul 15 16:35:36 2013 +0200

    Reverted submodule reference (2)

commit 17ebab78fc2f3bb166d67ae7f3d813a03f1fb727
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jul 15 16:31:56 2013 +0200

    Reverted submodule reference

commit 3f06dc83269ff99358d34365d6d5704069d13c48
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 16:25:12 2013 +0200

    Submodule update

commit 7facdb91531a63e55419675a597c1e9066bf18a5
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jul 15 16:21:13 2013 +0200

    submodule update

commit 1c3ce8be9cb4b79e9b7e5513bf670b0d604e46be
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 16:08:56 2013 +0200

    Fixing workspace import/export.

commit dbc592040d6d10eaa42f85effbd2c3df4507312a
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 16:08:56 2013 +0200

    Fixing workspace import/export.

commit 1360784cfa9b62c96ae4637ca5b9a028e1ea150e
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jul 15 15:54:04 2013 +0200

    merge

commit cbc0e91cd37ff440dc8f6f5c14379dc05eaf0a36
Merge: c93f18e f6af80d
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jul 15 15:52:51 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into button-connexion

commit 095465258a4b60e031d25fe794f1d181893174f2
Merge: 05032dc eff4cc0
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jul 15 15:52:51 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into button-connexion

commit c93f18e0893e1c4213ada55017d98fd037e1feec
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jul 15 15:49:11 2013 +0200

    fixed bug

commit 05032dc3f59d9c0a0bf47fca939cdf1901fdc728
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jul 15 15:49:11 2013 +0200

    fixed bug

commit 89c062adba39b40419e042b0f2349505553cfb14
Merge: 4dff3a1 904048a
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 15 15:26:11 2013 +0200

    Merge branch 'master' into blog_plugin

    Conflicts:
    	composer.lock
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php
    	src/plugin/Claroline/ExampleBundle
    	src/plugin/Claroline/ForumBundle
    	src/plugin/Claroline/RssReaderBundle
    	src/plugin/Claroline/ScormBundle

commit a1311d8acc9a2eaec1a5323ab10605499eb82528
Merge: d9c44cb f28d060
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 15 15:26:11 2013 +0200

    Merge branch 'master' into blog_plugin

    Conflicts:
    	composer.lock
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php
    	src/plugin/Claroline/ExampleBundle
    	src/plugin/Claroline/ForumBundle
    	src/plugin/Claroline/RssReaderBundle
    	src/plugin/Claroline/ScormBundle

commit eff4cc0d0520ccec0ea79618f040fc660fa34357
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 15:00:35 2013 +0200

    Fixed typo

commit 4edb0462fa88bcaedb55b0f4c511ff5744a017f0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 14:55:29 2013 +0200

    Removed plugins/fixtures from install (closes #34)

commit f431878619e428623e6c6c058ff3d93b7d4ab223
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jul 15 14:53:44 2013 +0200

    change the button connexion

commit 46a0f64fa03d17acbcb27429b5590b2ce7025e87
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jul 15 14:53:44 2013 +0200

    change the button connexion

commit 67df49e6ce0b6467c92982b39b0d1d46fc503f25
Merge: 166be85 904048a
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 15 14:42:26 2013 +0200

    Merge branch 'master' into open_badge

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ProfileController.php
    	src/core/Claroline/CoreBundle/Entity/User.php
    	src/core/Claroline/CoreBundle/Repository/GroupRepository.php

commit dbc3ab224f31225fd5af66423b3d42f5d16d61c9
Merge: 8b0d694 f28d060
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 15 14:42:26 2013 +0200

    Merge branch 'master' into open_badge

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ProfileController.php
    	src/core/Claroline/CoreBundle/Entity/User.php
    	src/core/Claroline/CoreBundle/Repository/GroupRepository.php

commit dec3eca40ca5755fbf1c9fda6f4c6d3ff2484b01
Merge: f28d060 4a747fd
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jul 15 05:33:13 2013 -0700

    Merge pull request #104 from claroline/master-bug-fixes

    Master bug fixes

commit 4a747fdabb4d834b7aefc0b6452f6f4634404e7a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 14:21:17 2013 +0200

    Changed ant job config

commit 23a49de9b9625e43fe69365408f64e0c4aff40ab
Merge: f28d060 30d6fab
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 14:01:19 2013 +0200

    Merge branch 'refactoring-for-unit-tests'

commit f28d060fc07f8437a72a5be7a85bad518110a886
Merge: cf407c1 287320c
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jul 15 04:37:43 2013 -0700

    Merge pull request #103 from claroline/travis-integration

    Travis integration

commit 287320c69c7fed538dd8da115d8aefcea2384493
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 13:27:39 2013 +0200

    Added postgres to travis config

commit bae5b321db1d15436d5a60d61b8bfcddc92137ad
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 12:01:23 2013 +0200

    Fixed parameters.yml path

commit d0b1833a8844040203d02bcbe14677ce2c382e36
Merge: f25e341 bb909fc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 11:57:20 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into travis-integration

commit 166be858c8df69aa7fd96590e74de8bc8df91b3d
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 15 11:55:25 2013 +0200

    Adding back link on profile badge view page

commit 8b0d694c9065a0a4293ea2a90d1a73a6b8db6670
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 15 11:55:25 2013 +0200

    Adding back link on profile badge view page

commit f6af80deaa7bc8af8d2f498e17fa07c08d1c3a80
Merge: c2be984 904048a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 11:53:46 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 30d6fab72cfe5c8aa978ce5c50bae698081b71cd
Merge: d24d9ce bb909fc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 11:53:46 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit f25e341d86a0ed0c5773f539727c3f3344d6bc81
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 11:53:09 2013 +0200

    Updated travis config

commit bb909fc5d282dc34640b99ee5a3265a44445e009
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 11:52:22 2013 +0200

    Submodule update

commit 904048a3359b5852ceff4a9afdc9e731896d71a1
Merge: 5a122e3 4020cc1
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 11:40:22 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit ecec3dc99042cbdd30799c7d01a27419ec487a80
Merge: 5bc9a4e 59b3ba9
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 11:40:22 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 5a122e3c87a757f1b3c3a85637e510c7c8f2e33e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 11:39:21 2013 +0200

    Refactored modal behavior when adding/removing 0 user/group

commit 5bc9a4e14f0acd30ebe2ca3c3e70e4cbf3e30f6d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 11:39:21 2013 +0200

    Refactored modal behavior when adding/removing 0 user/group

commit 4020cc160aa06f403c5a67ebd637f491f42cfbad
Merge: f82a4dc ffebe6e
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 11:37:13 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 59b3ba9a9070cbc3713c0e1db2625ae03207477e
Merge: a11c9ab 132764c
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 11:37:13 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit f82a4dca91ece378777e882c5faa671c5580d038
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 11:34:20 2013 +0200

    Fixing workspace export.

commit a11c9abe0616be50e5a681b0b0f709c7fba59f65
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 11:34:20 2013 +0200

    Fixing workspace export.

commit 89e3a7fb2821abd50456980ed3c99a48885877b6
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 15 11:28:16 2013 +0200

    Display badge from a profile and from the app differently + refacto unaward action (remove with entity manager instead of delete DQL request)

commit 1b81a41ea844b9386e40d9b7b1c6eb497eb2c738
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 15 11:28:16 2013 +0200

    Display badge from a profile and from the app differently + refacto unaward action (remove with entity manager instead of delete DQL request)

commit ffebe6ee1d22c0c4e0944da07ae0dbd52e9dbe1f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 11:24:36 2013 +0200

    Fixed bug due to refactoring with ObjectManager in WorkspaceTag

commit 132764c05bca011a124ec0db8151de17f65bc985
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 11:24:36 2013 +0200

    Fixed bug due to refactoring with ObjectManager in WorkspaceTag

commit d24d9ce74be486fc214ceeaf20797c7c63917cfc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 11:13:34 2013 +0200

    Submodule update

commit 5e18285f6c51da3e91df12b427381c19bea6c4dd
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 11:12:54 2013 +0200

    Fixed bug in platform configuration form

commit 901d9a3a24f589d9abd7d858c6390e2adf15654b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 11:12:54 2013 +0200

    Fixed bug in platform configuration form

commit c2be984ab9979b2e62c5d7d1ce47c177c0178882
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 11:10:43 2013 +0200

    Fixed default admin config bug

commit 25c5f566cfcd20f913277b37546685211b8d8502
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 11:10:43 2013 +0200

    Fixed default admin config bug

commit 051aa28fb0cf103864ee8becdba80582b53d6762
Merge: 3c97997 a013533
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 10:53:06 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 3c97997e461681c892bef4521744cd070e5a1edb
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 10:52:50 2013 +0200

    Submodule update

commit 38b1cc3fe01ac29993b39e62eed956924462dcf7
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 10:39:57 2013 +0200

    Fixing 2 tests (empty activity and resource creation form error)

commit 470642499768dc8b8620b927b2747da7a1f96ecf
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 10:39:57 2013 +0200

    Fixing 2 tests (empty activity and resource creation form error)

commit 750c63eba32e0a3d15f68790938474e7a7807026
Merge: a78695e 639ef18
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 10:39:14 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit a0135335aa731fe83b61bcbf6dd305640038ad0f
Merge: da1f15a 738c9f6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 10:39:14 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit a78695e866346cf28190d9e7b8528285d4088e01
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 10:38:58 2013 +0200

    Fixed workspace export bugs

commit da1f15a1e8c89564429171031393d448fa88ed9d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 10:38:58 2013 +0200

    Fixed workspace export bugs

commit 738c9f61033128b5484d8725d9e73b3fd5496a52
Merge: 34e0342 3bd1ea2
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 10:30:25 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 639ef182fe5aa9bb8dafad946de5cc0a15a5f68f
Merge: b24ab1c f261b14
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 10:30:25 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 34e0342bd4e8015a4b52a8ce323982e862c09072
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 10:30:10 2013 +0200

    Fixed bug in configuration of latest activy widget

commit b24ab1c7ca54aa0eee956b0ec74cc3598b277f1d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 10:30:10 2013 +0200

    Fixed bug in configuration of latest activy widget

commit f261b149749cbc29fdd28003ec5fd0f6af6e4efa
Merge: 7ff955c 95132d7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 10:25:50 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 3bd1ea2536a529c70e0501b304395570d6355f43
Merge: 608ee8b f1ca4fe
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 10:25:50 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 7ff955cdfba3613ae1b462c0bc185a4776ca48e1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 10:24:49 2013 +0200

    Fixed wrong mocked class

commit 608ee8bba56b3b836ea79591dfded3b0983f7b9b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 10:24:49 2013 +0200

    Fixed wrong mocked class

commit f1ca4fe30e90c674516889425b8c8d3e8c511d65
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 10:16:21 2013 +0200

    Submodule update

commit 6f755d92b6ea57de50c1206c94ee86260703c6da
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 10:06:04 2013 +0200

    Submodule update

commit 4a71ddbceb3b2f9ac04f75816f145610afcb37bb
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 15 10:04:42 2013 +0200

    Avoid user to claim a badge they already own

commit b403bbf5b108be01b5fec975916bd83595f8675c
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 15 10:04:42 2013 +0200

    Avoid user to claim a badge they already own

commit 95132d7eea1f5e87769b70ba7e3a3bcaf3f0e6fc
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 09:42:14 2013 +0200

    Fixed bug after refactoring of AnalysticsManager in administration

commit f12c4112ee3d8fade8a4e460ae4b50bab946195e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 09:42:14 2013 +0200

    Fixed bug after refactoring of AnalysticsManager in administration

commit 1c24c211285d339ab0d53ed6f83136caafe6a542
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 09:35:54 2013 +0200

    Fixed bug when adding users to a workspace

commit 71843a0f45a1a036c55b0b1a9226b1d00d5066ca
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 09:35:54 2013 +0200

    Fixed bug when adding users to a workspace

commit c67a4dad98ccd10ec9edf02c50979244b63ac7ca
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 15 09:35:04 2013 +0200

    Correct inclusion of controller render in badge edit page

commit ea2f7e3f60009dc1b467f9a12bf39abc57204605
Merge: 380b333 1d5c77d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 09:22:26 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/GroupManager.php

commit ffe82d22063546c3f940058974f89fa90e02b296
Merge: 1d8ea25 e9dacbf
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 09:22:26 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/GroupManager.php

commit 5b59323912018af0a31dc67a1841cf85e900bd65
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 09:18:30 2013 +0200

    Removed test case

commit 216f7a1806844ab9c5a292675ec2b27d0bd36446
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 15 09:18:30 2013 +0200

    Removed test case

commit 380b3337462e749d54cedd64a7f55ba8068d7446
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 09:16:57 2013 +0200

    Fixed bug when adding groups to a workspace

commit 1d8ea259f12edaf7b8b723a6cea73f16518a9f7b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 15 09:16:57 2013 +0200

    Fixed bug when adding groups to a workspace

commit 1d5c77d4380f38ad1029435dd5a528b1a013e5af
Merge: b09ae9c 2920db2
Author: stefk <stephaneklein221@gmail.com>
Date:   Sun Jul 14 23:58:21 2013 -0700

    Merge pull request #102 from claroline/refatoring-for-unit-test-nico

    Using Persistence/ObjectManager in Manager/*

commit e9dacbf4ca4d1d50ce25b9abbb80b78c03a9c040
Merge: 70ec71b 138dcc5
Author: stefk <stephaneklein221@gmail.com>
Date:   Sun Jul 14 23:58:21 2013 -0700

    Merge pull request #102 from claroline/refatoring-for-unit-test-nico

    Using Persistence/ObjectManager in Manager/*

commit 2920db222d95fa87a1f2c22719170db4766ba221
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 08:48:54 2013 +0200

    Adding missing analytics manager.

commit 138dcc53eacd4b23beb53bb57f06536512a5c4d9
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Mon Jul 15 08:48:54 2013 +0200

    Adding missing analytics manager.

commit b09ae9c6151c17e37994eed37e4982a54602a53b
Merge: c07d434 66ffded
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 12 16:11:09 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 70ec71ba268d6d344d9db75cad02c1f088806b6b
Merge: 953415d 577e4cc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 12 16:11:09 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit c07d434281fc6263a3226953c5431f16f7ac0189
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 12 16:07:59 2013 +0200

    Reorganized fixtures

commit 953415dbae03960e7e5d253a48eddb4a7d636176
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 12 16:07:59 2013 +0200

    Reorganized fixtures

commit c9f4e6fdcf430cbdd07e3de7d88b95d2ebfa00d8
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Jul 12 15:41:10 2013 +0200

    Using Persistence/ObjectManager in Manager/*

commit cb5a9c7ce21b014df6e1158adbed7d140d4829c6
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Jul 12 15:41:10 2013 +0200

    Using Persistence/ObjectManager in Manager/*

commit 66ffded97dd5d017d5b0f57e923b36b48cd76d48
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 12 15:34:59 2013 +0200

    Fixed bug in workspace display logs tool

commit 577e4ccd8fc8287d9e4f3fbb55f8dedb8187ec19
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 12 15:34:59 2013 +0200

    Fixed bug in workspace display logs tool

commit f1ea18d1748f8d89114eff4d6c453fabcfeda4a2
Merge: a2ed4d5 58f658b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 12 15:30:20 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 28616ccd11a85dab21f6b57b1788c9fa5cdcd57b
Merge: 2c6552a 7ff4a19
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 12 15:30:20 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit a2ed4d5a77616a847c36cd023edf1053642fb732
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 12 15:30:01 2013 +0200

    Fixed non-working cancel button when adding users to a group

commit 2c6552ab125fd1a8b52307425a181b43260b69a5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 12 15:30:01 2013 +0200

    Fixed non-working cancel button when adding users to a group

commit 5217af8c05634e5f308c7faf657ebfbb40dd3a46
Merge: 0997f9a 58f658b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 12 13:37:15 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit becfb6ab0efe299e213d4bcdf233ae34cf92551f
Merge: 49815ca 7ff4a19
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 12 13:37:15 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 58f658b4e4356fdc3275b1183a29defd37e3bf11
Merge: 31d89ad 9cef122
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jul 12 04:36:39 2013 -0700

    Merge pull request #101 from claroline/refatoring-for-unit-test-nico

    Some bug fixes.

commit 7ff4a19d6e3e27eed044b2f3add6affe5cff92ac
Merge: b4a6014 ac13e83
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jul 12 04:36:39 2013 -0700

    Merge pull request #101 from claroline/refatoring-for-unit-test-nico

    Some bug fixes.

commit 0997f9af7d334f3f79e2f490d797ac1be3319605
Merge: a841d13 75f9253
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 17:31:03 2013 +0200

    Reorganized test suite

commit 49815cab557b3f796383cd0b7e8d0a38d41af427
Merge: 4158ad9 a8410a2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 17:31:03 2013 +0200

    Reorganized test suite

commit 9cef122e0ead0737cfde95ab02c4bfb2def754ec
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Jul 12 09:36:03 2013 +0200

    Fixing tests.

commit ac13e835ce0998118eafcbb5a16362bb5ae7aaec
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Jul 12 09:36:03 2013 +0200

    Fixing tests.

commit 31d89adc59b6322e51f0de43ce5abc23dece3c7e
Merge: 17c3e5f 5f89b35
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 12 09:29:07 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit b4a6014e1af18bfcc9921f7479a42e6c7e492000
Merge: 8564f24 6a57373
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 12 09:29:07 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 17c3e5f9a15f78a3e8f72bd2494a5affceb91999
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 12 09:26:15 2013 +0200

    Fixed non-working delete button in Group list

commit 8564f242304b531d75fbc88dd83ad8d41cd6feee
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 12 09:26:15 2013 +0200

    Fixed non-working delete button in Group list

commit d6d50f3901ec5607fd0b11c728b70fba66a640c4
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 12 09:22:19 2013 +0200

    Redirected cancel button in user creation form

commit 27e8dee1f88f99fd6f50eb98c1283ebd1d8e1bde
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 12 09:22:19 2013 +0200

    Redirected cancel button in user creation form

commit 0324a6dbc9093b8843bb5ab7cc8e311f4f59fddf
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Jul 12 09:16:21 2013 +0200

    Some bug fixes.

commit b515e4f5b37e1710085fe564db1fef36978c98b5
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Fri Jul 12 09:16:21 2013 +0200

    Some bug fixes.

commit 8587be3ee4114fb336cb1a9512e1181fedea5b41
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 12 08:58:20 2013 +0200

    Rerouted cancel button in desktop widget config

commit f6768220056e53fc7fa8161de028f4e6f544fb60
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 12 08:58:20 2013 +0200

    Rerouted cancel button in desktop widget config

commit aaec83b0532e7679182d20ec605337f144f323f3
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 12 08:51:32 2013 +0200

    Refactored AdministrationWidgetController with ParamConverter

commit f54cc05d424cc93461a61de1701adf3e1226dfa4
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 12 08:51:32 2013 +0200

    Refactored AdministrationWidgetController with ParamConverter

commit 5f89b35344880ef1874cff042ad078b02b8c59f4
Merge: a841d13 75f9253
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 17:31:03 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 6a5737332661d16bf795591594aa9b4c95cd05c1
Merge: 4158ad9 a8410a2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 17:31:03 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 4158ad9fa01fb3440eea9b8307ae2ed869ca8525
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 17:30:48 2013 +0200

    Submodule update

commit b75665596d956e57b204e7337e79dd188b63dd1e
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 11 17:26:13 2013 +0200

    Validate/reject claim action

commit c6b97fd2d2b06433ecbea55f382f5181558a29e4
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 11 17:26:13 2013 +0200

    Validate/reject claim action

commit a841d135206e2c7f0190c2be5a6fec92b6db4fca
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 17:24:39 2013 +0200

    Made is_browsable field optional

commit 6f2d146f9cfa08a036b56ee587ad98cb4dc813a3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 17:24:39 2013 +0200

    Made is_browsable field optional

commit 75f9253b0f0a5305ec61f41c1ae8fb1dd70627b9
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 17:17:02 2013 +0200

    Fixed impersonated bug

commit a8410a2436dceafd806ea38aa03ff07bc1093ecd
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 17:17:02 2013 +0200

    Fixed impersonated bug

commit 7912f7de448816b9f563101b07acb7564615d91d
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 11 16:55:56 2013 +0200

    Display claimed badge in table + button to validate or reject the award + adding missing translations

commit 8b82b445b610f8c55c7803235110f0be7517c242
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 11 16:55:56 2013 +0200

    Display claimed badge in table + button to validate or reject the award + adding missing translations

commit c8ec7cfcb9c2002e83e28fe76a2a13c3898c4c12
Merge: 0bffa67 1a8d3bb
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 11 16:46:24 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/ResourceManager.php

commit 18df04efc4eea730e5cd56ce9e6b5944568a76fb
Merge: 32658dc 5328cdd
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 11 16:46:24 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/ResourceManager.php

commit 0bffa67ce118c825c86ef39b7e7a3eb914176aef
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 11 16:42:30 2013 +0200

    Test update for Homecontroller and HomeManager

commit 32658dce89aa12fc65f4ddd2148a7ab1017dc682
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 11 16:42:30 2013 +0200

    Test update for Homecontroller and HomeManager

commit c8e0ff8c25914d5480bdb371a2d56e842a0bf368
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 16:42:15 2013 +0200

    Updated doc

commit 99021704d69124b779f36d16a98f02754688ac50
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 16:42:15 2013 +0200

    Updated doc

commit 1a8d3bb2b77933d5216eb2b90a2e7688d594c66c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 16:32:47 2013 +0200

    Added access to unit of work

commit 5328cdd76fdb862ec2bbef512202e1bfb20c93f4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 16:32:47 2013 +0200

    Added access to unit of work

commit 2934a6f5bf1f88992c8f71f965d99a99de2fd187
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 16:32:10 2013 +0200

    Removed is_browsable option from doc

commit db9826faab8b0ad74a9e87342e92a34542a5cae2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 16:32:10 2013 +0200

    Removed is_browsable option from doc

commit 637125964d64d29aa0dea13202541b72c62993ce
Merge: 2281db7 d9517ea
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jul 11 07:14:20 2013 -0700

    Merge pull request #97 from claroline/refatoring-for-unit-test-nico

    Using the new ObjectManager (part 1)

commit 6dfa08ce2c12754d52cd0ffe53099512fe0d9a34
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 11 16:11:11 2013 +0200

    Fixing wrong log name.

commit d9517eaf3fc5990dced1d474a0cf5f12ebf235b1
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 11 16:11:11 2013 +0200

    Fixing wrong log name.

commit 42737fd2fc0efa3a03dda93df093bc3c1c74c04e
Merge: 4e1b5a4 4328de4
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 11 16:01:05 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/UserManager.php
    	src/plugin/Claroline/ExampleBundle
    	src/plugin/UJM/ExoBundle

commit eace158a52daa99d7a2f3eed00319425b73e6dfb
Merge: c8b6f22 2281db7
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 11 16:01:05 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/UserManager.php
    	src/plugin/Claroline/ExampleBundle
    	src/plugin/UJM/ExoBundle

commit babde0f6941fdcf0e97f7428bf249d99e49c462f
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 11 15:55:21 2013 +0200

    Display badge claims on admin list badge page

commit 2281db764dc7563ae05d39dfb591e77e24e8a536
Merge: 4fef4d4 0d10143
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jul 11 06:52:29 2013 -0700

    Merge pull request #98 from claroline/refactoring-for-unit-tests-stefk

    Refactoring for unit tests stefk

commit 4328de459d19f45e4809f3841261f5a87eb2ac1b
Merge: 2cf0d9e 36d6602
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jul 11 06:52:29 2013 -0700

    Merge pull request #98 from claroline/refactoring-for-unit-tests-stefk

    Refactoring for unit tests stefk

commit 4fef4d437392a75fc7bdf8173a4221e0317a5c16
Merge: afd1dce 5120639
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jul 11 06:51:15 2013 -0700

    Merge pull request #99 from claroline/eventDispatcher

    Event dispatcher

commit 4e1b5a4a4b6e928a4be8ff0428442df54219246f
Merge: 7c8522a 11d7f54
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 11 15:51:06 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/LayoutController.php
    	src/core/Claroline/CoreBundle/Library/Workspace/Exporter.php
    	src/core/Claroline/CoreBundle/Manager/WorkspaceManager.php

commit c8b6f2288b904345857226dabedb7dc23160faef
Merge: 7fe8bd2 4a122c4
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 11 15:51:06 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/LayoutController.php
    	src/core/Claroline/CoreBundle/Library/Workspace/Exporter.php
    	src/core/Claroline/CoreBundle/Manager/WorkspaceManager.php

commit 2cf0d9ec17831c3b17fc3af0eef87b2dfa97b534
Merge: 30a29e6 11d7f54
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 15:47:45 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into eventDispatcher

commit 512063942bf08ca6f7350757cc3d4d0b9be16bed
Merge: 4c06c73 afd1dce
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 15:47:45 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into eventDispatcher

commit 30a29e6843e5782410488ce78244111b6a3ada84
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 15:46:43 2013 +0200

    fixed bug(2)

commit 4c06c73eb68977e8c557172a1fd205767b69f56b
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 15:46:43 2013 +0200

    fixed bug(2)

commit 10590ee2294f22235ce450769e35d3fbd3ec6fc4
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 11 15:42:28 2013 +0200

    Move all css for badges from coreBundle to badgeBundle

commit 43b88969dd784a434b1a373cc65f2f613782fed7
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 11 15:42:28 2013 +0200

    Move all css for badges from coreBundle to badgeBundle

commit ba473f79d2b2deb1aa2e15d97847704b37421614
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 15:41:41 2013 +0200

    missed bugs

commit 4ee3cdfae21785e754fd3688f89f02cf5c7f7dcb
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 15:41:41 2013 +0200

    missed bugs

commit afd1dcea5f27fb9cef2a7351fd378638c3e64192
Merge: 2f4673f 4a122c4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 15:39:53 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 2f4673fab8d8f7a5061ffef422a073fbc42b71ff
Merge: b9e864c cf407c1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 15:38:58 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 0d101437f4d6e867124fbe145fba909f08162f2a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 15:22:19 2013 +0200

    Checkstyle

commit 36d6602d3884e04195b5415943cb63c140e81dce
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 15:22:19 2013 +0200

    Checkstyle

commit 22751301a28482a4c7453f2f45c800285f4306a4
Merge: 0cf889a 4a122c4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 15:19:24 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-stefk

commit d5075d4c7686287d613e6276f2fe67da76372930
Merge: 2cd6e48 11d7f54
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 15:19:24 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-stefk

commit 11d7f54f450850c9fc13a5cb4cf39c96407cdbc7
Merge: e9b75ad 15c0d66
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jul 11 06:14:50 2013 -0700

    Merge pull request #96 from claroline/refactoring-for-unit-tests-kitan

    Refactoring for unit tests kitan

commit 4a122c4466e4b48525ea4f9df1f3e616baf15374
Merge: 325f20c ef1eb9f
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jul 11 06:14:50 2013 -0700

    Merge pull request #96 from claroline/refactoring-for-unit-tests-kitan

    Refactoring for unit tests kitan

commit 7c8522a4e11a96d1ce11b857030d3622a48e5317
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 11 15:13:34 2013 +0200

    Using the new ObjectManager (part 1)

commit 7fe8bd2e0a4f8fb798bbfa5a95027ffd6be0bb4b
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Thu Jul 11 15:13:34 2013 +0200

    Using the new ObjectManager (part 1)

commit 15c0d6676873be8cf2c7183a68c2338a02f7a40b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 15:13:02 2013 +0200

    checkstyle + remove converter in phpunit.xml

commit ef1eb9f5915dbffc949504fc63bc5ff79a518619
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 15:13:02 2013 +0200

    checkstyle + remove converter in phpunit.xml

commit ec579c3211537eb96789d299fe50761ed44293fc
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 11 15:11:36 2013 +0200

    Adding tinyMce for description badge field

commit 459e37f3d7bc47d6d8a54fd666bb067d5106a564
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 11 15:05:42 2013 +0200

    Display badge claims on user badge page

commit fb6c265000a80fc350f5fe0f4d6d9cdb34cf2200
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 11 15:05:42 2013 +0200

    Display badge claims on user badge page

commit ce754ebfcd360ea26aef9a205bc7cc0b4c6c7702
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 15:03:19 2013 +0200

    Submodule update

commit 338014611d9b7aac4b29c89fed5f44c23df415ab
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 15:03:19 2013 +0200

    Submodule update

commit 4b88ba117ccd6f6e66f863dd496da7fd2ddc730f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 15:02:39 2013 +0200

    Refactored claroline.resource.converter service

commit 12570392e597c267c3e2b2c487fd6253014b56bb
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 15:02:39 2013 +0200

    Refactored claroline.resource.converter service

commit 0cf889a129562e24df702a1d79920cca03520623
Merge: 2a82210 325f20c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 14:28:29 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-stefk

commit 2cd6e48882d85fb30a55225581d2c5776b738c5f
Merge: fd1a388 e9b75ad
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 14:28:29 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-stefk

commit 420bb241d659cb97dd664897e8859cc2233f7fa1
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 11 14:19:36 2013 +0200

    User can now claim a badge

commit 42331d3c40449fbc67e45731ba1fdfcc38ad8bad
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 11 14:19:36 2013 +0200

    User can now claim a badge

commit 325f20c043f64e28dec3a59db58d537fe8f04267
Merge: af271bb ccb711a
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jul 11 05:01:14 2013 -0700

    Merge pull request #94 from claroline/eventDispatcher

    Event dispatcher

commit e9b75ad2da33a3802fc94118ea66efd8cf3fe1f9
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 13:56:22 2013 +0200

    fixed bug

commit ccb711a6deef270d78a58a4a4e2293871706119b
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 13:56:22 2013 +0200

    fixed bug

commit 9afa5969d4c22b646522bb044510026909aaad44
Merge: 72c05ab a36c79b
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 13:40:07 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into eventDispatcher

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/LogController.php
    	src/core/Claroline/CoreBundle/Controller/Tool/GroupController.php
    	src/core/Claroline/CoreBundle/Controller/Tool/UserController.php
    	src/core/Claroline/CoreBundle/Controller/Tool/WorkspaceParametersController.php
    	src/core/Claroline/CoreBundle/Listener/LogWidgetListener.php
    	src/core/Claroline/CoreBundle/Listener/Tool/HomeListener.php
    	src/core/Claroline/CoreBundle/Listener/Tool/ResourceManagerListener.php
    	src/core/Claroline/CoreBundle/Manager/UserManager.php

commit fc3f84c6912373bec4c91faa9cedae48c0a61bd1
Merge: bbb4248 af271bb
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 13:40:07 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into eventDispatcher

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/LogController.php
    	src/core/Claroline/CoreBundle/Controller/Tool/GroupController.php
    	src/core/Claroline/CoreBundle/Controller/Tool/UserController.php
    	src/core/Claroline/CoreBundle/Controller/Tool/WorkspaceParametersController.php
    	src/core/Claroline/CoreBundle/Listener/LogWidgetListener.php
    	src/core/Claroline/CoreBundle/Listener/Tool/HomeListener.php
    	src/core/Claroline/CoreBundle/Listener/Tool/ResourceManagerListener.php
    	src/core/Claroline/CoreBundle/Manager/UserManager.php

commit 2a82210983324e8d03acb7e333421eef4488646a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 13:33:57 2013 +0200

    Updated core test suite

commit fd1a3886787c1f3337730f94a252404598709b48
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 13:33:42 2013 +0200

    Removed outdated test cases

commit d5659db5b110882697da22e568e7c25f163fd046
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 13:33:42 2013 +0200

    Removed outdated test cases

commit 72c05ab21b971503557cdb7f08d063c26390bf3f
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 13:14:10 2013 +0200

    check style part 2

commit bbb42482f935b418363e6c679d2bc9173f7210bf
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 13:14:10 2013 +0200

    check style part 2

commit a3d7092fac3e7154dddf6cf19fdc4f35571bd0fc
Merge: 64659b7 a36c79b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 13:12:16 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-stefk

commit 2f175210c2c04d6054c7eb7a38b9db7edabf8d1d
Merge: 99a3b5d af271bb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 13:12:16 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-stefk

commit 64659b746b1e996abc866450a29e141eab9e472f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 13:11:06 2013 +0200

    Used object manager in message manager

commit 99a3b5d022845926bde165e1bcb1bbda6763e844
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 13:11:06 2013 +0200

    Used object manager in message manager

commit 377f857b8b0e7c245b294d3e21b16828bfa6be01
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 11 13:01:36 2013 +0200

    Adding format option to simpleautocomplete form field to support different format for returned data

commit 63e2df7a3e68d1e0b4a96c443d429c51ebe5d350
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 11 13:01:36 2013 +0200

    Adding format option to simpleautocomplete form field to support different format for returned data

commit e0e71e12c34a8882f230a9882cb87c7c6c8002df
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 11:35:14 2013 +0200

    checkstyle

commit dbceff49eeeb5484b1660b4bcd80cfe3727d728e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 11:35:14 2013 +0200

    checkstyle

commit af271bbf915cb67ed23b511fd373f9b3eb885f83
Merge: bc9bc16 cfdc66a
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jul 11 02:33:07 2013 -0700

    Merge pull request #95 from claroline/refactoring-for-unit-tests-kitan

    Refactoring for unit tests kitan

commit a36c79b070cb5e69455e8214c23fff72db3cc273
Merge: adf93c7 9ad573b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 11:15:34 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-kitan

    Conflicts:
    	src/core/Claroline/CoreBundle/Form/Factory/FormFactory.php
    	src/core/Claroline/CoreBundle/Manager/RightsManager.php
    	src/core/Claroline/CoreBundle/Resources/config/repositories.yml

commit cfdc66aacfa772e6c0c6558a76a8b17e812839da
Merge: 8d1af9f bc9bc16
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 11:15:34 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-kitan

    Conflicts:
    	src/core/Claroline/CoreBundle/Form/Factory/FormFactory.php
    	src/core/Claroline/CoreBundle/Manager/RightsManager.php
    	src/core/Claroline/CoreBundle/Resources/config/repositories.yml

commit b82cc66fbaba974097158d7a3d180db440753767
Merge: 76686d8 9ad573b
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 10:58:30 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into eventDispatcher

commit d4a3515f359a8ad547c093d6621fe9e5adb4d61f
Merge: 3e7588e bc9bc16
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 10:58:30 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into eventDispatcher

commit 76686d81176881498f252b73b0054c4998af3852
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 10:58:05 2013 +0200

    check style

commit 3e7588e19c1c6c88481d5ccaa3c6a3bae07b78a0
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 10:58:05 2013 +0200

    check style

commit adf93c77520287e8a92001984da9a308d95a9258
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 10:56:13 2013 +0200

    Refactored WorkspaceTagManager with WorkspaceManager

commit 8d1af9fd463efdc5975e3df829ca3c6eb3a1a6e4
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 10:56:13 2013 +0200

    Refactored WorkspaceTagManager with WorkspaceManager

commit 0fb6359afa023513a434000b129db8ce94d758d3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 10:54:12 2013 +0200

    Used variable interpolation instead of query parameter (fix entity namespace alias)

commit 06bb975f757946a2fe5860bf7df5c3e1c2609460
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 10:54:12 2013 +0200

    Used variable interpolation instead of query parameter (fix entity namespace alias)

commit 1c35050c29189b09708c90d889c8b15be4579054
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 10:42:15 2013 +0200

    Refactored ToolListener with WorkspaceManager

commit 59d1e62e7658622da6d81b7c0ed72f7c28422ea7
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 10:42:15 2013 +0200

    Refactored ToolListener with WorkspaceManager

commit 687d65b0b0e8ae037c0331e34981f3e76f879744
Merge: c9512be 9ad573b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 10:35:40 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-stefk

commit 670cdd356ab988b856fd18be21377e7267796434
Merge: 090c65e bc9bc16
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 10:35:40 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-stefk

commit aa6511ef725930cdaffccd4bb4d0a33ee3b08639
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 10:10:38 2013 +0200

    Refactored ResourceManagerListener with WorkspaceManager

commit 6020bdfc9c4581909e54ec764adcfeff4c21a26a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 10:10:38 2013 +0200

    Refactored ResourceManagerListener with WorkspaceManager

commit c9512becee7ede212d5fbbcc19fa1522d0cce32d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 09:46:59 2013 +0200

    Removed unused set up

commit 090c65e5287dff7e9a3fe0c783c50add1a75b75c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 11 09:46:59 2013 +0200

    Removed unused set up

commit 9ad573b9aab24f7a36804eb4a75b419c2b199970
Merge: d7820af 3c6f568
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 11 00:45:11 2013 -0700

    Merge pull request #93 from claroline/refactoring-for-unit-tests-stefk

    Added an object manager decorator

commit bc9bc1644f24788fb175f96af1c32f008cc8f62f
Merge: df59578 37157d8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 11 00:45:11 2013 -0700

    Merge pull request #93 from claroline/refactoring-for-unit-tests-stefk

    Added an object manager decorator

commit c4e3b8dff46b9474146bc8d990cb3770e6b08fbf
Merge: 3235294 d7820af
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 09:43:16 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into eventDispatcher

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ProfileController.php
    	src/core/Claroline/CoreBundle/Controller/ResourcePropertiesController.php
    	src/core/Claroline/CoreBundle/Controller/ResourceRightsController.php
    	src/core/Claroline/CoreBundle/Controller/Tool/GroupController.php
    	src/core/Claroline/CoreBundle/Controller/Tool/UserController.php
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php
    	src/core/Claroline/CoreBundle/Listener/Resource/DirectoryListener.php
    	src/core/Claroline/CoreBundle/Listener/Tool/ImportExportResourceListener.php

commit 195269ebc38ce0047e132d9d58b04127c4e835cb
Merge: b6bbf98 df59578
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 11 09:43:16 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into eventDispatcher

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ProfileController.php
    	src/core/Claroline/CoreBundle/Controller/ResourcePropertiesController.php
    	src/core/Claroline/CoreBundle/Controller/ResourceRightsController.php
    	src/core/Claroline/CoreBundle/Controller/Tool/GroupController.php
    	src/core/Claroline/CoreBundle/Controller/Tool/UserController.php
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php
    	src/core/Claroline/CoreBundle/Listener/Resource/DirectoryListener.php
    	src/core/Claroline/CoreBundle/Listener/Tool/ImportExportResourceListener.php

commit 4b4849ff26ed770b8b1088e1339481a4ac4a809c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 09:36:27 2013 +0200

    Refactored HomeListener with WorkspaceManager

commit 4a4960bda3a8f4baa87a007f92dd94e74451d724
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 09:36:27 2013 +0200

    Refactored HomeListener with WorkspaceManager

commit b767fef3df2d5c4872ad3fa57f61df4d52d43440
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 09:28:42 2013 +0200

    Refactored LogWidgetListener with WorkspaceManager

commit 629b2005cd8f76d467f7ec23b8bd80719451642e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 09:28:42 2013 +0200

    Refactored LogWidgetListener with WorkspaceManager

commit 719d5bc483b190ca4f3a478c8428e9e07902c886
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 08:53:22 2013 +0200

    Refactored analyticsManager with WorkspaceManager

commit 4d9b67a8abf83fde9f4690271ec20a5c0c124c51
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 11 08:53:22 2013 +0200

    Refactored analyticsManager with WorkspaceManager

commit 3c6f56891ff66b82516f07356dceb66813da79a3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 10 18:33:39 2013 +0200

    Added an object manager decorator

commit 37157d801c80e4f6b01279902e311665a50a4e18
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 10 18:33:39 2013 +0200

    Added an object manager decorator

commit b380a9b61d7e0bd73bf04698a1334ab5788583f9
Merge: 3918c0b d7820af
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 10 17:35:57 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/ResourceManager.php

commit 88731fb38f6af8e5bdf81af5859c4b63a02b5612
Merge: 9fa4f24 df59578
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 10 17:35:57 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/ResourceManager.php

commit 3918c0bbb037ae089c4420a587caae796d131f25
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 10 17:32:43 2013 +0200

    Test draft for HomeController

commit 9fa4f24bbd12dffb96e3172412eb7daf9eb847a5
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 10 17:32:43 2013 +0200

    Test draft for HomeController

commit 32352940b930bfedee5d469dba6586e8fef862c2
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 10 17:21:51 2013 +0200

    eventdispatcher service in manager&listener

commit b6bbf980e9646fece9e4d2caf4d76db0111ef33c
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 10 17:21:51 2013 +0200

    eventdispatcher service in manager&listener

commit df595789513b680fc5c9bc996b36ba79d3324910
Merge: 997207b 68c2965
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Jul 10 08:21:47 2013 -0700

    Merge pull request #91 from claroline/refatoring-for-unit-test-nico

    Refactoring ResourcePropertiesController.

commit 88dfdbe4d6c6634c4efa6854ef708fdce58d216b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 10 17:20:42 2013 +0200

    Refactored WorkspaceTagController with WorkspaceController

commit c997a1a5be52ae5e5bbd319a6258f55436df1835
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 10 17:20:42 2013 +0200

    Refactored WorkspaceTagController with WorkspaceController

commit d01b5b7c3d67c747c726abc200025929b3edd121
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jul 10 17:15:43 2013 +0200

    File upload working again

commit f443f91c17d5150ab1c0d8fa89b13119ac316d52
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 10 17:02:59 2013 +0200

    Refactored WorkspaceLogController

commit 7bb2638fb61979805053e96be4ed7d8f2dd4df7b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 10 17:02:59 2013 +0200

    Refactored WorkspaceLogController

commit d7820af08523542ced8f2fb38cb077b224daf013
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Jul 10 17:02:19 2013 +0200

    Refactoring ResourcePropertiesController.

commit 68c2965058690a66f88e975b16e1dd154a203487
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Jul 10 17:02:19 2013 +0200

    Refactoring ResourcePropertiesController.

commit 0b62f720bda94c89b720d6b8701aa5a2f3b4db59
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 10 16:58:50 2013 +0200

    Refactored some controller

commit bdc3d6f117eda81a2cd8e7ece73adeb775e00acc
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 10 16:58:50 2013 +0200

    Refactored some controller

commit 88b456938a67e45a81e6f5b7d87ca5c164da5337
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 10 16:37:37 2013 +0200

    Refactored LogController with WorkspaceManager

commit 65f1847d42fd272f1cbc895c7d64925365b79ef4
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 10 16:37:37 2013 +0200

    Refactored LogController with WorkspaceManager

commit 0fc432273e8f613761205254675fbd697cdfd6c3
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jul 10 16:29:02 2013 +0200

    Edit badge displaying, language was hard-coded

commit d2a0bf942330dad5be3931ab7b5ebfcfa22f091f
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jul 10 16:29:02 2013 +0200

    Edit badge displaying, language was hard-coded

commit 997207b78ef6df3b5c0e4d411cccfa9ad5d06127
Merge: 583134b f62a26e
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Jul 10 06:50:52 2013 -0700

    Merge pull request #90 from claroline/refatoring-for-unit-test-nico

    Refatoring for unit test nico

commit ecf871f4454a9a8cc49f82e4f66b52b822c018f1
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 10 15:43:36 2013 +0200

    Refactored LayoutController with WorkspaceManager

commit c179717eb920288ec3a8c0b2b5ef45c0cb996921
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 10 15:43:36 2013 +0200

    Refactored LayoutController with WorkspaceManager

commit f79d2365bfa3f53d99c249fa49e40f7672e681b4
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jul 10 15:34:07 2013 +0200

    Add issuer field on userBadge

commit b61ffeef20be32e3b5789c3547e49d9371195e74
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jul 10 15:34:07 2013 +0200

    Add issuer field on userBadge

commit b9f4282aac4d49e8e8b5d04ffe26dac83914c628
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 10 15:13:27 2013 +0200

    Refactored AdministrationController with workspaceManager

commit 61933e8b6d759710749c60c2ed9891f522319a4a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 10 15:13:27 2013 +0200

    Refactored AdministrationController with workspaceManager

commit d74da4f2c7b3926e1885450464d032098cf2f1e0
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Jul 10 15:02:13 2013 +0200

    Removing a const and adding an assertEquals.

commit f62a26e507a0ee8e018fb6ab2e4955ce7e8fda05
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Jul 10 15:02:13 2013 +0200

    Removing a const and adding an assertEquals.

commit 60127f736e98cf960f9acc50376f69aec3ab994d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 10 14:49:08 2013 +0200

    Refactored workspace.exporter service

commit c7f162f9c5ca05c9c0e07072addcdfa43f8cb4f5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 10 14:49:08 2013 +0200

    Refactored workspace.exporter service

commit 75333525995dfd71265b24b743b528178afbc5d4
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Jul 10 14:43:43 2013 +0200

    ResourceIcon refactoring & tests.

commit 0f63cff2aa43354d48f18cbf24a16c6e4052e15a
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Wed Jul 10 14:43:43 2013 +0200

    ResourceIcon refactoring & tests.

commit f51ef85a6bc4ddf77443ed346b5a7fc1b90c0e3f
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jul 10 14:41:48 2013 +0200

    Adding BadgeManager + associated test

commit 23c98deb1eb8dd99fab5db78840d4e10b04b4e67
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jul 10 14:41:48 2013 +0200

    Adding BadgeManager + associated test

commit daf30172347aa707176a70bd15c3e37091ee1a76
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 10 11:03:45 2013 +0200

    Home manager update

commit 7659af0bbb62e11b79775ee07e91ce02962e546b
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 10 11:03:45 2013 +0200

    Home manager update

commit de1197a0f6a351b162032f3ca8e1e057b6b2edf6
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 10 10:30:58 2013 +0200

    Refactored WorkspaceTagRepositoryTest

commit 03aa3d849e6a4cdf2d60c39f237b5165d9e932be
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 10 10:30:58 2013 +0200

    Refactored WorkspaceTagRepositoryTest

commit 634560d80bb8d4f5ca6d6147770c6e85e9d65bc3
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jul 10 10:18:25 2013 +0200

    Moving out all badge files to a badgeBundle

commit 171352f4803d0047219e0d38feff9e3d8b2bb662
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jul 10 10:18:25 2013 +0200

    Moving out all badge files to a badgeBundle

commit fd16e2bad0b9df764ad21ea298c6e1c9f25227b3
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 16:45:44 2013 +0200

    Correct retrieving user for viewing profile

commit 72ed4e435424816f57cbbb1a476e8206b3f8a585
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 16:45:44 2013 +0200

    Correct retrieving user for viewing profile

commit ba7746c4591e5db4bf40d553f81d1e9b615e3386
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 16:42:41 2013 +0200

    Add language option to datepicker form field

commit a8b0041ca8fb14976dddb484dcefa1233a02e2cd
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 16:42:41 2013 +0200

    Add language option to datepicker form field

commit f9cea94d6e810a1b25cbc5f1343976f82821e737
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 9 15:58:25 2013 +0200

    change event in eventdispatcher service in controller

commit a9c3f19c72635c7aefe22a591d5bf193a022e6c4
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jul 9 15:58:25 2013 +0200

    change event in eventdispatcher service in controller

commit c26d1b3b602edb146d4dee8ce02830532d956f55
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 15:50:10 2013 +0200

    Improve request number to get badge's data + adding pagination

commit 68cb5cbaeadffe77a155a3adb2b6f5dc5911ac61
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 15:50:10 2013 +0200

    Improve request number to get badge's data + adding pagination

commit 6500cd004b14ccd259a969efab373d94c0a34659
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 15:21:00 2013 +0200

    Add page to show user's badge

commit eb5c476d2d63a4567df970a5961cb34e3eadb75d
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 15:21:00 2013 +0200

    Add page to show user's badge

commit 94b43e21681fae1c94091a3a022c02da6afd592d
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 9 15:11:36 2013 +0200

    Home manager update

commit 3a3c47de3565d7882d98dccc3fddef167154db26
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jul 9 15:11:36 2013 +0200

    Home manager update

commit 82bdf70417ecdbf3df91653976afade4215c634f
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 15:02:17 2013 +0200

    Modify request to deal with when user don't have badge

commit bca0749e6f756a8692177bdaae3bf4433fbf20c5
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 15:02:17 2013 +0200

    Modify request to deal with when user don't have badge

commit 3c588632ef7ca8bd6e7a32a45459cf77470d2136
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 14:51:35 2013 +0200

    Displaying badges on user profile page

commit ebc2efd44859fafde9d1cf4bc0b2a6866cea914a
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 14:51:35 2013 +0200

    Displaying badges on user profile page

commit 240c064aa5890523cb7e42ea903aa9c0009c13ca
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Jul 9 14:39:10 2013 +0200

    Testing RightsManager.

commit 295c2ee586b3f06c5ddff0cff42e7e5cc6e8a698
Author: nicolas <nicolas.godfraind@gmail.com>
Date:   Tue Jul 9 14:39:10 2013 +0200

    Testing RightsManager.

commit cd6bae392c8b02cde04c3e04a2b3e622a85ef26c
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 11:40:27 2013 +0200

    Adding pagination for displaying awareded badge users

commit e78abc0e01aaa3a4e10187e03d426e0811e44c7c
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 11:40:27 2013 +0200

    Adding pagination for displaying awareded badge users

commit 579b00a6319c62d699ac78522e5bd4d1072384d4
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 11:00:25 2013 +0200

    Adding user field on award form to select one user, choice between users of a group or user

commit 22a89be5b5adee173048e214a12b801acfb99ff2
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 11:00:25 2013 +0200

    Adding user field on award form to select one user, choice between users of a group or user

commit 3c2478eddea35b7ebebe339e47600e8de292291d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 9 09:52:04 2013 +0200

    Refactored convert functions for user and group in resource.converter service

commit edf128d98240fcf5a86572a601416b95dce2ae7d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 9 09:52:04 2013 +0200

    Refactored convert functions for user and group in resource.converter service

commit c4cdeae343353650a1effa9750e602d2140711b0
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 08:58:49 2013 +0200

    Adding show/hide animation

commit 03e7b312992785ba714a52889ef5e945147251f0
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 9 08:58:49 2013 +0200

    Adding show/hide animation

commit d6469d351866e7b3725638f61bf6d0f9b9b93e09
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 8 18:11:35 2013 +0200

    ResourceRightsController done. Now fixing ResourceRightsManager.

commit 1436b9f9e7b5090331593bdeb587a729bb1f1d23
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 8 18:11:35 2013 +0200

    ResourceRightsController done. Now fixing ResourceRightsManager.

commit e2a2f10a08caff7b091e6fe34ff5581de78f2156
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 8 17:56:36 2013 +0200

    Change the way we display award form

commit 8480558909e13206eb0488c95dd33e2012b4b98a
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 8 17:56:36 2013 +0200

    Change the way we display award form

commit 5cb6b77448318d0d797a8bacf23d2299e3fb208b
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 8 17:38:25 2013 +0200

    Modify how to award badge on user, just user of group for now

commit b55f3b6c0d130221c2674a2951a1c2232d7e7c00
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 8 17:38:25 2013 +0200

    Modify how to award badge on user, just user of group for now

commit cf398b034d58797456af96b8c60d9088f1d0ed75
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 8 17:37:26 2013 +0200

    Add option to simpleautocomplete form field to configure if vendor are include or not (conflict when jquery-ui is load multiple times in a page)

commit 3d2851fbddb60f35b30745ac660629b86baabedf
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 8 17:37:26 2013 +0200

    Add option to simpleautocomplete form field to configure if vendor are include or not (conflict when jquery-ui is load multiple times in a page)

commit bfcb6161da00e4e458e9506fade2b80bed31170c
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 8 14:25:47 2013 +0200

    Entity_parameter is set to configure simpleautocomplete field to match this entity with the exporter + adding option for group in config.yml

commit bd38ae52ac49b44ee92825ee62539643246a78bb
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 8 14:25:47 2013 +0200

    Entity_parameter is set to configure simpleautocomplete field to match this entity with the exporter + adding option for group in config.yml

commit 19839e44cf6337da647b683ba847557db5506848
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 8 11:23:14 2013 +0200

    Correct attribution form

commit 8bc8ee9a5b5a8fc78bfbc150848a4d18250581da
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 8 11:23:14 2013 +0200

    Correct attribution form

commit 92080aca36d219cc09aef1898e336748737cb1d3
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 8 10:58:33 2013 +0200

    Removing warded badge on use ris possible + rename attribute in award

commit 68cfd4479373f0de02c11f2dd58866ba2fec9acc
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 8 10:58:33 2013 +0200

    Removing warded badge on use ris possible + rename attribute in award

commit f5db58bb4432bffb7744fea73159ad3123599c86
Merge: e9e25dc 2272835
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jul 8 10:28:02 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

commit bb146f43d1cc1d343786ff0d407aa39a98623256
Merge: 7cb81ad 583134b
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jul 8 10:28:02 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

commit 810b4cf79445547f0bfd5c631637bbe8236e2aed
Merge: 725ef2d 2272835
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 8 09:15:53 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php

commit a9fd54d7ed36de850f0f195c1e359711fd452b7d
Merge: 4f7cdaa 583134b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 8 09:15:53 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php

commit 725ef2df4b97c4c977dca79c7acb767070700848
Merge: 8c59c24 85ef0db
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 8 09:13:03 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

commit 4f7cdaa52e2d3597ea16263c9fddecee900f0e08
Merge: b65468f cf407c1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 8 09:13:03 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

commit 8c59c24ddd83b11bab0b692ffc0ff6e47d0edfce
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 8 09:12:19 2013 +0200

    Rights refactoring (forms: 1st part).

commit b65468f6906fe599aabfccb8473a9f8fc85e8896
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 8 09:12:19 2013 +0200

    Rights refactoring (forms: 1st part).

commit 583134b5e1e1a18ec49ce5b31645b3a7248b4b91
Merge: b9e864c 5491559
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 8 00:09:07 2013 -0700

    Merge pull request #89 from claroline/refactoring-for-unit-tests-stefk

    Refactoring for unit tests stefk

commit 2272835a621c3a0d3fc32f940ac1a00e6aabec51
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 21:58:26 2013 +0200

    Added missing test and removed test tags

commit 5491559ec929a472a987e1142b39fe02891ce1ee
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 21:58:26 2013 +0200

    Added missing test and removed test tags

commit 5047690d724f6e658f5025a4d89e9dffa6f02666
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 12:00:32 2013 +0200

    Added alternate core test suite

commit ab740a7c15f05b146da49fe5ca49859a6270044b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 11:59:28 2013 +0200

    Removed outdated writer

commit f9f6f959e2d5c84a6a149d2b5000db1e778d08af
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 11:59:28 2013 +0200

    Removed outdated writer

commit 72e5731e3207293e6bb6cb3c1ea15950eeff033b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 11:45:25 2013 +0200

    Fixed manager test cases

commit be9d1e1027236ecf1c0938a2638eb8c9cd86003a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 11:45:25 2013 +0200

    Fixed manager test cases

commit 2a80407567226b1a3f31349c9c39aa59b8f4940d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 11:17:00 2013 +0200

    Added test case suffix

commit 29cd1b64191762f066fabbb15b4f651d6b32513a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 11:17:00 2013 +0200

    Added test case suffix

commit 2dc3e662cea3c318ad46e088342a0befa59e6e0e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 11:10:34 2013 +0200

    Removed outdated test case

commit 63ee32c535a4f1b3ffcbeb0abe5336a2a7f2823f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 11:10:34 2013 +0200

    Removed outdated test case

commit 2dbdefa9eb8c5416566718ed94c34380fdbc5334
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 11:05:53 2013 +0200

    Moved test case to proper location

commit 60693b24239799a6d59c8d5a3a91449434556df8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 11:05:53 2013 +0200

    Moved test case to proper location

commit 5ebc66ed9f3b7c9ddbda09ebca46a679a5125105
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 11:04:15 2013 +0200

    Removed outdated doc block

commit 5bf79147efc3a57be9cec64df73776cf6290825e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 11:04:15 2013 +0200

    Removed outdated doc block

commit c5918ac5fd750512e4fb0e06922bd0f53296fe7c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 11:03:50 2013 +0200

    Removed old acl security manager

commit 2793e662454d1aa4b11afe27dcaab0d21314d7f0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 11:03:50 2013 +0200

    Removed old acl security manager

commit 51115909f9dd9e0547018b5b495c259f6d0b0a98
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 10:34:04 2013 +0200

    Fixed stub plugins configuration

commit 8e15f57acb1bbb0449c36711fda6ae3d0adb4df4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 10:34:04 2013 +0200

    Fixed stub plugins configuration

commit b60af5a0fcfae36f9e7285de7f9447db9d3e454d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 01:09:44 2013 +0200

    Fixed outdated method argument

commit c15c1ca080df33ce53cc3e71d0bf322d79f64930
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 01:09:44 2013 +0200

    Fixed outdated method argument

commit 781a9d7c87d91caaffdc444685a0033e9f7d8b6f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 01:08:51 2013 +0200

    Renamed test case

commit 8c7eb9cd069f85f7bedcf3f4cb35483765101fc1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 7 01:08:51 2013 +0200

    Renamed test case

commit 4dd262fcd26128750e4a6260caee016b648aaaa7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 22:17:38 2013 +0200

    Fixed assertion

commit 2b1529c44b94c0ebe719f5d89005e70d272169aa
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 22:17:38 2013 +0200

    Fixed assertion

commit c5f120e2df190eb2a2e8ea4015e8f3d30ca21002
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 16:37:45 2013 +0200

    Added doc blocks

commit 351e7c5235e3f41c101dc2215343f47b88fe453c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 16:37:45 2013 +0200

    Added doc blocks

commit 50d8a4ce3aaf11e706662339e424660c2fa83bda
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 16:04:14 2013 +0200

    Changed time handling in repo test cases

commit f7bbd173e7de83a3dc388154267f03fd28294364
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 16:04:14 2013 +0200

    Changed time handling in repo test cases

commit 175a25f36d613f844368503c971bf2f627f3d046
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 14:11:12 2013 +0200

    Fixed assertions

commit 0cbb3e172d91b3da2c8e0faa3751874436ed5de0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 14:11:12 2013 +0200

    Fixed assertions

commit 27f3c9573c8f997d09384e31dd3d9c12a059775f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 13:59:30 2013 +0200

    Removed old repository test case

commit 2466b99b99a330861950f13a0bd3a27e47478c51
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 13:59:30 2013 +0200

    Removed old repository test case

commit d8296d013b42f41d6e9f601d10561a2f97b204e0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 13:53:37 2013 +0200

    Skipped tag repos tests

commit 50601a907d4a1fa3d18a411ef7d1881494f1fbff
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 13:53:37 2013 +0200

    Skipped tag repos tests

commit 13fe4094942a277bbb7122d0ed330c9d559e7b75
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 13:40:34 2013 +0200

    Ended workspace repo

commit fe0161f7a2e04d41d6076fe64a6a55b1b1665218
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 13:40:34 2013 +0200

    Ended workspace repo

commit 8fc20daa7e46d00b33e98e1ab6c1f311cf864a70
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 13:04:54 2013 +0200

    Removed superfluous colons

commit 28d908fb855206facdd93bcd7ea3ccb3fc040f90
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 13:04:54 2013 +0200

    Removed superfluous colons

commit beca0478068ccdc0d22ed6c45c8d106682cba829
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 12:48:37 2013 +0200

    Used array parameter instead of implode

commit ea900f43b4fa5b4189d7c2c59a9e47f7aa82c59f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 12:48:37 2013 +0200

    Used array parameter instead of implode

commit cda68163fd4fab86f64610fa81ae02dd69187039
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 12:41:58 2013 +0200

    Used array parameter instead of implode

commit 690e71d1104a5c10a3aa6522792a1f8d9ea213e6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 12:41:58 2013 +0200

    Used array parameter instead of implode

commit b73a104c018ec232858bf50d6c059d76f40de824
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 12:39:34 2013 +0200

    Removed outdated calls

commit 58e5f197562b753ba6e02f1238b9b2ea91cfced1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 12:39:34 2013 +0200

    Removed outdated calls

commit 7319483fbf1bb0ba262ffb43e251f74636df7283
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 12:36:58 2013 +0200

    Used array parameter instead of implode

commit ef85c6ed4275f76297ffd00a98fb4c051469e6d5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 12:36:58 2013 +0200

    Used array parameter instead of implode

commit 268c10d540d8d71b7ff1b3b1bded7723cf0f9c7c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 11:18:26 2013 +0200

    Fixed annotation

commit 7cca847adaeb038f8498c9e810566dd0c62fb982
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 11:18:26 2013 +0200

    Fixed annotation

commit 44dde76114f1a446f62007f91b974a3b9833e7ec
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 00:09:55 2013 +0200

    Moved calls to pager in managers + cleanup

commit 981410eb25b36de0b12de7bbac52278c15ab5599
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 6 00:09:55 2013 +0200

    Moved calls to pager in managers + cleanup

commit 8d420a39174affe49bbc9793522f897271df4075
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 23:46:56 2013 +0200

    Ended user repo

commit 7e1fb2d5242fb16f657b723dffd21d52e00350c0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 23:46:56 2013 +0200

    Ended user repo

commit d0421e3a5127725f46628a1fa18f3a850ac1eab5
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 5 17:44:19 2013 +0200

    Adding delete badge attribution link on each user

commit 290d1daaa8ff07a4d2d5c40c58e1196ec96d6b77
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 5 17:44:19 2013 +0200

    Adding delete badge attribution link on each user

commit c2f4be82406cdaf31abc3f2707756609cc32f1ce
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 5 17:25:17 2013 +0200

    Ajax popup work for badge attribution

commit db2ae56219c209adaf54d598a250aaf060941454
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 5 17:25:17 2013 +0200

    Ajax popup work for badge attribution

commit 04cdc411b341e9308d9b3a0c5fbbffa9b5a65bbf
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 5 16:33:54 2013 +0200

    Badge attribution could be edited

commit d62143b505d810333bebccd24829603ee2a3fdeb
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 5 16:33:54 2013 +0200

    Badge attribution could be edited

commit 5b0571206ea13f9a5e97ec759275e7cfbd58db66
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 15:33:10 2013 +0200

    Submodule update

commit b9e864ce5043d5a1b974fc3d2ea3fe33124e6ed1
Merge: 1a7d49a f3a7f03
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jul 5 06:26:56 2013 -0700

    Merge pull request #88 from claroline/refactoring-for-unit-tests-kitan

    Fixed some bugs during install

commit 7bf836768fc1d09c476d2b559d85ce5d87adffec
Merge: 0f35746 d508d49
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jul 5 06:26:56 2013 -0700

    Merge pull request #88 from claroline/refactoring-for-unit-tests-kitan

    Fixed some bugs during install

commit f3a7f03d13eaac366d4f105aff2bd8145e85d02c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 5 15:20:38 2013 +0200

    Fixed some bugs during install

commit d508d4903954cfb6bf6ccab1275479ac42e5b854
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 5 15:20:38 2013 +0200

    Fixed some bugs during install

commit 1a7d49af6d8b35066eaad85c67849652c3f63ce4
Merge: ba91eea ee674b0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 15:19:02 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 0f3574652d35ddecbfd03d933c2d50912b7a0b9e
Merge: e2fc0ed e218888
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 15:19:02 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit ba91eeaa8038f04034a773e39b5a380ecc6fdd8a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 15:18:14 2013 +0200

    Ended tool repo

commit e2fc0ed9e901a0cab99f6bfff171549c412c3b3a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 15:18:14 2013 +0200

    Ended tool repo

commit 6952cff4ca5f047cd24222291923b1d2dc5cd0d6
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 5 14:40:34 2013 +0200

    Displaying user on badge page

commit 560156166c396ff026670eaacc15be9834050870
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 5 14:40:34 2013 +0200

    Displaying user on badge page

commit a5475bda1458ef3c2d0d88033c919034dc97650e
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 5 14:39:33 2013 +0200

    Add translation for attribution action

commit ca69b59e55d35027cd725b60236d21e9720ca7dc
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 5 14:39:33 2013 +0200

    Add translation for attribution action

commit e56011bb80b9a165dbb3faaa3cc17c7c99a860c8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 14:36:44 2013 +0200

    Reverted nullable property on resource type class field

commit aacdc74316f6048b91eb979f053ba851058724ec
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 14:36:44 2013 +0200

    Reverted nullable property on resource type class field

commit 102767377047dedcf1263cb70e9762d079c00d54
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 5 14:32:14 2013 +0200

    Badge attribution form working

commit 210e0d5ce402aed99e52937d80c2f19364e615c9
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 5 14:32:14 2013 +0200

    Badge attribution form working

commit ee674b0ed94158bc9fd0a55f2b1cdc0eb604b854
Merge: 9568878 ba4cbf7
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jul 5 05:22:03 2013 -0700

    Merge pull request #87 from claroline/refactoring-for-unit-tests-kitan

    Refactoring for unit tests kitan

commit ba4cbf7052d40c012c7b0921ac9efc91d4d47518
Merge: a169026 9568878
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 5 14:19:49 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-kitan

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/AdministrationController.php
    	src/core/Claroline/CoreBundle/Controller/MailController.php
    	src/core/Claroline/CoreBundle/Controller/ProfileController.php
    	src/core/Claroline/CoreBundle/Controller/Tool/GroupController.php
    	src/core/Claroline/CoreBundle/Controller/Tool/UserController.php
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php
    	src/core/Claroline/CoreBundle/Form/Factory/FormFactory.php
    	src/core/Claroline/CoreBundle/Listener/Resource/DirectoryListener.php
    	src/core/Claroline/CoreBundle/Listener/Tool/ImportExportResourceListener.php
    	src/core/Claroline/CoreBundle/Listener/Tool/ResourceManagerListener.php
    	src/core/Claroline/CoreBundle/Manager/RoleManager.php

commit e21888882dad033db5c5955e8073c168653ec87e
Merge: 14b4421 c752fa5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 5 14:19:49 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-kitan

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/AdministrationController.php
    	src/core/Claroline/CoreBundle/Controller/MailController.php
    	src/core/Claroline/CoreBundle/Controller/ProfileController.php
    	src/core/Claroline/CoreBundle/Controller/Tool/GroupController.php
    	src/core/Claroline/CoreBundle/Controller/Tool/UserController.php
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php
    	src/core/Claroline/CoreBundle/Form/Factory/FormFactory.php
    	src/core/Claroline/CoreBundle/Listener/Resource/DirectoryListener.php
    	src/core/Claroline/CoreBundle/Listener/Tool/ImportExportResourceListener.php
    	src/core/Claroline/CoreBundle/Listener/Tool/ResourceManagerListener.php
    	src/core/Claroline/CoreBundle/Manager/RoleManager.php

commit 885b9b8c779826b91a56f9f6de7290e75b2e6dcc
Merge: 882609d 85ef0db
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Jul 5 14:19:45 2013 +0200

    eventdispatcher

commit f93e6c31b5e42ad89f78c04d48029529d46985c3
Merge: df1b1d2 cf407c1
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Jul 5 14:19:45 2013 +0200

    eventdispatcher

commit 5b2ec7f5a19a506aa48f4495c0f40cdc3c06db3e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 14:16:39 2013 +0200

    Ended revision repo

commit e1e3e8325139111b75d38217dfe7313b3b3fc8ae
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 14:16:39 2013 +0200

    Ended revision repo

commit a1690264d5af52d0546013c4b2913ed8e9988827
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 5 13:51:43 2013 +0200

    checkstyle + refactored with FormFactory & ParamConverter

commit 14b44210dc28218526e5d8950c3551e92333362f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 5 13:51:43 2013 +0200

    checkstyle + refactored with FormFactory & ParamConverter

commit 51e0e95ac8c0f9af9acf64cbfe7aaa7804ddac4c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 13:37:52 2013 +0200

    Ended role repo

commit 0d6fd4e862efd4d6c8d03603eda702d39fef4e46
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 13:37:52 2013 +0200

    Ended role repo

commit fa2cc97e89252920bf95b0a3cb06f6fa3bf20e43
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 12:20:39 2013 +0200

    Ended resource type repo

commit 164cd9c9862181b796e75a7ad731f5f122e7c2a8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 12:20:39 2013 +0200

    Ended resource type repo

commit b01e08902a79806ddaaed46b22242467d5bb6244
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 11:10:33 2013 +0200

    Ended resource rights repo

commit 299dcfd83245a8f41d52419eafa3ce7f440132f2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 11:10:33 2013 +0200

    Ended resource rights repo

commit 9f10c577c6aef9c5030ab612f84c331a48745183
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 5 11:05:07 2013 +0200

    Fixed bug of invalid entities

commit caa2793c142669608177a4a447aefdbeb60aa8b0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 5 11:05:07 2013 +0200

    Fixed bug of invalid entities

commit 926959a16b618a4bf2e4d709df4fdd033db339b1
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 5 10:58:25 2013 +0200

    Refactored WorkspaceTagController with manager

commit fbe69ec41ca507602ebb5eac84a539dabb780d1d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jul 5 10:58:25 2013 +0200

    Refactored WorkspaceTagController with manager

commit 96e824bc3b9f7892ea9793edeeda5113f5f71f99
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 10:33:55 2013 +0200

    Ended resource activity repo

commit 9eba0c3de07acbb144b0c6561e121cd47608a01f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 10:33:55 2013 +0200

    Ended resource activity repo

commit 4076d163b31f2aac2408855330e220d5747bf861
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 5 10:27:03 2013 +0200

    Adding user selection from group

commit a6d759d416aafe3bf88389e5154b7b614c2b3e75
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jul 5 10:27:03 2013 +0200

    Adding user selection from group

commit 458047b047e785ede29a66cfe821e8c80fdb73f9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 09:58:24 2013 +0200

    Removed unused method

commit 0d42781ad843f97c87de3d3b15d37e54e25ac08f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 09:58:24 2013 +0200

    Removed unused method

commit cf407c1c7b54f1fc0fd595bb6bed68282c9a0a8e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jul 5 09:51:44 2013 +0200

    Email notification for critical errors in the Demo (Update)

commit b565f160441cf75bea5f6cf7aef83ef80b34960a
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jul 5 09:47:01 2013 +0200

    Email notification for critical errors in the Demo (Update)

commit d82a06ed161de04b71981cda3020a0fc34f7eeae
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 09:12:00 2013 +0200

    Ended plugin repo

commit 667c022ebd65f8fb4cff556e878e487d7e29fbec
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 09:12:00 2013 +0200

    Ended plugin repo

commit 95688784998bd495a1f6b09daaeb8a9d6832b6de
Merge: 2fa6b82 33fcd86
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 08:50:45 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

    Conflicts:
    	src/plugin/Claroline/ExampleBundle

commit c752fa588cef6ae81c83edf4a6d4f6ac2dc936d2
Merge: 63ea79c 85ef0db
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 08:50:45 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

    Conflicts:
    	src/plugin/Claroline/ExampleBundle

commit 2fa6b82134ca698c7662fffece1b4e0205cb304e
Merge: 12eb210 df1b1d2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 08:45:07 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-stefk

    Conflicts:
    	src/core/Claroline/CoreBundle/DataFixtures/LoadPlatformRolesData.php
    	src/core/Claroline/CoreBundle/Tests/Writer/RoleWriterTest.php

commit 63ea79cf9bfeef96442502b31c59151be04ead21
Merge: 42d0743 882609d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 08:45:07 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-stefk

    Conflicts:
    	src/core/Claroline/CoreBundle/DataFixtures/LoadPlatformRolesData.php
    	src/core/Claroline/CoreBundle/Tests/Writer/RoleWriterTest.php

commit 12eb210400fc1647aef47fc90b6468d95397e109
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 08:36:45 2013 +0200

    Ended tool repo

commit 42d0743e5e7068be5cbfd8e6ad928daed0d9d8eb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 5 08:36:45 2013 +0200

    Ended tool repo

commit 1dfe1844bea13dfdad037cf9a8dbe6f331fefe1b
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 4 17:28:28 2013 +0200

    Adding popup to select user to attribute them badge

commit f84800e370575033c6e52d5a1c5a420dc553ead0
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 4 17:28:28 2013 +0200

    Adding popup to select user to attribute them badge

commit 33fcd867b15ce5b0ce2680e88043fea814dfab63
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 4 17:21:32 2013 +0200

    Add mail port to config files

commit b3683e008dd6bbb239f5c931ce9499abbe8032ba
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 4 17:07:20 2013 +0200

    Group repo tests

commit 9c4409a37dd70e7681685a8f87cf671d81d6880f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 4 17:07:20 2013 +0200

    Group repo tests

commit 101859a9025e7d23224bcf744b3a99a91fab719f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 16:52:28 2013 +0200

    Refactored UserDelegate with user manager

commit 9c820b447ec52b712fc33e009a0d97538cb01b92
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 16:52:28 2013 +0200

    Refactored UserDelegate with user manager

commit 882609def06af7d7563854a112f4a9f61447c694
Merge: e099c73 4eb5157
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jul 4 07:48:48 2013 -0700

    Merge pull request #81 from claroline/refactoring-for-unit-tests-esdras

    Refactoring for unit tests esdras

commit df1b1d210ee78e1ff84575ae604bdc1942469934
Merge: 4397fa4 73f4a89
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jul 4 07:48:48 2013 -0700

    Merge pull request #81 from claroline/refactoring-for-unit-tests-esdras

    Refactoring for unit tests esdras

commit 29c4bed2efdf5405b905dbcbb3d56543775d4521
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 16:47:52 2013 +0200

    Refactored MailController with user manager

commit da32b85669267a8a3644b94d98c0e86aa12ee03c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 16:47:52 2013 +0200

    Refactored MailController with user manager

commit 4397fa419d67e357d7c962938cad20fa0253c83a
Merge: 968f7ce 66c2acd
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jul 4 07:45:36 2013 -0700

    Merge pull request #86 from claroline/refatoring-for-unit-test-nico

    Refatoring for unit test nico

commit 4eb51579bf762ab04d9c8aa70c8e536eb507b772
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 4 16:40:53 2013 +0200

    fixed checkstyle

commit 73f4a8979be1d0f421fdfe8d82f94f650e0fabad
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 4 16:40:53 2013 +0200

    fixed checkstyle

commit e9877e753293639cec8d99e55e263aae63d8619e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 16:40:29 2013 +0200

    Refactored ImportExportResourceListener with role manager

commit a98bd79ec7e177c9d05c79bf2adcb38571779bd1
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 16:40:29 2013 +0200

    Refactored ImportExportResourceListener with role manager

commit 506c9179b60f1e847d098f01030054fb5d275dab
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 16:36:51 2013 +0200

    Refactored LogListener with role manager

commit d3f3f58f8280f13aca25f8be141f9f428a185078
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 16:36:51 2013 +0200

    Refactored LogListener with role manager

commit e099c73092b0c262c7351701165e64534a837c43
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 4 16:34:10 2013 +0200

    Distapcher renamed and exception thrown if class doesn't exists in the dispatcher.

commit 66c2acd850cb0f5a5b032c65b9393070f5f4eda8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 4 16:34:10 2013 +0200

    Distapcher renamed and exception thrown if class doesn't exists in the dispatcher.

commit ed190e9259cb63622263d919b3d85d0175d088bc
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 16:26:45 2013 +0200

    Refactored DirectorListener with role manager

commit 54857040370a421d32a5576554103818f286c82d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 16:26:45 2013 +0200

    Refactored DirectorListener with role manager

commit ab57cc42e4223704d9d07e7b2ac793a3d1720fab
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 4 16:06:39 2013 +0200

    Readme update

commit ba311d2d70d21519b5a06f4f17036e70d1f2b13c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 4 16:00:35 2013 +0200

    Removing resource exporter + plugins update.

commit 2cbca3db1229d192bf658a6b537b3bdc291b0257
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 4 16:00:35 2013 +0200

    Removing resource exporter + plugins update.

commit 685ce0000119153b038d8d864f74d9948f5efc82
Merge: f33a573 43fe334
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jul 4 06:54:31 2013 -0700

    Merge pull request #85 from purplefish32/readme

    Change update instructions in README

commit f33a57330d48d23498ebc4800cdf72db49500a8e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 4 15:53:35 2013 +0200

    Email notification for critical error in the Demo

commit eecc0581fb2edf267bede084e688908bb017d1c9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 4 15:50:58 2013 +0200

    ResourceController + new dispatcher done.

commit e3efa264bfcdb93c1abb775d1646197a0e1b3150
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 4 15:50:58 2013 +0200

    ResourceController + new dispatcher done.

commit 76ac4cf7b1449dc98ba0c5b644ac2212386fdbd3
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 15:41:43 2013 +0200

    Refactored ViewAsListener with role manager

commit 979aa8f62cb601579016054b317e8fc1ccea8130
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 15:41:43 2013 +0200

    Refactored ViewAsListener with role manager

commit 43fe33459ff6f1c71a5159fb8ab4179021d03bb9
Author: Donovan Tengblad <purplefish32@gmail.com>
Date:   Thu Jul 4 15:40:01 2013 +0200

    Change update instructions in README

commit d1b964dfe6a97bad0896bf13677d325fed9d3b32
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 4 15:39:13 2013 +0200

    checkstyle

commit e0b4f780f65d0ba306baa7f831b67457c89b2f66
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jul 4 15:39:13 2013 +0200

    checkstyle

commit e9e25dc0d12e4b60ebe1c98127333e8a88ada120
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 4 15:37:40 2013 +0200

    Home manager draft Updata

commit 7cb81ad3b0d72dbc8bd35be6b1adf00da526c82c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 4 15:37:40 2013 +0200

    Home manager draft Updata

commit fc9c5dfd0b1d8e0779edfd6cd1876364bd6007e4
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 15:28:00 2013 +0200

    Refactored WorkspaceVoter with managers

commit 5063a25f46d860a1df130e7805a995c1044bb493
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 15:28:00 2013 +0200

    Refactored WorkspaceVoter with managers

commit 1c0431cd7d5a2d92e935475cda729171da195d79
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 15:24:19 2013 +0200

    Refactored RoleDelegate with managers

commit 8f5ab5e87fbaf21278cf0e5394fe7d6364ed6c1e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 15:24:19 2013 +0200

    Refactored RoleDelegate with managers

commit c59bb48328179dd115d8a2ca2bd1ff0f64330cdc
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 15:18:05 2013 +0200

    Fixed bug : missing use

commit adac9675e8209f2495bbd8122c8b455bde513429
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 15:18:05 2013 +0200

    Fixed bug : missing use

commit b0e6d66ab3e6603419dad5f92f510ada7014a63b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 15:14:57 2013 +0200

    Refactored WorkspaceController using Managers

commit db31e904c02aeab30bdc3cbcc948be9c0cfb0370
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 15:14:57 2013 +0200

    Refactored WorkspaceController using Managers

commit 4234ea33c5ecf97d14abed046b71452aaaa1a313
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 14:45:02 2013 +0200

    Merged claroline.workspace.organizer service with WorkspaceTagManager

commit 216119e64a9c60425727fadff142bb6957b96aa8
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 14:45:02 2013 +0200

    Merged claroline.workspace.organizer service with WorkspaceTagManager

commit 0edf9ae2b44055036d7c40da5b487656489ef6e1
Merge: 7953735 85ef0db
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 4 14:29:41 2013 +0200

    Merge branch 'master' into open_badge

commit bb7b5f4a528a660867b97792bc8778c66bd14655
Merge: 6427a6d 3258037
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 4 14:29:41 2013 +0200

    Merge branch 'master' into open_badge

commit 795373508996557440284400ff696826c36ba044
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 4 14:22:59 2013 +0200

    Changing the way to deal with image upload for badge

commit 6427a6da86f7ac443b3f8035ec67a6f44f5a05ba
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 4 14:22:59 2013 +0200

    Changing the way to deal with image upload for badge

commit a7bacfb9444f49442b1e2f03b5f38a2d6f1e33c5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 4 14:03:43 2013 +0200

    Intermediate commit

commit e4bb942a5cbbd3f2711f9a8a471b4110e09de791
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 4 14:03:43 2013 +0200

    Intermediate commit

commit 2f57e8d160b30ceb6f4d0691688fe94c544c361b
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 4 13:58:20 2013 +0200

    Edit page work with translation

commit a49ae8dcb432bb4511824e616de22d24ce4753e9
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 4 13:58:20 2013 +0200

    Edit page work with translation

commit 974fb3ec98101cfb1cc30dc1ae8549ab783ef801
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 4 13:18:13 2013 +0200

    Edit entity to allow cascade persist

commit df175d7df5e93f0476ed5efb259e370a3d0519bc
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 4 13:18:13 2013 +0200

    Edit entity to allow cascade persist

commit 580b17c13fa669af7fb0e27ff2cae40f2667c30c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 11:47:41 2013 +0200

    Refactored access to repo in manager

commit 4e555edc42bbf39751ab36535151c8a2b01b6709
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 11:47:41 2013 +0200

    Refactored access to repo in manager

commit f7180386c6c1032531d6c9320554a587af099301
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 4 11:10:37 2013 +0200

    Ended resource repo tests

commit fc620d559b88c3849ae2c69956c18ca3c25ba7f3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 4 11:10:37 2013 +0200

    Ended resource repo tests

commit f483dd2ababe390c7bc82c056ad5e2e7faab1970
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 10:21:57 2013 +0200

    Refactored ProfileController with manager

commit c8e6153def7cbaa874c3540d10f86f84b3c92f3a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 10:21:57 2013 +0200

    Refactored ProfileController with manager

commit efaa57b314b551541f1e6ffbb4ebe705a5cd98fb
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 10:08:26 2013 +0200

    Refactored LayoutController with role manager

commit 986311ed746aaea14b353f70813d32b6408a2d9f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 10:08:26 2013 +0200

    Refactored LayoutController with role manager

commit 85ef0db2775fc7a0ac9307833eaef34baf47f7c8
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 4 09:51:02 2013 +0200

    Fix bug when use themes from bundle/plugin

commit 3258037ea3d5ae710ac1fe1f9b5a7c4476347ea8
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jul 4 09:51:02 2013 +0200

    Fix bug when use themes from bundle/plugin

commit afe53b48b8b477b2451ba9bd69bfdaafe8c9fd05
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 4 09:46:30 2013 +0200

    Delete fromTranslationBundle + make translation by hand

commit 8e50981c1c6ddd9e472161dc9b7741b0c574c87b
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jul 4 09:46:30 2013 +0200

    Delete fromTranslationBundle + make translation by hand

commit cf725f039f1657c8b0943303eaa894f2ce9ea8fd
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 09:41:29 2013 +0200

    Refactored controller without repository access

commit 91ce8af9391537676b0214d2f1b8241e94057f31
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jul 4 09:41:29 2013 +0200

    Refactored controller without repository access

commit 76c8dff7bc5b40cc7072d81395d2b4973a9cad70
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 3 16:08:01 2013 +0200

    Refactored repository access in controller

commit 48cf6e23a28e90a7f842bb2e5aa17a6f8e7876f5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 3 16:08:01 2013 +0200

    Refactored repository access in controller

commit b5169159f5709925782826264bc6b4eff0d8ebcb
Merge: a13fdf8 ce48432
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 3 15:48:09 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-esdras

commit 5deb04ca8ce663d5a3e92b8f944b530954ac82b0
Merge: e54750f 968f7ce
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 3 15:48:09 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-esdras

commit a13fdf817b7ba8194096c8e4f0d7ef13de45939e
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 3 15:48:03 2013 +0200

    messagemanagertest

commit e54750f8458ea3c48df26d703c2ea11dcd3363ff
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jul 3 15:48:03 2013 +0200

    messagemanagertest

commit ce9b2129f17984c6d88dae6f69259d84e0bd984c
Merge: f409497 8ffe6a6
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jul 3 15:18:28 2013 +0200

    Merge branch 'master' into open_badge

commit 09bdbe505d72a5a3e1435c6c119b74efd866e70a
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 3 15:05:27 2013 +0200

    Home Manager draft update

commit 798650d01fb7c40dfbcf9d781b4a2a557bc6912b
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 3 15:05:27 2013 +0200

    Home Manager draft update

commit 8ffe6a6bec9de6e4fcf3344273941243f3f4ccc0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 3 14:10:01 2013 +0200

    Submodule update

commit 50c92a0f39ffa2545cf1a74210b3455d22b1564e
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jul 3 14:06:43 2013 +0200

    Adding formtranslationbundle to manage translation for badge

commit f40949748f6b2611e90f912725349d4fa436c3a5
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jul 3 14:06:43 2013 +0200

    Adding formtranslationbundle to manage translation for badge

commit 3c7e0dfe2fc13297fb738b650c26ae29a235e4ce
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 3 11:52:43 2013 +0200

    Skipped problematic test on mysql

commit 49df2790d0179c6237bb00b1cbb8daa463a00570
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 3 11:52:43 2013 +0200

    Skipped problematic test on mysql

commit bdcd29080a8179b35c771815a9956ef42d17c3cc
Merge: 27947de ce48432
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 3 09:37:12 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

commit fead72bd602274e5b6ea97fb234363e2099f65ef
Merge: 5a52e98 968f7ce
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 3 09:37:12 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

commit 27947deb91417e7aa949d26c90a73c1189dc0b81
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 3 09:35:29 2013 +0200

    HomeManager draft

commit 5a52e98d91dd1e3b4cd385708438be731c33794e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jul 3 09:35:29 2013 +0200

    HomeManager draft

commit 7772dbd07dd50925ae37410c6cbac71777cf47e7
Merge: e935b0a a889370
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 3 09:06:43 2013 +0200

    Merge branch 'refactoring-for-unit-tests-stefk' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php

commit 3555d448fce0761caa763b47b4a480baeabb5f18
Merge: 72051bd b9c27a5
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 3 09:06:43 2013 +0200

    Merge branch 'refactoring-for-unit-tests-stefk' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php

commit e935b0ab978cdb62595dbb18eda9c9e29c19ce1c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 3 09:03:44 2013 +0200

    Refactoring ResourceController (intermediate commit)

commit 72051bd68b02a5baacf39e5d8a3e2d13c0ec2313
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 3 09:03:44 2013 +0200

    Refactoring ResourceController (intermediate commit)

commit bded517dacf7ab9113573b9fec6b66c47d721d7e
Merge: 7540cd6 b9c27a5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 3 08:48:01 2013 +0200

    Merge branch 'refactoring-for-unit-tests-stefk' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-kitan

commit 460ccafca55cc609e5bd1eb5cc88cb76965bc679
Merge: ff6f611 a889370
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 3 08:48:01 2013 +0200

    Merge branch 'refactoring-for-unit-tests-stefk' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-kitan

commit 7540cd6a19e0880465e8376d64c1aef25cb66cb4
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 3 08:47:23 2013 +0200

    Refactored role repository access in controller

commit ff6f61104651de9b7e54f7e5f0bd9317e76a1092
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jul 3 08:47:23 2013 +0200

    Refactored role repository access in controller

commit b9c27a59e4e8094a343ff037f96f3fdcd11f3b1d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 3 08:45:45 2013 +0200

    Fixed postgres compatbibility

commit a889370c645c28383f09b24ce0bb555af6a142f5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 3 08:45:45 2013 +0200

    Fixed postgres compatbibility

commit 298e43a88bfbc559b2ef27851345a34e30bbeec3
Merge: cad5771 97faaa6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 2 16:52:07 2013 +0200

    Merge branch 'refactoring-for-unit-tests-kitan' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/UserManager.php

commit 4a9e5a1b6c9abd170e4e72a37a6b9782c44f639f
Merge: acdb705 693876d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 2 16:52:07 2013 +0200

    Merge branch 'refactoring-for-unit-tests-kitan' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/UserManager.php

commit cad57713c5bf4dfd199a37697b5bc8ae20af3313
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 2 16:46:48 2013 +0200

    intermediate commit (merge from kitan)

commit acdb705b6ac2256fc97db822de11b20eca026182
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 2 16:46:48 2013 +0200

    intermediate commit (merge from kitan)

commit b61c87b41834356f84adbb58f240a39d8075c44a
Merge: b315a07 968f7ce
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 2 16:10:20 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-stefk

commit b622e8826478400c7553394bbc6f37c7a956c95e
Merge: 98f2854 ce48432
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 2 16:10:20 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-stefk

commit b315a07bbf604761ff5527ceedaac30285761a27
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 2 16:09:09 2013 +0200

    Pre-merge

commit 98f2854b120ca366332385d68906fe84bb93be67
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 2 16:09:09 2013 +0200

    Pre-merge

commit 3b47ba7e5473d823fb1f391e20a45abf412c8cf2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 2 16:03:28 2013 +0200

    MailController done.

commit 5ea3c5b8f4b44e43f4f9ae1fdf9ab03bc082eb40
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 2 16:03:28 2013 +0200

    MailController done.

commit 5257ee7b96feafb85bf6d11bae43c03fe786ec77
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 2 15:26:28 2013 +0200

    Fixed bug of double var  declaration

commit dbfc74350ec58b3a5e044ac13797e836fd4d1fae
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 2 15:26:28 2013 +0200

    Fixed bug of double var  declaration

commit 68437628a5e2cdf5938cb4b07fc470671c9e5ba0
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 2 14:25:38 2013 +0200

    Moving add button to top with tooltip + message when no badge

commit 59a4206ce2c13c851ea072e85b3e2b820e560e3c
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 2 14:25:38 2013 +0200

    Moving add button to top with tooltip + message when no badge

commit 97faaa6b69de641a0590b6b4dc7fbf99d60e7014
Merge: 1263f2c 1db4527
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 2 14:22:45 2013 +0200

    Merge branch 'refatoring-for-unit-test-nico' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-kitan

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/RoleManager.php

commit 693876daaa41ebfe02989dfc2901fa0c83c5e309
Merge: ce44814 54cd811
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 2 14:22:45 2013 +0200

    Merge branch 'refatoring-for-unit-test-nico' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-kitan

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/RoleManager.php

commit 1263f2c8032c1f39d32b8f749f92aa4a415b0c42
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 2 14:20:00 2013 +0200

    Refactored addRole method by RoleManager methods

commit ce448144743f400377cbdbac5d94e9a051c2b135
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 2 14:20:00 2013 +0200

    Refactored addRole method by RoleManager methods

commit 968f7ceddfab23b8df756e4d3359a695f290b9b0
Merge: 141b42a ac6d07d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 2 04:02:14 2013 -0700

    Merge pull request #79 from claroline/refactoring-for-unit-tests-stefk

    Resource repository tests and refactoring

commit ce484320553a724b62581b7c7dc7e5af43f4c151
Merge: 029d88b 115114d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 2 04:02:14 2013 -0700

    Merge pull request #79 from claroline/refactoring-for-unit-tests-stefk

    Resource repository tests and refactoring

commit ac6d07d6eec5e155bed4d5212a5ae6ced00472d2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 2 12:57:45 2013 +0200

    Resource repository tests and refactoring (draft)

commit 115114dac24159d5b6314a45375732b7a19eb6a0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 2 12:57:45 2013 +0200

    Resource repository tests and refactoring (draft)

commit 141b42af18e6e05d4b180d25d6f85c166f2ffd2e
Merge: 723a5f1 54cd811
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jul 2 03:55:03 2013 -0700

    Merge pull request #78 from claroline/refatoring-for-unit-test-nico

    Refatoring for unit test nico

commit 029d88b3d321240d669f3a7b4fbe86db9dffdf9e
Merge: e857c4c 1db4527
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jul 2 03:55:03 2013 -0700

    Merge pull request #78 from claroline/refatoring-for-unit-test-nico

    Refatoring for unit test nico

commit 1db4527a5ca2620f4ec09650a245c56ff6505c06
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 2 12:53:57 2013 +0200

    Few tools fixes.

commit 54cd811b15f1ea5fe46897c61407093596130b61
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 2 12:53:57 2013 +0200

    Few tools fixes.

commit 8b82fa21b43fb729ee9022318fe83a3026a4808a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 2 11:54:39 2013 +0200

    Added tests for Role and User Manager

commit 123333b447c8f97e04332daec0583efe0f847f00
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jul 2 11:54:39 2013 +0200

    Added tests for Role and User Manager

commit 3d57055fead8b4016550fd0b05a22a9b05d8b0b5
Merge: 689ee3d b6e1392
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 2 11:34:28 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

    Conflicts:
    	composer.lock

commit 1b252c43f184166670c4417a9f8ba6465ebd0938
Merge: 92924f5 28ba587
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 2 11:34:28 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

    Conflicts:
    	composer.lock

commit 689ee3d9e2c5f17eed8c54e3ad1bc9490d19a423
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 2 11:32:36 2013 +0200

    AdministrationToolController done.

commit 92924f5e53ea1795200c03a68330a056c1a8dd74
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 2 11:32:36 2013 +0200

    AdministrationToolController done.

commit 558f3e7715826ad84779a86e9ebdb55159c0129c
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 2 11:31:34 2013 +0200

    UI changes

commit f25919bff6a4db7c19a8d1e6253d6e3bbd1898d0
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Tue Jul 2 11:31:34 2013 +0200

    UI changes

commit 5b81a108406ca6d5545d4a5ab919d8b4965362b6
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Jul 2 11:10:42 2013 +0200

    Upload file with drag n drop

commit 347e0e772ad42233bb6291a053ab0b917cfeaa20
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Jul 2 11:10:42 2013 +0200

    Upload file with drag n drop

commit f5cb8d0e8b2e8c2f2f083ad46babaa9cbe40a3e4
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 2 10:57:11 2013 +0200

    WorkspaceToolsParmetersController done.

commit d90cf8e5d5f2b567dcbb01644ab73040c7613bad
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 2 10:57:11 2013 +0200

    WorkspaceToolsParmetersController done.

commit 559aba346a0af231d07b10ac795983f5f24f81c5
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 1 16:50:55 2013 +0200

    Changing color of cancel button

commit 5e521ea391cfcf8cc0faac4ad6e53128b145b781
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 1 16:50:55 2013 +0200

    Changing color of cancel button

commit f9272b2d786f4384336279ef8c6daf256ba1d1a8
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 1 16:45:15 2013 +0200

    Adding option to datepicker widget to configure it + delete focus event on input datepicker

commit 3ae030076e0c676a5d46cf83681c2020b5e7d8b4
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 1 16:45:15 2013 +0200

    Adding option to datepicker widget to configure it + delete focus event on input datepicker

commit b94b614614acd3790b040d034bec461e58a6ba58
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 1 16:17:52 2013 +0200

    Modified fixture creation/access in repository test case

commit edbe5bb5aca54f68295da020d22bd468f326d3f5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 1 16:17:52 2013 +0200

    Modified fixture creation/access in repository test case

commit 0c549b86cc934bb5710c82488abd32ae09b78c55
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 1 16:12:43 2013 +0200

    Added EventDispatcher type in UserManager constructor

commit dadde3fd0d5242a674ffcf19d15bf58845c8775f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 1 16:12:43 2013 +0200

    Added EventDispatcher type in UserManager constructor

commit 1feabca2681bc0ac39dbe949ce70637195e8a8ff
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 1 16:09:47 2013 +0200

    Returned role in create method of RoleManager

commit dd14a806297386874bda1282b7ccad54c5730b57
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 1 16:09:47 2013 +0200

    Returned role in create method of RoleManager

commit 7317d529046905862a135de7b460519b98a7730c
Merge: 2bf0c4d ec83fef
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 1 15:43:34 2013 +0200

    Merge branch 'refatoring-for-unit-test-nico' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-kitan

    Conflicts:
    	src/core/Claroline/CoreBundle/Library/User/Creator.php

commit cb66dbf3af78707b2942161db9a394b5cdb85c6a
Merge: 2336931 efa734d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 1 15:43:34 2013 +0200

    Merge branch 'refatoring-for-unit-test-nico' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-kitan

    Conflicts:
    	src/core/Claroline/CoreBundle/Library/User/Creator.php

commit 2bf0c4dae6e1157db88e3ffc3073a1fc72ecb85e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 1 15:23:31 2013 +0200

    Refactored RoleManager initWorkspaceBaseRole function

commit 2336931e5f3d9966bae3186a34af11ff96ff2754
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 1 15:23:31 2013 +0200

    Refactored RoleManager initWorkspaceBaseRole function

commit ec83fef1ce0bd81803b9e596e1ba2d0f693d9116
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 1 14:30:51 2013 +0200

    Desktop ToolManager done.

commit efa734dbd835a31dca191d65f865a03cde5644b2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 1 14:30:51 2013 +0200

    Desktop ToolManager done.

commit baf955be07ee6f78784c085f871b8e36815e5de6
Merge: c22f5cb 28ba587
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 1 14:30:12 2013 +0200

    Merge branch 'master' into open_badge

commit 28ba5871a05d95cb0b3ade07e1dc544b64137a08
Merge: 4fee79a 4541b52
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jul 1 05:28:49 2013 -0700

    Merge pull request #77 from claroline/update-frontend-bundle

    Update FrontendBundle (confirm-bootstrap added in it)

commit ee204371f5b15d8c41597e9291510f63478b8f84
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 1 14:26:30 2013 +0200

    Deleted WorkspaceTagWriter

commit d0140b7e291baa573fbd90c94c257755fe212053
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 1 14:26:30 2013 +0200

    Deleted WorkspaceTagWriter

commit 9aae2802b049a460fc7ba169f94fd8f5985ee289
Merge: 0c03713 e857c4c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 1 14:01:51 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-kitan

commit 4db3c1c9a111febabfc83544628dd882c8fc2667
Merge: 18c8c4f 723a5f1
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 1 14:01:51 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-kitan

commit 0c03713d910bfc4a02a30c1cef3b0429e75a520f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 1 14:01:09 2013 +0200

    Refactored user with manager

commit 18c8c4fca45e4ccb3f01100dad5dccf8565e422c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jul 1 14:01:09 2013 +0200

    Refactored user with manager

commit de48004fd127f09fe04cc613c53e011c107c27c8
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jun 28 17:44:33 2013 +0200

    Adding delete link, with confirm-boostrap which is currently in a PR on the frontendbundle

commit c22f5cbbe7dd6e5323ff1bb3d53301d68ff5c26a
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jun 28 17:44:33 2013 +0200

    Adding delete link, with confirm-boostrap which is currently in a PR on the frontendbundle

commit de2a7a2a3dc4910cecaf27682ad12efdd703c5e6
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jun 28 16:53:24 2013 +0200

    Image file name for badge is badge slug and no zombie file + Updating doctrine/orm and doctrine/doctrine-bundle to last version

commit cf34b4a76d488b60e4a2713fb0cdc2bcb0aa9afc
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jun 28 16:53:24 2013 +0200

    Image file name for badge is badge slug and no zombie file + Updating doctrine/orm and doctrine/doctrine-bundle to last version

commit adb3add523de91d4a165968e028961e18818a9e5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 1 13:53:41 2013 +0200

    Fixed method name

commit 9f5e3717fb6b34bb3093e827255de7e1c05d3f04
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 1 13:53:41 2013 +0200

    Fixed method name

commit f9f1bda1b9dd860cd28da78f3d80d8a556c8d45f
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jun 28 15:13:07 2013 +0200

    Editing badge is possible

commit e427c46f2edbc841b7056e5201232d838bd948dd
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jun 28 15:13:07 2013 +0200

    Editing badge is possible

commit d5c346078d24dd1ef1d1aeea8e96ae417ff7a5d3
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jun 28 11:24:47 2013 +0200

    Badge creation work with upload + creation of a datepicker form field type + adding directory upload for badges images + activation of the sluggable extension

commit 4e97cfda1149ead3e399a0713469734c59f27362
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jun 28 11:24:47 2013 +0200

    Badge creation work with upload + creation of a datepicker form field type + adding directory upload for badges images + activation of the sluggable extension

commit 0536a4326846d489d3c5fc3c58f9d7edb405b68f
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jun 28 09:26:33 2013 +0200

    Adding action button in form

commit 75315aefe7c1415e70b33de2b266ba2f3d3c69ab
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jun 28 09:26:33 2013 +0200

    Adding action button in form

commit d901457f342c43ec354942e6f9c8287c45b8a9f9
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jun 28 09:26:05 2013 +0200

    Modify translation for earning criteria

commit 1182c0e32a5d5a62c37d99a0130f7fe8042f1506
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jun 28 09:26:05 2013 +0200

    Modify translation for earning criteria

commit b8138565c100e3d60fd6a7e7dce36a55115d7840
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jun 28 09:25:00 2013 +0200

    Add ' :' to label in form

commit a238968855c2575fa9feaad2a3abf920ef24b72a
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jun 28 09:25:00 2013 +0200

    Add ' :' to label in form

commit 6a3077e38afc3430b62b8f44291f224774042eaf
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jun 27 11:46:39 2013 +0200

    Adding some suger to the add badge link

commit 2fd813cd74115e68bbdd9a43ffa2e8736e0f92ff
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jun 27 11:46:39 2013 +0200

    Adding some suger to the add badge link

commit 1903ed429d17d933d6725999e605dac05f1094cf
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jun 27 11:38:08 2013 +0200

    Add a little effect when hover link to add badge

commit 58b1b6a2bbb20d3a7b2772722bd7552db52b6557
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jun 27 11:38:08 2013 +0200

    Add a little effect when hover link to add badge

commit 0ef4f4c20863131739bce83c573c8b63f7b4d251
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jun 27 11:18:13 2013 +0200

    Controller access test for badges

commit 9a8d163caa33badbee0bce7e65e119d38febe1a4
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jun 27 11:18:13 2013 +0200

    Controller access test for badges

commit 80ce0d03c40493f29fa3198f74b2ca14860a24d3
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jun 27 10:58:37 2013 +0200

    Revert change on fixtures files

commit 9ec7a2037591e6d78e35c50c330cad01a805bd8d
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jun 27 10:58:37 2013 +0200

    Revert change on fixtures files

commit 6c1e42452ba9af9fafcbf2026fb75c8f6fc34fc0
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jun 27 09:15:13 2013 +0200

    Add create badge page + add datepicker form widget

commit 051ccc6f4ca4866a37f334a2a9a61b9afe4203b5
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jun 27 09:15:13 2013 +0200

    Add create badge page + add datepicker form widget

commit 802e95fae3ff2f0fe3bb8ce052844355db747772
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jun 27 09:13:39 2013 +0200

    Add getters and setters on badge class

commit 15422f9385ce0e0172f3373289295add151874e7
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jun 27 09:13:39 2013 +0200

    Add getters and setters on badge class

commit 067625f515f5edc76ae502a19a53bbd7b1ac2b7f
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 26 11:46:01 2013 +0200

    Adding documentation for badge

commit 59cbd7619ccd884b24d1789a784267d260cc3c9b
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 26 11:46:01 2013 +0200

    Adding documentation for badge

commit 92ad67e66b1814f1b759399bd0042f148e670c14
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 26 11:45:45 2013 +0200

    Modify migration to add badge tables + add entities

commit 10522c0e421204c85906f9b5f583047413d0cfd1
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 26 11:45:45 2013 +0200

    Modify migration to add badge tables + add entities

commit e30b39fafeae15132bcb8889db8540a74b4013a6
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 26 11:45:05 2013 +0200

    Delete useless code, container is already in the class by inheritance from abstractFixture

commit e1161c0c8675d01d8e2dce35172f2316a3674722
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 26 11:45:05 2013 +0200

    Delete useless code, container is already in the class by inheritance from abstractFixture

commit 4541b526c85d2f44399ff42486649d005a946d5b
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jul 1 13:48:48 2013 +0200

    Update FrontendBundle (confirm-bootstrap added in it)

commit 26ed830567da7bc4b1ad8e8a2b471439351033f5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 1 11:37:15 2013 +0200

    Changed service name

commit a2ece8f1f7303bd3d3753f58065369b6e0c4bb9c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 1 11:37:15 2013 +0200

    Changed service name

commit 7ca3677fead4adb18c4d722f4e2876db5356ce14
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 1 11:08:01 2013 +0200

    Moved old controller test to integration dir

commit 0522b97cea968b1807ae5a1e10681d436b6b13b3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 1 11:08:01 2013 +0200

    Moved old controller test to integration dir

commit a9cf1601d88b9e557d5baf9b9238bd1b1d05e7c2
Merge: 43a1e3c e857c4c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jul 1 11:01:31 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

commit 4792d518c09a3359ce1cec6ab7109c21ebcde541
Merge: 41511b9 723a5f1
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jul 1 11:01:31 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

commit 4fee79a7f21756d925f35e352356e55011e261c9
Merge: c1e6ddf 080492a
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jul 1 01:24:31 2013 -0700

    Merge pull request #73 from claroline/update-doctrine-orm-and-bundle

    Update doctrine-orm and doctrine-bundle to lestest version

commit 723a5f1495453b544288f02d9403ebd23feb4387
Merge: f35392c 5d87f78
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 1 01:21:18 2013 -0700

    Merge pull request #76 from claroline/refactoring-for-unit-tests-stefk

    Added converter example

commit e857c4cc60401faa3371db9c37b003857b04cee1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 1 10:17:23 2013 +0200

    Added converter example

commit 5d87f78187bb7afa133e003ae107266ee239ee3c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 1 10:17:23 2013 +0200

    Added converter example

commit 43a1e3ca886897074deb4bee4d6b6b89812478e6
Merge: 67a0ed0 dfe054e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jul 1 10:01:05 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

commit 41511b9289e19eaf87a35e213f4d92cb8f79bcf2
Merge: 225033d f35392c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jul 1 10:01:05 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

commit 196cb788d46eb2a00c4d3a34fef47de4a62a1c82
Merge: db73ea4 dfe054e
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jul 1 09:47:55 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-esdras

commit 54326aca8b2708811609272818f15ea07fc70109
Merge: 0bf58b0 f35392c
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jul 1 09:47:55 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-esdras

commit db73ea4f5abe1c01c3d688ed75aef5bed81fa9ab
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jul 1 09:47:44 2013 +0200

    messagemanagertest

commit 0bf58b005f87aa66c8f07786ea4af81dc7424883
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jul 1 09:47:44 2013 +0200

    messagemanagertest

commit c1e6ddf65c109db836feb78623c7be92d9d81614
Merge: 41e395f 0f2e6dd
Author: stefk <stephaneklein221@gmail.com>
Date:   Sun Jun 30 23:58:35 2013 -0700

    Merge pull request #69 from claroline/GUI

    GUI update and close #67

commit f35392cedb4c81cb60754c9fad611e607835bc3a
Merge: 53d32a2 525b3f9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Sun Jun 30 23:58:34 2013 -0700

    Merge pull request #74 from claroline/refactoring-for-unit-tests-stefk

    Refactoring for unit tests stefk

commit 67a0ed081af8fc5467ab5ec5351afa0778f81f5a
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jul 1 08:54:34 2013 +0200

    Message controller test draft

commit 225033dfdbdd72826e400b7af28cb9c57b39eaf5
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jul 1 08:54:34 2013 +0200

    Message controller test draft

commit dfe054e8305b52513fa1da5c3b6e2a4a5355ecb1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jun 30 16:09:18 2013 +0200

    Removed empty repositories

commit 525b3f918a9c704d9b8736291e09ce5b795ec240
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jun 30 16:09:18 2013 +0200

    Removed empty repositories

commit de1b62d6f0e1f3e74fa70502098bca85c0f97e4a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jun 30 15:36:27 2013 +0200

    Added missing doc blocks

commit 939ffc060206bc30014eb5fe4b0f80f9056f09b9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jun 30 15:36:27 2013 +0200

    Added missing doc blocks

commit 0760cd901d8a16e4a0ad287b6f21d132ce9f12da
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jun 30 13:55:01 2013 +0200

    Added exception codes to avoid false positives

commit e24db48ac9d4c09931dd31dd389416fb701f8f6a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jun 30 13:55:01 2013 +0200

    Added exception codes to avoid false positives

commit 4751047e3c8292bca236ad2b089f56103cfb330f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jun 30 13:31:30 2013 +0200

    Added strict id converter test

commit d38609843fea80357b1f8b9053e882ecdfcb1c9d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jun 30 13:31:30 2013 +0200

    Added strict id converter test

commit 06093d70f0c35e3251ce7e49f774288cf731290e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jun 30 12:39:59 2013 +0200

    Added a missing assertion

commit ae257c463af5254f31a090d9e4cbd145281af885
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jun 30 12:39:59 2013 +0200

    Added a missing assertion

commit 367eedd8d2764efef33e4de727c86e4bc88d3f32
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jun 30 12:39:11 2013 +0200

    Added multiple ids converter tests

commit 5eaecdee54e15c7f79841b3eff97585a0b8023a7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jun 30 12:39:11 2013 +0200

    Added multiple ids converter tests

commit c18c5424e5bb8473247f25088e41d4374c791730
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 29 22:07:29 2013 +0200

    Added authenticated user converter tests

commit 7b22d08c59c9aab48338e8ef2f12b909c930d338
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 29 22:07:29 2013 +0200

    Added authenticated user converter tests

commit d089c1c479608e85bba24a6f3018e3e18042ad24
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 29 21:09:08 2013 +0200

    Added generic repository tests

commit 8ae2dc8647ebf7e03c659796f3d743ea3524215e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 29 21:09:08 2013 +0200

    Added generic repository tests

commit 692abe9677ebd3be56980c306c9e8cf17bcf2a40
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 29 19:52:52 2013 +0200

    Added message controller tests

commit 0ee634b1690d422754d1d54d8438e29b5a697c1b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 29 19:52:52 2013 +0200

    Added message controller tests

commit 43a5c9da6e76786e711d221342e262cfbf08aa5d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 29 19:52:20 2013 +0200

    Added message repository tests and alternative repo test case

commit 286f792c3166e7e35759e94d5ee121bf1facdcc7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 29 19:52:20 2013 +0200

    Added message repository tests and alternative repo test case

commit cdbf4d113d64284136d2c73c72f320458fa89603
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 29 19:50:10 2013 +0200

    Added form factory

commit 6d619d3042b47b01f8b48dadb538968f34cbb19a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 29 19:50:10 2013 +0200

    Added form factory

commit 2bcff127fca1fa26791ca1c3d89690db584355d8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 29 19:30:52 2013 +0200

    Added hamcrest to dev dependencies

commit 16ead6e32e5cc2da3b2b6b05c9d41302c0ad1fb1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 29 19:30:52 2013 +0200

    Added hamcrest to dev dependencies

commit 226dc53a43dbfb9eb8805517cb065fb5d6334496
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 19:23:35 2013 +0200

    Changed wrong method names

commit 42653482943087f528c91adf3af4bc4295fdcc95
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 19:23:35 2013 +0200

    Changed wrong method names

commit 080492a910087a93c6edb6894bda6543fe8fc464
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Fri Jun 28 17:03:48 2013 +0200

    Update doctrine-orm and doctrine-bundle to lestest version

commit 53d32a269d422e8ff7c523431405f9c1d69193f3
Merge: 70ccfe8 cf1cfc4
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 06:46:30 2013 -0700

    Merge pull request #72 from claroline/refactoring-for-unit-tests-stefk

    Refactoring for unit tests stefk

commit 77f4e808b3b090d232f259e6377abbbb69f850ad
Merge: 0117759 819862d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 15:43:14 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-stefk

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/UserManager.php

commit cf1cfc49f13d71a97aa85fa3febafa4b1d357b30
Merge: fc2d561 70ccfe8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 15:43:14 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-stefk

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/UserManager.php

commit 70ccfe8379a21ee66a4e9b6cf61aa6f53bb64fee
Merge: 0bdf322 a33909f
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jun 28 06:39:24 2013 -0700

    Merge pull request #71 from claroline/refactoring-for-unit-tests-kitan

    Refactoring for unit tests kitan

commit 011775932ab369bcbbf4657057b3d1781357e734
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 15:37:52 2013 +0200

    Removed commented code

commit fc2d561a96b0e0a53f3309cbd4a27f0ac8b456e2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 15:37:52 2013 +0200

    Removed commented code

commit 0bdf322984febd07cbe26e4d3632088b42dd1512
Merge: 164c585 5979662
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jun 28 06:33:50 2013 -0700

    Merge pull request #70 from claroline/refatoring-for-unit-test-nico

    Refatoring for unit test nico

commit 819862d1d408d9e5a9485ac7c955a371f06f1484
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 28 15:29:57 2013 +0200

    Fixed bug with personal WS in user manager

commit a33909f42781a1d94904fc77b143bdfd31745cdd
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 28 15:29:57 2013 +0200

    Fixed bug with personal WS in user manager

commit 6bdec1e9d11778de3b3d44f50a5322a635eb79d4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 15:25:02 2013 +0200

    Added message repos tests

commit 3f4b87d47f4ac5b73dc91c225156c17177a14f0b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 15:25:02 2013 +0200

    Added message repos tests

commit 98ce9b817148562c8390193597e5a3ce2bbe3a1c
Merge: fa3e910 f66a795
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 28 15:24:13 2013 +0200

    Merge branch 'refatoring-for-unit-test-nico' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-kitan

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/RoleManager.php
    	src/core/Claroline/CoreBundle/Writer/RoleWriter.php

commit b94d8e65a1a20ca38a733c5808f821b3a34d8a7d
Merge: c45464f 5979662
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 28 15:24:13 2013 +0200

    Merge branch 'refatoring-for-unit-test-nico' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-kitan

    Conflicts:
    	src/core/Claroline/CoreBundle/Manager/RoleManager.php
    	src/core/Claroline/CoreBundle/Writer/RoleWriter.php

commit fa3e91059c5dfcd268c43b81a8c1c4812f0ef7f8
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 28 15:15:45 2013 +0200

    Deleted RoleWriter and UserWriter

commit c45464fb44107754902ccfd0f02b5fd8474a390d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 28 15:15:45 2013 +0200

    Deleted RoleWriter and UserWriter

commit 59796629f00a04e0e71a4fff6c9d895b31f2dfd2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 15:01:04 2013 +0200

    Fixing Message mapping.

commit f66a795573fb7c7459beca62f6f5c37f8c71dbba
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 15:01:04 2013 +0200

    Fixing Message mapping.

commit 6c2dfc78cd7fbcbd344127d589b842abd3643074
Merge: f1fb6ac 164c585
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 14:58:18 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

commit 8e7203e050462972f73c487b562e2aee2ab3c9d7
Merge: bdaa709 3a61eba
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 14:58:18 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

commit f1fb6ace6e7922b398c1a4bdd0d84248ae360a70
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 14:55:34 2013 +0200

    uncommenting raw install

commit bdaa7098f97dc7476f65590c95700964004b67d8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 14:55:34 2013 +0200

    uncommenting raw install

commit 943681f7646337733ec86ed48927299542a91dec
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 14:46:04 2013 +0200

    Fixing demo creation.

commit 43c10601d17c8030a2f7f9614e6549f4e1d16714
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 14:46:04 2013 +0200

    Fixing demo creation.

commit c65ab1540e00b4b77d2a6ef0c157199e8930432f
Merge: 0418ba1 164c585
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 28 12:05:35 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

commit 3a61eba8433b895ac95e18a66056de46d3800787
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 28 12:04:51 2013 +0200

    Fix __construct typo

commit 164c58592dbca8b71ec5cefa0854cb5b9b78c1e0
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 28 12:04:51 2013 +0200

    Fix __construct typo

commit 6c531ff7088162d894d8f7ceedd1530ddbc2163c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 28 11:57:28 2013 +0200

    new test controller

commit 0418ba11132c12d4a3625d3667ddce1e54329542
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 28 11:57:28 2013 +0200

    new test controller

commit eedee9d5b33ff12b351d09155d61bb10e5819b38
Merge: 6df9ee4 cd34d3f
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 28 11:55:32 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

commit 4c53111e661f1c8c9937fe93007b22c816075a15
Merge: a336882 2552637
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 28 11:55:32 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests-jorge

commit 64315b9c1751a5aa41ab8b7aef11959bcbb12afa
Merge: d2243d0 2552637
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 11:55:07 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

commit d293bc23dd481bcbc5efa5b676ab8d6c9e379ad2
Merge: edfa5aa cd34d3f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 11:55:07 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refatoring-for-unit-test-nico

commit d2243d0b7f09e98feb19ad0e3c687ff4049b2bfb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 11:53:53 2013 +0200

    Add and remove desktop tool.

commit edfa5aaea39f070ebe4f4d14eb45b7abeacdd0da
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 11:53:53 2013 +0200

    Add and remove desktop tool.

commit 6df9ee4be261c1ad50b86f84dafb89aab7bec408
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 28 11:53:47 2013 +0200

    Fix somme small errors

commit a336882e191bd799e0c8f9780fe7421137e385c7
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 28 11:53:47 2013 +0200

    Fix somme small errors

commit cd34d3fac9b1f565ebe60cb064c03e1593ab0671
Merge: 608259e f4ea6bc
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 28 11:52:39 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 25526370d2b27f3e387e3399539cc522e06af25a
Merge: caf29d6 673b96c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 28 11:52:39 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit caf29d6b076c5fdd12d06539793821e3a9155151
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 28 11:52:07 2013 +0200

    Submodule update

commit 608259e5ff810345fd97e802bc80a38c534dbcba
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 28 11:51:05 2013 +0200

    Debugged installation

commit b40c86c5945ae43b82d06ad845afabe64c125cf5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 28 11:51:05 2013 +0200

    Debugged installation

commit 7702f700a9438085bf44eec7f6370277aed22300
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 11:44:27 2013 +0200

    Fixed annotation

commit d38d5759e2b5da4e8324fec4cf52a16ac284d3bf
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 11:44:27 2013 +0200

    Fixed annotation

commit 673b96cf0b451c4be00b1ad76b2463f8ffbada7f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 10:37:07 2013 +0200

    Prep branch (refactoring tools)

commit f4ea6bcf795b7fcf150555d1117b2779ff1f4b20
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 10:37:07 2013 +0200

    Prep branch (refactoring tools)

commit 8f41cb7637788641dba105da10e54158c62c0680
Merge: 1b8d948 ea4aa77
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 10:35:23 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 37eab60bd2bbb697ae4b31e7065100abe65da8e7
Merge: 92d8297 857cdf7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 10:35:23 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 1b8d94878ec4669a5e9c51225db1853e6a2fa523
Merge: c1d7f9c e9189c0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 10:33:15 2013 +0200

    Merge branch 'refactoring-user-manager-writer' into refactoring-for-unit-tests

    Conflicts:
    	src/core/Claroline/CoreBundle/Library/Workspace/Creator.php
    	src/core/Claroline/CoreBundle/Manager/RoleManager.php
    	src/core/Claroline/CoreBundle/Resources/config/repositories.yml
    	src/core/Claroline/CoreBundle/Writer/RoleWriter.php

commit 92d82978b3bfb21c6735c7bc904416f82bd59f4e
Merge: 711f1e8 f27bc8f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 10:33:15 2013 +0200

    Merge branch 'refactoring-user-manager-writer' into refactoring-for-unit-tests

    Conflicts:
    	src/core/Claroline/CoreBundle/Library/Workspace/Creator.php
    	src/core/Claroline/CoreBundle/Manager/RoleManager.php
    	src/core/Claroline/CoreBundle/Resources/config/repositories.yml
    	src/core/Claroline/CoreBundle/Writer/RoleWriter.php

commit e9189c0537e1e5d0349cd24222dd6fefb72fc6e0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 28 10:20:45 2013 +0200

    Refactored role-user with manager

commit f27bc8fab83cb1dc575858be8ed2d2c08255db13
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 28 10:20:45 2013 +0200

    Refactored role-user with manager

commit ea4aa776124bf9af0f49046f8e7fe1952c06f618
Merge: b1f8293 c1d7f9c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 09:29:32 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/config/repositories.yml
    	src/core/Claroline/CoreBundle/Tests/DataFixtures/LoadWorkspaceData.php

commit 857cdf74c99bc6510dfd54c3003a8b61088f7c4d
Merge: ec5d9d7 711f1e8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 09:29:32 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/config/repositories.yml
    	src/core/Claroline/CoreBundle/Tests/DataFixtures/LoadWorkspaceData.php

commit c1d7f9c701edbbf25746b7f4c5033d7d2596a467
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 09:23:32 2013 +0200

    Added writer test

commit 711f1e8879fdb321b8c6b463afa78d7d856d389e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 09:23:32 2013 +0200

    Added writer test

commit c2378a1b4e259b32b5b24881bc1c97dcebf8273a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 09:21:01 2013 +0200

    Refactored message management

commit 84ed96ee670816efe55649a467900d6d4a9c6f6f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 09:21:01 2013 +0200

    Refactored message management

commit 55356d0d6e03c112a95460f1d2052853fccc9285
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 09:17:41 2013 +0200

    Added param pager factory

commit f12096670612a3ec581f685069cdfd46bc677210
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 09:17:41 2013 +0200

    Added param pager factory

commit efab2443bb86b786bafa86d74ceaac0b8c75d742
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 09:17:04 2013 +0200

    Added param converters

commit afe268539d5a778596a4693415a5fc663afc4f0c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 09:17:04 2013 +0200

    Added param converters

commit 6843adbaa2bd1f6c46b07905e023a53fe8a3f77c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 09:11:24 2013 +0200

    Added generic repository

commit 1ff76ac6cd29caea6e9a97bc938290f4836bda02
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 09:11:24 2013 +0200

    Added generic repository

commit 1ee5432e5a9cab8386970b9cb8805dfc86bc1951
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 09:10:19 2013 +0200

    Added generic writer

commit d01a30c18c15763a5a4fe6a5d3465b1e14b06192
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 28 09:10:19 2013 +0200

    Added generic writer

commit b1f8293030abfcfe5653ed052f4108c00d75a888
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 09:09:11 2013 +0200

    Raw install is now more or less working.

commit ec5d9d747a498243ea3a99d07fc9ed6b6a5ac097
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 28 09:09:11 2013 +0200

    Raw install is now more or less working.

commit b6e1392d9418fcbf91f7800bd26bcddb9f989544
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 27 15:37:24 2013 +0200

    Fix bad route and traduction

commit 0f2e6dd62b607bc6cdb9ac8983bd7a822145062b
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 27 15:37:24 2013 +0200

    Fix bad route and traduction

commit 00574e576bbfa00e3cbf4083026efecfb9258f6a
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 27 14:50:39 2013 +0200

    Update gui and refactoring breadcrumbs close #67

commit 60480f461ab58d492f0c6240bc143314dd852094
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 27 14:50:39 2013 +0200

    Update gui and refactoring breadcrumbs close #67

commit c8c34dc6edb9d30d4463b8f2239d7b86154e94ac
Merge: e6c3dc3 41e395f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 26 13:34:58 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 41e395f140f8cc95a63ef83a15bcf51abc2d5b2b
Merge: c781053 9dc1d1e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 26 03:10:52 2013 -0700

    Merge pull request #65 from claroline/monolog

    Adding monolog prod settings script (automated job purpose)

commit 9dc1d1edaa4546613381a8135d78e73399eca770
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 26 12:09:18 2013 +0200

    Removed comma

commit 70fe62167b6b7d1fa718fac2f7a3b58ce8ff71a2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 26 12:03:02 2013 +0200

    Moved command to dev script

commit ad3bf1e0039259643cf4dc4c9a84876681cc57b4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 26 11:26:23 2013 +0200

    Fixed outpdated call in workspace fixture

commit e6c3dc3fa80b66b4845b272ae15ddae29083c443
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 26 11:26:23 2013 +0200

    Fixed outpdated call in workspace fixture

commit 019bb4edab52cea56eafd4b017e511f4ce2014bb
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 26 11:16:27 2013 +0200

    new command claroline:logs:monolog in order to enable logs in prod if needed

commit a2a549e1bf4b01be8f357e547317b2b6b88ad1d9
Merge: f3a197b 796ff29
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 26 10:20:42 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit 9dd16936d6d4dee647ccb9c2e67361e14e1cd78a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 26 10:12:02 2013 +0200

    Few fixes (AbstractResourceRepository now working).

commit 796ff29f6eef70c94f17f4c2ad647bca54a6f848
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 26 10:12:02 2013 +0200

    Few fixes (AbstractResourceRepository now working).

commit 1dc7611ee8fac432bc92a80aa9fbfb1d4caf568a
Merge: 8d5b279 ad41f82
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 26 10:09:31 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into GUI

commit d01687a3e7c0c8f9e19ea86520d6dddf9717c31e
Merge: 6a5c0e6 c781053
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 26 10:09:31 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into GUI

commit 8d5b279c916039f8c01729880e3cff641b54799a
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 26 10:08:01 2013 +0200

    Parameters admin GUI update

commit 6a5c0e6a0b7e00660f13297170b92af7884885e6
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 26 10:08:01 2013 +0200

    Parameters admin GUI update

commit f3a197b21902b5f40b6cc55f173926d7ea4e6994
Merge: be2b31f b031f8d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 26 09:19:12 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit bf2dcbd7fe55740fde408ee6d1cd89ef5eabd418
Merge: c7c0e1d ad41f82
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 26 09:12:57 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

    Conflicts:
    	src/core/Claroline/CoreBundle/Library/Workspace/Creator.php
    	src/core/Claroline/CoreBundle/Resources/config/repositories.yml

commit b031f8d574018e34d8864db072d7b2b9063af753
Merge: 592184b c781053
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 26 09:12:57 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

    Conflicts:
    	src/core/Claroline/CoreBundle/Library/Workspace/Creator.php
    	src/core/Claroline/CoreBundle/Resources/config/repositories.yml

commit c7c0e1d269e946d17eebf34fad6ef3bed14aeefe
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 26 09:10:22 2013 +0200

    Resource refactoring almost done (1st version).

commit 592184bf857d240a5da35eb432de463b061006b8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 26 09:10:22 2013 +0200

    Resource refactoring almost done (1st version).

commit ad41f820c5115756800444320ad9ad4eeb42e627
Merge: aca58c2 490e5f5
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jun 25 23:43:18 2013 -0700

    Merge pull request #64 from claroline/bug-fixes

    Bug fixes

commit c781053ab242327ed177c0ddf71709c274c414c9
Merge: 53ab243 c73b002
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jun 25 23:43:18 2013 -0700

    Merge pull request #64 from claroline/bug-fixes

    Bug fixes

commit 490e5f552e0ff2ec627d86b3d4e63fda3d3efe4b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 26 08:42:22 2013 +0200

    checkstyle

commit c73b00277f7f09fde9f5eb1b4505e4a38cba36f6
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 26 08:42:22 2013 +0200

    checkstyle

commit aca58c26cf4157e32c19426d4eb4bbae18379576
Merge: 138f1a9 84054b0
Author: Panos <ptsavdar@gmail.com>
Date:   Wed Jun 26 08:22:47 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 53ab243b0f264bfdcab0cefd744108bef1df557d
Merge: 06fb53b 9a2f498
Author: Panos <ptsavdar@gmail.com>
Date:   Wed Jun 26 08:22:47 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 138f1a9c41cdfc434f29dceddfdf9b1d0a8f036d
Author: Panos <ptsavdar@gmail.com>
Date:   Wed Jun 26 08:22:11 2013 +0200

    Added creator for workspaces

commit 06fb53b3f9da5992dcf7f983f438e2c45c46e262
Author: Panos <ptsavdar@gmail.com>
Date:   Wed Jun 26 08:22:11 2013 +0200

    Added creator for workspaces

commit 2c3749cc77e1c0e29e47323f1f15970e8f7b3028
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 17:17:47 2013 +0200

    Closes #49

commit 9a2e0616c650b2cacb041407a642a263d5e031e5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 17:17:47 2013 +0200

    Closes #49

commit aa91ab8da99d9dbc51e55bd6f35191cb58e18816
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 16:47:08 2013 +0200

    Closes #44

commit b8e677e99f758304877d85d3c92dc8424245f0a5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 16:47:08 2013 +0200

    Closes #44

commit 0c301b4112f59a95d8a3be1c7f421743659f7864
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 25 16:14:21 2013 +0200

    GUI update for desktop tools in administration panel

commit 409f4b7c09f4653665aa8c9f5fbe5fe809d4e17a
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 25 16:14:21 2013 +0200

    GUI update for desktop tools in administration panel

commit cde92f1aea62d46d89f5f8741ea0dcb5b7417e92
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 16:02:55 2013 +0200

    Refactored route of Cancel button in user parameters

commit 2e7ba9e5ff5affd10398f5a22f09154f95750178
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 16:02:55 2013 +0200

    Refactored route of Cancel button in user parameters

commit 90f2828c11fadffb3fca0e2b16b0a11a261e0366
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 15:47:55 2013 +0200

    Closes #45

commit 1ba11eb0c10e90bbe7bf5a7821c90ada68c0c27a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 15:47:55 2013 +0200

    Closes #45

commit da6c0f32eb65985336c0671919ee04346de166fd
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 15:42:27 2013 +0200

    Closes #46

commit 5e47074a33cf7a3dc85b5a691478d0304ba2eb02
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 15:42:27 2013 +0200

    Closes #46

commit f0075f9a41e36f6941c0526feda41c487ed24b17
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 15:22:49 2013 +0200

    Closes #50

commit f0708adcf29bc4a4711ad081a89a32f15e17da91
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 15:22:49 2013 +0200

    Closes #50

commit a2b9152e842e1be7d881869c95abff36ef1c9704
Author: Panos <ptsavdar@gmail.com>
Date:   Tue Jun 25 14:06:03 2013 +0200

    Fixed merged conflicts in LogRepository

commit 7215776a47f2810bc48e44110715574c6b2545df
Author: Panos <ptsavdar@gmail.com>
Date:   Tue Jun 25 14:06:03 2013 +0200

    Fixed merged conflicts in LogRepository

commit 510eeaea7b4426d2ca2a167ab1ffb43cd7a87c64
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 13:26:35 2013 +0200

    Fixed template bug in widget configuration

commit 401431277691f327067d2d305a06e22c42171d58
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 13:26:35 2013 +0200

    Fixed template bug in widget configuration

commit 84054b0af8a5965ab54b5c350e33766a3b933563
Merge: bd43086 1b8296b
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jun 25 04:25:39 2013 -0700

    Merge pull request #43 from claroline/refactoring-repositories-test

    Refactoring repositories test

commit 9a2f498e8a6340a6e970275296ccf47d36172996
Merge: e981b26 3cfbb3d
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jun 25 04:25:39 2013 -0700

    Merge pull request #43 from claroline/refactoring-repositories-test

    Refactoring repositories test

commit 5162cebdaea8bc4b0a7b1bd1052f622164eea255
Merge: 1bed533 bd43086
Author: Panos <ptsavdar@gmail.com>
Date:   Tue Jun 25 13:15:51 2013 +0200

    Conflicts resolved

commit c31668c6b55e53baca5c6fea70eec233c6d1e355
Merge: 0efee9d e981b26
Author: Panos <ptsavdar@gmail.com>
Date:   Tue Jun 25 13:15:51 2013 +0200

    Conflicts resolved

commit 0efee9d1908158d1d9375e9a020e43f8adcfbca6
Author: Panos <ptsavdar@gmail.com>
Date:   Tue Jun 25 13:02:53 2013 +0200

    Administrator analytics functionnalities

commit 1bed53350ee7244405c94657995d7a35c492fd7e
Author: Panos <ptsavdar@gmail.com>
Date:   Tue Jun 25 13:01:30 2013 +0200

    Administrator analytics functionnalities

commit e5d0d4527703dd6ee2b12572c3453d7c59f3b57e
Author: Panos <ptsavdar@gmail.com>
Date:   Tue Jun 25 13:01:30 2013 +0200

    Administrator analytics functionnalities

commit 6d1608e1d75f25914da0dafc87eb4321e47ad003
Merge: 11e8e1e bd43086
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 11:51:36 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into bug-fixes

commit 5eaaae7bc15e375d6f63ed25039eef54ab8e35a3
Merge: 730a329 e981b26
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 11:51:36 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into bug-fixes

commit 11e8e1ef4b492a731d10ee26f9d7a798fc754370
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 11:21:49 2013 +0200

    Added missing <th> in message templates

commit 730a329952db3a0e9c76365e4223f000b0b5e2ab
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 11:21:49 2013 +0200

    Added missing <th> in message templates

commit bd43086e89d8f87fd687ffb2e0669a7d53674a25
Merge: 9dbb3f2 34d0c20
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jun 25 10:51:16 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e981b26fc8e4f4082c3e88a83930585ea17df179
Merge: f69bfd8 633913d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jun 25 10:51:16 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 9dbb3f28e5e244190d4e863aa6e5946a870923bf
Merge: cc90fd5 f2bdf40
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jun 25 10:50:12 2013 +0200

    Merge branch 'master' into refactoring-template-annotation

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/DesktopController.php
    	src/core/Claroline/CoreBundle/Controller/Tool/HomeController.php
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php

commit f69bfd84c4938b68ee6e8773701107be9ae2359b
Merge: 99bc28f 74f1239
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jun 25 10:50:12 2013 +0200

    Merge branch 'master' into refactoring-template-annotation

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/DesktopController.php
    	src/core/Claroline/CoreBundle/Controller/Tool/HomeController.php
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php

commit 96674167b25998f11165ee17f73f4477c54053e7
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 10:29:43 2013 +0200

    Fixed typo bug in ThumbnailCreator

commit 2afefa96cfceecabf928a0507b9c01df422390d5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 10:29:43 2013 +0200

    Fixed typo bug in ThumbnailCreator

commit 6027865eb8de446492d93bac826fd6e9d8d66cae
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 25 10:28:51 2013 +0200

    Profile GUI update

commit 3d940446ff2b34c79a46535c4acd0dc6b990c1bf
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 25 10:28:51 2013 +0200

    Profile GUI update

commit 633913d308d03c95315feeeb6f721319cebe2fc9
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Jun 25 10:06:07 2013 +0200

    Update widget's documentation

commit 34d0c2052b60933516cc541b0c98d5a42f968f0b
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Jun 25 10:06:07 2013 +0200

    Update widget's documentation

commit 1b8296baafae6d63a0c1dd9199b1a7965ffc706c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 10:04:50 2013 +0200

    Refactored double quote to simple quote

commit 3cfbb3d109adfeb6df6fde5ba905c8bbf790434b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 10:04:50 2013 +0200

    Refactored double quote to simple quote

commit e47e97f0cf4a84fec33bdea277566275e23e7b60
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Jun 25 09:47:42 2013 +0200

    Update widget's documentation

commit 92bc6c2ddf88c3cfd879e3942cdf5c389e23f5e0
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Jun 25 09:47:42 2013 +0200

    Update widget's documentation

commit 0941f9bc18d1c5430c354e05eb9f9eca7a07e38d
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Jun 25 09:46:56 2013 +0200

    Add administration configuration for log's widgets

commit 1060f9521fa7f8292ece761399d8a085de6a5682
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Jun 25 09:46:56 2013 +0200

    Add administration configuration for log's widgets

commit 0d3be07ac3d7dbf7846457bb9d163b06bfe07c9f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 09:36:09 2013 +0200

    Refactored WorkspaceTag manager and writer

commit 01bec6ed2ed455d4eaf49aec2e12ef71aaa6c36b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 25 09:36:09 2013 +0200

    Refactored WorkspaceTag manager and writer

commit 99bc28ffd1659ec0b912d81fc88163532f0ad721
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jun 24 16:47:18 2013 +0200

    Submodule update

commit cc90fd50a501d79aa24eb7ac79192c4d93ef2734
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jun 24 15:35:42 2013 +0200

    Refactored template rendering with annotations

commit bbddf7ffad8bf172b74b35b7682286d3172b338a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jun 24 15:35:42 2013 +0200

    Refactored template rendering with annotations

commit 65d747deb5c4cd5a4b1033beaa8259900e33af2a
Merge: 775bc28 e0f8f01
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jun 24 05:55:20 2013 -0700

    Merge pull request #57 from claroline/documentation

    Readme update

commit e014cad62db338b7e36836ad7e64bc60db819a7a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 24 14:34:37 2013 +0200

    Resource creation redone (draft: AbstractResourceRepositoryTest is working).

commit 82e3e5f3b467239ab6c1c70e074ccffa3a2d247e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 24 14:34:37 2013 +0200

    Resource creation redone (draft: AbstractResourceRepositoryTest is working).

commit bab676c0e1c0eca0d42f2a1c162392f0dea2cb04
Merge: 209e4f7 f2bdf40
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jun 24 14:09:01 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into documentation

commit e0f8f015521f281e85c76c6fa247856bce3ed0ed
Merge: ad2de85 775bc28
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jun 24 14:09:01 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into documentation

commit ad2de8595f77433eba3e604029d89a2bad8cf15b
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jun 24 13:57:30 2013 +0200

    Readme update

commit a78bef3010a19139a5de5bc6149a03a2171ec9e1
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jun 24 11:54:38 2013 +0200

    Readme update

commit 452a2124b37b0d66f7079875c8ab9e41cf6632ed
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jun 24 11:45:59 2013 +0200

    Readme update

commit 12a6a060b1aee11b69b7003b54c4692e2012af8b
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jun 24 11:37:48 2013 +0200

    Readme update

commit a7b5945dfefed531b8daef417fd3a8484b614abf
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Jun 24 11:16:44 2013 +0200

    Documentation update (: note http://www.la-ponctuation.com/deux-points.html)

commit e623b21515f7535963a91d9242ba7fc2ee0bf2a5
Merge: 2b0ddfd f2bdf40
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 24 10:40:04 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

    Conflicts:
    	src/core/Claroline/CoreBundle/Library/Resource/Manager.php

commit 2f3701a7c5ab494010271bec5968a58d945a84cd
Merge: 6c9302f 775bc28
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 24 10:40:04 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

    Conflicts:
    	src/core/Claroline/CoreBundle/Library/Resource/Manager.php

commit 2b0ddfd1184cd68ff1291d88ba7647b0df6c7965
Merge: fa1f620 33772a3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 24 10:36:35 2013 +0200

    Merge remote-tracking branch 'origin' into refactoring-for-unit-tests

commit 6c9302f7eed508bf35481f9e76812295a83b342a
Merge: ef74879 a8c5361
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 24 10:36:35 2013 +0200

    Merge remote-tracking branch 'origin' into refactoring-for-unit-tests

commit fa1f6203fe6c2861dd6ba004f8dc9c4b61925384
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 24 10:35:54 2013 +0200

    Refactoring for unit tests (mainly resource creation).

commit ef748790a4d717a6c204d7bc6278b2fd6c6db99b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 24 10:35:54 2013 +0200

    Refactoring for unit tests (mainly resource creation).

commit 775bc28a27850f583ca8480d63b37036bb2c8673
Merge: a269aeb 74f1239
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 24 01:35:22 2013 -0700

    Merge pull request #56 from claroline/bug-fixes

    Fixed sorting empty folders bug

commit f2bdf40567a1ebb2a325bafeabc628724a6a3901
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 24 10:31:25 2013 +0200

    Fixed bug when sorting empty folders

commit 74f1239602a7785457220ea6780ddf9a02b84ec9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 24 10:31:25 2013 +0200

    Fixed bug when sorting empty folders

commit a269aeb5aba5a4d18a8441d97a325e9e4ed82d31
Merge: 9b5cb60 32906dd
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jun 24 01:20:10 2013 -0700

    Merge pull request #48 from claroline/templating-overwriting

    Fix error in test environment

commit c5e58d6a7901cf0d8d96223faaeaf7f5132a264a
Merge: 6cba017 2259782
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jun 24 01:20:10 2013 -0700

    Merge pull request #48 from claroline/templating-overwriting

    Fix error in test environment

commit 9b5cb6018d511e76e005e606a530669c716a465a
Merge: 720286b fe67897
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jun 24 01:17:39 2013 -0700

    Merge pull request #55 from purplefish32/travis

    Travis config file

commit fe678973d03c5680688641fa0dd1e65238ec6f2d
Author: Donovan Tengblad <purplefish32@gmail.com>
Date:   Sun Jun 23 15:17:26 2013 +0200

    Travis config file

commit 6cba0177a28641bace22a9b21d5d197c5f53600f
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri Jun 21 15:41:49 2013 +0200

    Improve widget's configuration. Can edit widget in widget's list (Ajaxification)

commit 720286b2a0da44d6b356d25d0cb583fc795ad16c
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri Jun 21 15:41:49 2013 +0200

    Improve widget's configuration. Can edit widget in widget's list (Ajaxification)

commit 495f3c4582b331c9eef41739d022df5d506b1533
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Jun 20 16:40:11 2013 +0200

    Improve widget's configuration. Can edit widget in widget's list (Ajaxification)

commit 0b2b989b16dbaa288eba8b400d21ff229d6a03d5
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Jun 20 16:40:11 2013 +0200

    Improve widget's configuration. Can edit widget in widget's list (Ajaxification)

commit 6e24c512111debce2ed7825c51ee3e0dd38391b4
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Jun 20 16:34:08 2013 +0200

    Debug log wigdet with empty config

commit 6bebfbe41a7620687f6c27cc61203b5b8f1f8642
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Jun 20 16:34:08 2013 +0200

    Debug log wigdet with empty config

commit 659206b948c1447b6191647f2cdde446efcb3798
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Jun 20 10:47:08 2013 +0200

    Improve widget's configuration (Add edit link on widget's headers)

commit b6d681d63b790578e97fb83e20fe8244b1291075
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Jun 20 10:47:08 2013 +0200

    Improve widget's configuration (Add edit link on widget's headers)

commit 236742d7db484f1736e8df5d254525564837392e
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Jun 20 10:32:40 2013 +0200

    Improve widget's configuration (work in progress)

commit c831c3e1174094a691b30a1f846d2cb1cab7de2f
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Jun 20 10:32:40 2013 +0200

    Improve widget's configuration (work in progress)

commit 32906dd6f29902a96abf789f97588eba45bd4189
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 21 13:41:48 2013 +0200

    Template locator update and move inside Library directory

commit 2259782e973d50029c6f008e171a5a57d190c38f
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 21 13:41:48 2013 +0200

    Template locator update and move inside Library directory

commit ab888da65be4c72f83167e75c4176505ea458614
Merge: 9f96cd0 ab43c57
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 21 13:37:44 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into templating-overwriting

commit c9e4dafe6a494a106f6b8dbec6e1713987918b77
Merge: 6aa3978 4b7ad60
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 21 13:37:44 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into templating-overwriting

commit be2b31f6b3b7fcd67772b4b453e3597042e4130d
Merge: 1068127 86a3e59
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 21 11:20:32 2013 +0200

    Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

commit b3586b4dc2d3902b8dff92ea32f5768392ee6d50
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 21 11:19:24 2013 +0200

    Refactoring for unit tests (2).

commit 86a3e599350053000254574f75f1f52dc1ef40a7
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 21 11:19:24 2013 +0200

    Refactoring for unit tests (2).

commit 1068127122100bd2a3a5f41722f9e69e9849a5eb
Merge: 998a1e8 ab43c57
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 21 11:17:56 2013 +0200

    Merge remote-tracking branch 'origin' into refactoring-for-unit-tests

commit 4b7ad604a4519b143fbaa9d9255c87be4ad2fb9e
Merge: 3b62ed8 4c8779a
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jun 21 02:08:21 2013 -0700

    Merge pull request #47 from claroline/GUI

    Twig extentions to bundle root

commit ab43c57231fb2aa5857caf129a1196927a4dc3cf
Merge: ecfdef9 65dc691
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jun 21 02:08:21 2013 -0700

    Merge pull request #47 from claroline/GUI

    Twig extentions to bundle root

commit 3b62ed8883069dabcbfaf65fcb7efaea83d79a6c
Merge: 9befc88 7f0a28b
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jun 21 02:03:14 2013 -0700

    Merge pull request #40 from claroline/messagery_refactoring

    Refactoring messages for unit tests.

commit ecfdef925e46d844a0d93336dd2e30e315f77424
Merge: 76120d6 921b9ef
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jun 21 02:03:14 2013 -0700

    Merge pull request #40 from claroline/messagery_refactoring

    Refactoring messages for unit tests.

commit 4c8779a5f911b92ebe3c2e79214a4dd33b5b9412
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 21 10:32:09 2013 +0200

    Move twig extentions to bundle root

commit 65dc69121c92d33b47199e045c28ed71e9d47a00
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 21 10:32:09 2013 +0200

    Move twig extentions to bundle root

commit cd21dda8329256a147a45b37bb6b4545d6f79581
Merge: b0326e4 9befc88
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 21 10:27:32 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into GUI

commit 05b70db4c5c87c7bbdc5cd0358b0891ee2c7b68d
Merge: c64863e 76120d6
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 21 10:27:32 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into GUI

commit 209e4f79352fe976a4542fd3c6e75214f56dfe31
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 21 10:18:49 2013 +0200

    Documentation update

commit 4a3b33112c67ec8399dfc26adad3fc8f6aaed0bb
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 21 10:18:49 2013 +0200

    Documentation update

commit 91f71cf802f2d76deb1ab69cf764ce120a33c55e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 21 08:53:37 2013 +0200

    Cosmetic changes in workspace list in resources parameters

commit ab8bb9b8b7b9c5417a3e34b45650c5b8d831465b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 21 08:53:37 2013 +0200

    Cosmetic changes in workspace list in resources parameters

commit c3e1b1a6467ff2ec74f0f5177c677cf1d32910fc
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 20 17:21:54 2013 +0200

    Refactoring for unit tests (1).

commit 998a1e88840084a27b45235884a6053a75f3d9fc
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 20 17:21:54 2013 +0200

    Refactoring for unit tests (1).

commit 9f96cd076b42a49df158af84f79a4976cf980777
Merge: d1dc9a7 76120d6
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 17:20:23 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into templating-overwriting

commit 6aa397882183e83081e779bb6efd3565f009b55e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 17:20:12 2013 +0200

    Templating loader fix

commit d1dc9a7942cf44bc1f355531d632bf2e31369a71
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 17:20:12 2013 +0200

    Templating loader fix

commit 866faa9c74651e7c1fa09151b15c80caeaa76ed1
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jun 20 17:08:06 2013 +0200

    Refactored database write action in WorkspaceTagController

commit e6a53a05e2dfabf993c9304325b8f9d64e7dec4b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jun 20 17:08:06 2013 +0200

    Refactored database write action in WorkspaceTagController

commit 6366d11bec5d4b2fc3e9ddf514cd3e7347a9ba50
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 17:05:43 2013 +0200

    Documentation update

commit 824a6ddc936afebc8f5ed4fb7d5638dbd4861a51
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 17:05:43 2013 +0200

    Documentation update

commit 76120d6cf3d3b731d77d1787a6e850923afab655
Merge: a8c5361 3458d85
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jun 20 07:44:49 2013 -0700

    Merge pull request #41 from claroline/templating-overwriting

    Templating overwrite update + submodule update

commit 9befc88d75ed4aec722649a753aefd0e66d036f5
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 16:32:07 2013 +0200

    Single quotes for everyone :S

commit 3458d85a21b2079482b012dd1a0f1ce4d54747f6
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 16:32:07 2013 +0200

    Single quotes for everyone :S

commit e36520408f8de558fe9a0300ed0a883503a65461
Merge: a88ddf8 33772a3
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 16:15:17 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into templating-overwriting

commit d8756720f258616eb15468572f4bd27851d883b6
Merge: 855f64c a8c5361
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 16:15:17 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into templating-overwriting

commit a88ddf86bf91bf6a50919490e04e69ab7be3051f
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 16:15:08 2013 +0200

    Templating locator update

commit 855f64cb1266f4228356246d074a80dbc9aaffc2
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 16:15:08 2013 +0200

    Templating locator update

commit 6d45fb1f585fb243a5a0388b4a795a7acde6f4b2
Merge: 72eae7a d31693d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jun 20 15:52:09 2013 +0200

    Merge branch 'refactoring-repositories-test' of https://github.com/claroline/Claroline into refactoring-repositories-test

commit be70f9c76136a950e5dd00069f1cab0a7960a1c7
Merge: 615868a 1994d0c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jun 20 15:52:09 2013 +0200

    Merge branch 'refactoring-repositories-test' of https://github.com/claroline/Claroline into refactoring-repositories-test

commit 72eae7a24b18e4489d33d2d6dd586e3d21055253
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jun 20 15:51:54 2013 +0200

    Added tests for workspace tag repositories

commit 615868a21db25884efb7d2ee6c7e2d57cb6ae482
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jun 20 15:51:54 2013 +0200

    Added tests for workspace tag repositories

commit a8c5361b2fb7100adccfb46a7907ba20aabcee2c
Merge: 66b6697 cc80172
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jun 20 06:14:24 2013 -0700

    Merge pull request #42 from claroline/asset-packages-fixes

    Asset packages fixes

commit 33772a3ab39fd1bcb5ebd7d08bbf98cb785bdbd2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 20 14:59:08 2013 +0200

    Fixed font-awesome paths

commit cc8017250e7ee8da29c6703463c1d195f1c36765
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 20 14:59:08 2013 +0200

    Fixed font-awesome paths

commit afa3599cc6e61abcca99c34b00dabe609c9c4b61
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 20 14:58:42 2013 +0200

    Used --prefer-source composer option in install scripts

commit b871eb2df9b1de8e8ab2e32ec7c3e25cd2d781cb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 20 14:47:27 2013 +0200

    Inlined package source property for fontawesome and bootstrap-colorpicker

commit 80f9d331140c55d606588d079769052e403e80f4
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 14:44:37 2013 +0200

    Templating overwrite update + submodule update

commit 6b2cee994fb9cab3d1a00148261fa2e36163cc3f
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 14:44:37 2013 +0200

    Templating overwrite update + submodule update

commit 66b6697762b042bb2efd02a4429ce603d5357c31
Merge: bcea5c6 e7363fd
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jun 20 02:29:01 2013 -0700

    Merge pull request #18 from claroline/documentation

    Documentation of themes and overwrite of twig files

commit 54265abca6c1a37750249b771256e7c47f8527d9
Merge: d864903 94279c6
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 11:15:13 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into documentation

commit e7363fdd8a31fbe9129e59efa437093b6fa98d4a
Merge: cf29b8e bcea5c6
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 11:15:13 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into documentation

commit d86490360100c6fdd4f9a76e523323ecd94c9666
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 11:15:06 2013 +0200

    Core documentation update

commit cf29b8ea94fc68cf4bfd52021b1079347d4ec51d
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 11:15:06 2013 +0200

    Core documentation update

commit bcea5c6a7c7ab83f0fb39da100efc573180ac9a2
Merge: 7cfe4cd e04b1f7
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jun 20 02:13:43 2013 -0700

    Merge pull request #39 from claroline/sync-mapping

    Sync mapping

commit 94279c6d71b1c53517fce214d6a09b0432336c03
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jun 20 11:12:24 2013 +0200

    checkstyle fixing

commit e04b1f7a884224318614f51ce66365269548f48e
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jun 20 11:12:24 2013 +0200

    checkstyle fixing

commit 7f0a28b76d4707938c0d3c0aa6115da968f07f47
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 20 11:03:19 2013 +0200

    Removing MessageControllerTest.

commit 921b9efa7a75302d47c2baa40ab0454c488e4ea0
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 20 11:03:19 2013 +0200

    Removing MessageControllerTest.

commit 3bfd48d69fa03593b7c8e45a20da127fb638babd
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 20 10:57:14 2013 +0200

    Refactoring messages for unit tests.

commit 7159961bee76386958de1d15f1c02eda319c5599
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 20 10:57:14 2013 +0200

    Refactoring messages for unit tests.

commit 911819951ac3ae82613c3b24b73e885b533544a8
Merge: b746819 29cbfed
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 10:23:47 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into documentation

commit 79ec60ef2afeae85dfdf0febe4c6a9555d830086
Merge: 6e08f56 7cfe4cd
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 10:23:47 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into documentation

commit b7468193ce56492fa8a8c81a4df9cf23755c0fed
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 10:23:34 2013 +0200

    Overview documentation Update

commit 6e08f56a340535b5fba1cff4642934f56d233c29
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 20 10:23:34 2013 +0200

    Overview documentation Update

commit ea78c85c5e34312c928cdef458f412f5454103ad
Merge: 1850179 29cbfed
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jun 20 10:07:44 2013 +0200

    Merge branch 'master' into sync-mapping

commit f123f2906a92d80b2859c9a3b2bc35983c72684a
Merge: 8a74b32 7cfe4cd
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jun 20 10:07:44 2013 +0200

    Merge branch 'master' into sync-mapping

commit 1850179fb560ec8355e12b04fcd777ad3fcb44a3
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jun 20 10:06:30 2013 +0200

    sync mapping (closes #22)

commit 8a74b32849448a76c580ebcb353e18c9db6385e3
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jun 20 10:06:30 2013 +0200

    sync mapping (closes #22)

commit 4dff3a12f3a6f5cae48ac14b95bf268c3c6812ba
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 5 14:08:25 2013 +0200

    Adding ICAP/SimpleTagBundle for managing tag on resource

commit d9c44cb1d18047ad7e4bda3db1f87850e3da0c3c
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 19 15:39:46 2013 +0200

    Update submodules

commit 51f0782df5d91c2980fdfd0ccc5b3667fed9e911
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 19 15:20:40 2013 +0200

    Adding simpleTagBundle to manage tags and CKEditorBundle to include CKEditor in the project

commit ab49df998e25a5ef9be33208551f3a2e36fab976
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 19 15:19:30 2013 +0200

    Adding SensioGeneratorBundle, just in case it cost nothing to let him seeing that we let it in the composer.json

commit 451c3bdf1a7078fb8fbbf39dde6a30e2ad64d125
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 19 15:16:54 2013 +0200

    Activate sluggable extension for doctrine

commit 013dba40083708ec738c67467c705fd45ea329bb
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 5 14:53:42 2013 +0200

    Adding ICAP/BlogBundle to Claroline

commit 7a19d1e41680a9df070019a7c5795c70c95241ac
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 5 14:08:25 2013 +0200

    Adding ICAP/SimpleTagBundle for managing tag on resource

commit 7cfe4cdbe9e5a7aa4d0f465d4dbc309bc2aa99a1
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 19 17:12:25 2013 +0200

    Remove useless char

commit 29cbfedd2c1fcd9f683a819bdf783c14a8e72b7e
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 19 17:12:25 2013 +0200

    Remove useless char

commit 0bc06ca4296ff712218388ba61b64306e535b646
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 19 17:11:47 2013 +0200

    Update path to fontawesome files

commit 93b72574efa24d7361efed76132071571090bb88
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 19 17:11:47 2013 +0200

    Update path to fontawesome files

commit cc3a0aefc2793ca1cad21a2a7e9b76bc9287ac15
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 19 16:58:34 2013 +0200

    Updating composer.lock

commit 2e2a068388443e83708dc77ce6b99488f6e9a596
Merge: 7e11ee4 1558f3c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 19 16:47:35 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into documentation

commit 8b5205701d559c8f0e205afc2ccb2f1ea1446283
Merge: e75456e d5e8cc6
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 19 16:47:35 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into documentation

commit 7e11ee4cacfac92d2855e1c1d7c6ab246479239f
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 19 16:47:24 2013 +0200

    Limit theme doc file to 80 chars

commit e75456e906143eb019df8123869d596b08d271a2
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 19 16:47:24 2013 +0200

    Limit theme doc file to 80 chars

commit 1558f3c6fbdf77f668f1696b72434dee8f2534ba
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 16:22:54 2013 +0200

    Add dynamic/contextual title for widget

commit d5e8cc6df8fec76da9b30945c935fb6d8ea2d1c2
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 16:22:54 2013 +0200

    Add dynamic/contextual title for widget

commit 10cfa71f498e85c8cde06dfdfb6496b463b5a205
Merge: 9799635 81d5d5c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 19 15:57:54 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into documentation

commit fb7854c8a06ca81da8a2d97d94786f74c4d70542
Merge: 8c2d3a3 4be9927
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 19 15:57:54 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into documentation

commit 97996356c9156bd3332e5b59a15a62f3fd0c19a7
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 19 15:56:36 2013 +0200

    Documentation update

commit 8c2d3a39b2a992fbc7548d00abf4649fd829addf
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 19 15:56:36 2013 +0200

    Documentation update

commit 81d5d5c06fb4f704ed789af12d4b7a085d0337f0
Merge: f54bc22 39ef560
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 15:20:08 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 4be99272b577e1b2a06f5e5865863c40a15adca0
Merge: 006e49e 31c2286
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 15:20:08 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f54bc22a8e8dd5d8f8ffa86f2ed4ff5205bc74dc
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 15:19:01 2013 +0200

    Improve log's widget and debug log desktop widget list

commit 006e49e83f19a729962c442db2ab66116610e728
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 15:19:01 2013 +0200

    Improve log's widget and debug log desktop widget list

commit 39ef5600462b863b51a42342b701d8413901c1a5
Merge: 7a12745 c09c885
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 19 14:33:15 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 31c22865acc56c830cc5f57520dca9f35c354ced
Merge: 5b63373 02b8b7b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 19 14:33:15 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c09c88593dca9ee89a1365e53b4c99bad88a416e
Merge: c34e840 c727a57
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Jun 19 05:32:06 2013 -0700

    Merge pull request #37 from claroline/fixing-anonymous-for-resourcemanager

    Fixing resouces sort for anonymous and simple click for opening resource...

commit 02b8b7bb15e57db7bff6ed674a3a580f2fd3ff60
Merge: 713ed24 6f9a026
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Jun 19 05:32:06 2013 -0700

    Merge pull request #37 from claroline/fixing-anonymous-for-resourcemanager

    Fixing resouces sort for anonymous and simple click for opening resource...

commit c727a575f0ff743de9d4d3ecc52654f21190f942
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 19 14:31:21 2013 +0200

    fixing php style.

commit 6f9a0269f0ba4cc10e9a64978c1d5aa18defe2d1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 19 14:31:21 2013 +0200

    fixing php style.

commit c34e840ddc1b3ea6fd1fec3b90992806705a575f
Merge: d7e2bc9 d31693d
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Jun 19 05:17:15 2013 -0700

    Merge pull request #36 from claroline/refactoring-repositories-test

    Refactoring repositories test

commit 713ed24ee4d3517f66652d1688dbd015c841ab47
Merge: 1dc0390 1994d0c
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Jun 19 05:17:15 2013 -0700

    Merge pull request #36 from claroline/refactoring-repositories-test

    Refactoring repositories test

commit d7e2bc9c0597fab3c6a52d88a694b470b425bf2e
Merge: 9336417 43cdfbb
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Jun 19 05:04:16 2013 -0700

    Merge pull request #35 from claroline/activity-tool

    Activity tool

commit 1dc0390fb45753ad8710f51e88edb816e25ef485
Merge: a6ca181 1f7b4ec
Author: stefk <stephaneklein221@gmail.com>
Date:   Wed Jun 19 05:04:16 2013 -0700

    Merge pull request #35 from claroline/activity-tool

    Activity tool

commit d31693d839c78dbf634b6e0027e8975c03192080
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 19 14:00:35 2013 +0200

    Fixes and skip some tests.

commit 1994d0c9a4ade6851625fd4ce4f0b487f76d51d2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 19 14:00:35 2013 +0200

    Fixes and skip some tests.

commit 7a1274581ac5bfe7d255d0f976ad12f43fe120ff
Merge: c0f69e4 9336417
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 19 13:53:38 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 5b63373237d28b7d94a6e3497a7e3ab245e43985
Merge: 81dc0e2 a6ca181
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 19 13:53:38 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c0f69e4d5370073f94fe5163fd9697c1b60f482a
Merge: 177b8e6 fd20146
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 19 13:30:40 2013 +0200

    Merge branch 'master' into overload_form_theme

commit 81dc0e246fcf133ee693c98f9bf8c92baa43997c
Merge: 1d1e1e7 9c085f6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 19 13:30:40 2013 +0200

    Merge branch 'master' into overload_form_theme

commit c989bc426495c35d1d7875a6e0d4d29caf0ff1ba
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 19 13:18:16 2013 +0200

    Fixing resouces sort for anonymous and simple click for opening resources.

commit 4db56d645f5bd3bf7d0a0e7c81401a25840460bb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 19 13:18:16 2013 +0200

    Fixing resouces sort for anonymous and simple click for opening resources.

commit 933641751d49bfceb62c7b4ee8f29db62fe5dc22
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 11:28:12 2013 +0200

    Improve log's tool presentation

commit a6ca181899996a6063782eb1bd0f35b5b5fc5b52
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 11:28:12 2013 +0200

    Improve log's tool presentation

commit 18ec26a2a02b479a6b81eac4e9d046ac01b491ef
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 11:23:24 2013 +0200

    Debug autoComplete for user search (log filter)

commit c97777c6f8d9349a382827364658dfed34c5f34d
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 11:23:24 2013 +0200

    Debug autoComplete for user search (log filter)

commit b455a942d68fa42dd414603452207c500f8c9262
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 10:59:37 2013 +0200

    Debug log filter with user name for symfony2.3

commit a00d81108c5bb69e2394a33ed193004327203f6a
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 10:59:37 2013 +0200

    Debug log filter with user name for symfony2.3

commit aaf44e297c14df113575fd3ed0e76bc2553d3750
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 19 10:59:29 2013 +0200

    Removed personal workspace from role search

commit 4383eed13ce5828778d51f009420dbb6f334f277
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 19 10:59:29 2013 +0200

    Removed personal workspace from role search

commit 797996b4a2ecbf61141a506dcbc0276908b2fba6
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 10:58:35 2013 +0200

    Debug generic form for symfony2.3

commit 1290743caff208191303be573f76c39d6fbe9f21
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 10:58:35 2013 +0200

    Debug generic form for symfony2.3

commit 9e64753da8bbd4ea8986c67cc7ed67c49cfac3f5
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 09:58:47 2013 +0200

    Remove useless import

commit d725389e29f88a9d34205bacf7a41be59ab55bdd
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 09:58:47 2013 +0200

    Remove useless import

commit 2acf9d901e1f933458dbbb18ca39fa785c8908b1
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 09:58:06 2013 +0200

    Remove log's desktop tool

commit caa46773134822bc63164574b39fc18700a89fa5
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 09:58:06 2013 +0200

    Remove log's desktop tool

commit 7de0dfae05a5064653657f8f4dd5329e0de08ea8
Merge: 77cf5de 8d8d876
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 19 09:48:55 2013 +0200

    Merge branch 'refactoring-repositories-test' of https://github.com/claroline/Claroline into refactoring-repositories-test

commit fafbdf5ffec4c2d200a109461f7a1dd2ec814dd8
Merge: cc9eb39 265b9cb
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 19 09:48:55 2013 +0200

    Merge branch 'refactoring-repositories-test' of https://github.com/claroline/Claroline into refactoring-repositories-test

commit 77cf5deb5309149373b259c678a2e9a09a85299c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 19 09:48:36 2013 +0200

    Fixed role search by workspace code and tag

commit cc9eb397c5b5604dcb8b37d0e340e05a4b145944
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 19 09:48:36 2013 +0200

    Fixed role search by workspace code and tag

commit a0a6229921729444e16d206578fac1464f9c0f46
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 19 09:44:27 2013 +0200

    Added tests for Tool repository

commit 0668b389d6705ca1d136ba67401a05259c8d84e0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 19 09:44:27 2013 +0200

    Added tests for Tool repository

commit a13dfb29d511733e71b39489974ed2ceb0e75e80
Merge: 0bf3a73 fd20146
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 09:33:48 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 68997f286aa8c65f3260a75451b85c80370e53a6
Merge: 51c2a5d 9c085f6
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 09:33:48 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0bf3a733a980e9deef040dcc684834784076a73c
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 09:32:46 2013 +0200

    Remove log tool for desktop

commit 51c2a5dc3bf79285a17e6fe6cc8f057b310afdde
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 19 09:32:46 2013 +0200

    Remove log tool for desktop

commit 8d8d87625fff8080a933c23ddc70666f52e9d766
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 19 09:19:36 2013 +0200

    Fixing typo.

commit 265b9cb02011719706e6a75a4e0fb10acf69da50
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 19 09:19:36 2013 +0200

    Fixing typo.

commit fd201467b04dff0833b7cf20ecdbe3b7c478f94f
Merge: 1b673dd 44d5e8d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 19 09:19:30 2013 +0200

    Merge branch 'demo-fixes'

commit 9c085f6debcaf92aa39d3e8a93a8a50f9e732b71
Merge: 029c508 e0e4cbe
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 19 09:19:30 2013 +0200

    Merge branch 'demo-fixes'

commit 44d5e8df4504f9aa345565771e3da923cef3ea30
Merge: b74b319 c3d4616
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 19 09:16:37 2013 +0200

    Merge branch 'demo-fixes' of https://github.com/claroline/Claroline into demo-fixes

commit e0e4cbe7f0268182d40cf1bcbed3b1031d003a4e
Merge: 90042f9 2235466
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 19 09:16:37 2013 +0200

    Merge branch 'demo-fixes' of https://github.com/claroline/Claroline into demo-fixes

commit b74b319b3547e9bdca3887ff1fdc40611d09b4de
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 19 09:14:56 2013 +0200

    Delete unnecessary is_granted in a view

commit 90042f9b27a3258fdd55c7b88689cc418d35c0fb
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 19 09:14:56 2013 +0200

    Delete unnecessary is_granted in a view

commit 7fce1ff95c8ab33ac4f3cd1b5e2714c60466e4f2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 18 17:19:26 2013 +0200

    WorkspaceToolRepository done.

commit a3e1cc6cd46901ca2321c0a48a70137f4d632d23
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 18 17:19:26 2013 +0200

    WorkspaceToolRepository done.

commit f18b497712d9d99b18abc9c64837aa26baddb0ed
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 18 17:10:55 2013 +0200

    TextRepositoryTest done.

commit 53857cef6c4a61beba295db75cf72bff38588bcc
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 18 17:10:55 2013 +0200

    TextRepositoryTest done.

commit f117429b23fce3a2e2817cc32b72066ee8d988bb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 18 17:01:28 2013 +0200

    ResourceActivityRepository Test done.

commit 83c1e5431ca94a6e2ac3003cf69ddf7e9032f0d4
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 18 17:01:28 2013 +0200

    ResourceActivityRepository Test done.

commit dcd74ed5d764d424c159be40e670c54bc9a6cb4e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 18 16:52:06 2013 +0200

    PluginRepositoryTest done.

commit 0810d943a7aeac0430eeda31a045ddfec781029e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 18 16:52:06 2013 +0200

    PluginRepositoryTest done.

commit a0e9f8b0566a6bcfb71fcdc17403413356ae2577
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 18 16:33:06 2013 +0200

    MessageRepositoryTest done.

commit 40d7a4744f3ff60b9cd3f302fa1b10fea09ea4fa
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 18 16:33:06 2013 +0200

    MessageRepositoryTest done.

commit 1b673ddd8e4ec9e1bcba789d913a9e4cd03e8661
Merge: dd70028 8e4868b
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Jun 18 15:22:15 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 029c5089a74d9b114151ba934b510f934fff6f79
Merge: 1d38122 3b02779
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Jun 18 15:22:15 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit dd70028720513593e99a9dcf074b78e7960decac
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Jun 18 15:19:21 2013 +0200

    Desktop log's widget parameters.

commit 1d38122b1e5d73abbf64a9064b51c80e335575c6
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Jun 18 15:19:21 2013 +0200

    Desktop log's widget parameters.

commit c3d46166a26ec242bfcbee52143e409fbe59a0d6
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 18 13:58:12 2013 +0200

    Fixed my workspace list bug

commit 2235466b9bea16e98f39f988fae5870ba7b638e6
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 18 13:58:12 2013 +0200

    Fixed my workspace list bug

commit e676c5f2842a64db504a002cd89f9e6fbb136912
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 18 13:56:47 2013 +0200

    Vendor path to web

commit bd392cb4582fde5ccd93429b56580870c96ed760
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 18 13:56:47 2013 +0200

    Vendor path to web

commit be2d438d9f56ed14ab914248a1ea58549658330b
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 18 13:31:57 2013 +0200

    Documentation update

commit 645b90c67b87e8cb1d611387c62112895b698f94
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 18 13:31:57 2013 +0200

    Documentation update

commit 4105064a5597673147e139b00b3b8ede74fc906c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jun 18 13:27:18 2013 +0200

    Removed call to deprecated 'appendClientTransformer'

commit 8146b3a25d2c2002fe99638e7b037783cf9b28d3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jun 18 13:27:18 2013 +0200

    Removed call to deprecated 'appendClientTransformer'

commit 177b8e6c8f9a07f7fbaa0df15fb3bb6b926c5df2
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 12 11:19:57 2013 +0200

    Remove old form_theme, plugin will need update

commit 1d1e1e70630329d4f9a11541c90ede61c82fef83
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Mon Jun 17 17:06:54 2013 +0200

    Re-adding form_theme.html.twig to overload displaying of label for translation + deal with #33

commit e5f59d99ab2f092632cfdc03de37abc0158ccee5
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 12 11:19:57 2013 +0200

    Remove old form_theme, plugin will need update

commit f4927419e1f9a423be9ec7f0375c9e51b24fa58e
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 12 11:12:52 2013 +0200

    Adding zenstruckFormBundle to use the overload bootstrap theme for form and some extended form type of widget

commit 732a2c56df1a93aca92dede57942885d4894c4c4
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 12 11:12:52 2013 +0200

    Adding zenstruckFormBundle to use the overload bootstrap theme for form and some extended form type of widget

commit 8e4868bad7a9bb9ad33fa237be61d387d33bccb5
Merge: ade8a57 643f85d
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jun 18 03:06:50 2013 -0700

    Merge pull request #33 from claroline/use_label_option_in_form_if_exist

    use label option if exist

commit 3b027791f7fd7e340976fb392ef4a42d4a5981c7
Merge: f93d9d4 512d062
Author: stefk <stephaneklein221@gmail.com>
Date:   Tue Jun 18 03:06:50 2013 -0700

    Merge pull request #33 from claroline/use_label_option_in_form_if_exist

    use label option if exist

commit 1f7b4eca2a79f5c5ca1135abdc639d4c554a422b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 18 12:04:21 2013 +0200

    Added .gitmodules file

commit 43cdfbbe825e19c8dc5537dfc6c0ebb9a0bf2ad1
Merge: 85ddc1c ade8a57
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 18 11:55:08 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into activity-tool

commit 163a66180db950eb432a00761dd5341e8476c7a2
Merge: 382a773 f93d9d4
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 18 11:55:08 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into activity-tool

commit 2c3491767c6c958795746b07a18b99a509cc979a
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Jun 18 11:43:47 2013 +0200

    Correct flashBag display : compatible symfony2.3

commit 8a41905daa6611f7a0406943138f5d65057f05f4
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Jun 18 11:43:47 2013 +0200

    Correct flashBag display : compatible symfony2.3

commit 382a7739e5f12400faadd8837bb9ede8f732d0d3
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 18 11:31:49 2013 +0200

    Submodule update

commit 18568c7a1011f10c8b284fbc2c5ff41274ab0232
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Jun 18 10:20:48 2013 +0200

    Compatibility symfony2.3

commit 33d13c284c15df07c6c44ee078de64368252377b
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Jun 18 10:20:48 2013 +0200

    Compatibility symfony2.3

commit ade8a5746743b43e8044102a702d71806b807952
Merge: 6d68ed1 78b55e3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jun 18 09:48:37 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f93d9d4b621934220eba5b09968891551b991195
Merge: e5e60c3 a42af6a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jun 18 09:48:37 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6d68ed129b1da7052f246a385a78177f7639f4b1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jun 18 09:47:54 2013 +0200

    Temporarily skipped test

commit e5e60c37c27a7093c9bdcc9a1aabe1c8e09f804e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jun 18 09:47:54 2013 +0200

    Temporarily skipped test

commit 09c9c450c96cf660f057d599680d76221fb9223f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 18 09:40:00 2013 +0200

    WorkspaceRepositoryTest done.

commit 57af6d4df0ebf2a069418925f99eae6145c8fbe6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 18 09:40:00 2013 +0200

    WorkspaceRepositoryTest done.

commit 99b416158e788a4c6ebe54bfafad84b7b354433e
Merge: 9179d58 78b55e3
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 18 09:14:56 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into documentation

commit 7e7fe326bba15758d62def941be32c52b8522814
Merge: 9a95ee6 a42af6a
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 18 09:14:56 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into documentation

commit 78b55e3eaf34ca8a9924df9e37cec559074e2027
Merge: 50e39fb 67e8e61
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 17 17:50:57 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a42af6a4d4c2d06a05838b78175f9461f8be3e5a
Merge: a157d92 332d3f8
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 17 17:50:57 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 50e39fb76c4272a18c572dc0b08116dcda5121a4
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 17 17:49:34 2013 +0200

    Compatibility symfony2.3 and add instruction for log widget parameters

commit a157d9274c883dee64faf36bc2c1462372ca30b2
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 17 17:49:34 2013 +0200

    Compatibility symfony2.3 and add instruction for log widget parameters

commit 67e8e6110d4367d23c80488387ce067c84cef94d
Merge: 2eac013 65a4bb4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 17 17:47:00 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 332d3f82bcff6465985d30d38f9028410746c34e
Merge: a5c4efe f7cb9e9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 17 17:47:00 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2eac013dc8ef48c59aa9f833b36933c45133497f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 17 17:46:48 2013 +0200

    Removed call to cache clear command

commit a5c4efe28ce9d59a7a02e7f9ab6f02d5f8480902
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 17 17:46:48 2013 +0200

    Removed call to cache clear command

commit 27a80afeec58100827596596016f02cedee04bda
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 17 17:24:22 2013 +0200

    ResourceTypesRepositoryTest

commit 5ab4292261d8b42c20937ba04a32a92d14938cee
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 17 17:24:22 2013 +0200

    ResourceTypesRepositoryTest

commit 1677a08b57577d3565c0d31b2550e08ab6e12438
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 17 16:55:35 2013 +0200

    RoleRepositoryTest done.

commit 8dbd63ed7f92e90b6c6e0b2e38608df5f16c3c9d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 17 16:55:35 2013 +0200

    RoleRepositoryTest done.

commit 65a4bb4e8ff4844499bdf2266ebcc601254b9536
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 17 16:34:36 2013 +0200

    Replace deprecated blocks

commit f7cb9e95b1e3b03e1d6139c2e9c7287491dc6b1f
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 17 16:34:36 2013 +0200

    Replace deprecated blocks

commit d3ddbbb641bae26782046ad94e748709ec2e4772
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 17 16:24:53 2013 +0200

    ResourceRightsRepositoryTest done.

commit 597d80986318e71ac1cc04bf1feff17798390124
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 17 16:24:53 2013 +0200

    ResourceRightsRepositoryTest done.

commit 35eff72b5b04aee7bd2fc835397324498be6d427
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 17 15:44:49 2013 +0200

    UserRepositoryTest done.

commit 4cfc71f41a4191a3d558389d9c0e997619d82541
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 17 15:44:49 2013 +0200

    UserRepositoryTest done.

commit 132396266193891a8b63c06740eea828b12e050f
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 17 15:38:35 2013 +0200

    Remove debug

commit d2930f02a40a4ce48395a06b17e3a66ea6c10625
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 17 15:38:35 2013 +0200

    Remove debug

commit 643f85d2ed9d8975088c64ea9d5798d28407eea5
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 17 15:34:20 2013 +0200

    use label option if exist

commit 512d0625cd2a8f17e0071c453236d29ed0e039be
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 17 15:34:20 2013 +0200

    use label option if exist

commit d7f0bcb654ca6e3cc97e7598a956d56e9779a20f
Merge: 58f3849 c340161
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 17 15:28:52 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 737bac4f29ead950abb720f74503746ced503ee2
Merge: f34e4e9 8a58df5
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 17 15:28:52 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 58f3849d21e14f76e7eb17b7ec30012095510385
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 17 15:28:46 2013 +0200

    Log widget configurable. Choose log type in workspace. Choose workspace in desktop

commit f34e4e9b6664c89fa949290d7e2fa785292a8f99
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 17 15:28:46 2013 +0200

    Log widget configurable. Choose log type in workspace. Choose workspace in desktop

commit 8398427a78484d44deaed1bf62ca1cc25fcc20a6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 17 14:47:29 2013 +0200

    GroupRepositoryTest done.

commit a0ec9aa9e1d571814528bd7ca4ac93ba13755bc2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 17 14:47:29 2013 +0200

    GroupRepositoryTest done.

commit e537f054613157def5afb942551a67d91789a36b
Merge: 8510aeb c340161
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 17 13:54:22 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit eb0f67beab0bc62ffe8ce28332283763b2654265
Merge: 313d16f 8a58df5
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 17 13:54:22 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 8510aeb3699ff3fce339c24c101ddd6d753f2f76
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 17 13:52:38 2013 +0200

    Refactoring repositories tests: RepositoryTestCase class + AbstractResourceRepository done.

commit 313d16f80c836a4acf4b2cb5cbc344bc82310b88
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 17 13:52:38 2013 +0200

    Refactoring repositories tests: RepositoryTestCase class + AbstractResourceRepository done.

commit c3401610c3ee2b2308bc2211b5a2f49ab00708d2
Merge: c843214 01af7e1
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jun 17 03:01:48 2013 -0700

    Merge pull request #5 from claroline/upgrade-to-2.3

    Upgrade to Symfony 2.3

commit 8a58df5eb365179c1a6649995822c700fea6da99
Merge: e6970a3 ccb77a2
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jun 17 03:01:48 2013 -0700

    Merge pull request #5 from claroline/upgrade-to-2.3

    Upgrade to Symfony 2.3

commit c843214f6426f31207e3b96d1a1ca4bfd7589513
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 17 10:52:42 2013 +0200

    Log widget work in progress

commit e6970a3f0d37b41e6a666c294d79f42b40c80b61
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 17 10:52:42 2013 +0200

    Log widget work in progress

commit 01af7e1d62005e853ac5f39dd55092ed17e0fcb6
Merge: 81070bf 2f1bffa
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 17 10:08:56 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into upgrade-to-2.3

    Conflicts:
    	composer.lock

commit ccb77a28c961d37477889bc6c1073bac40fb1665
Merge: 3a79b0e e368911
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 17 10:08:56 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into upgrade-to-2.3

    Conflicts:
    	composer.lock

commit 3a79b0e374e1b9cdbfaa2fe0c1f571a0990ac51b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 17 10:01:35 2013 +0200

    Submodule update

commit 81070bfd30e30b7856b127840e35ed37ba5a3515
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 17 09:57:41 2013 +0200

    Removed calls to deprecated 'Form::bind'

commit 3df129b232f22b7c1e2d0f8522f8928525227dc0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 17 09:57:41 2013 +0200

    Removed calls to deprecated 'Form::bind'

commit e368911b837da0403599c95eda218266ddcc7291
Merge: 2db63cb 62185d7
Author: stefk <stephaneklein221@gmail.com>
Date:   Sat Jun 15 08:35:48 2013 -0700

    Merge pull request #31 from claroline/asset-fixes

    Asset fixes

commit 62185d780d5b6182b5c2b219c553ae4e48bc2187
Merge: 4cb5a1f 2db63cb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 15 17:34:47 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into asset-fixes

commit 2db63cbc4c3d0b78bac0b35d290a3247e68c9bb1
Merge: c78e805 15eec3c
Author: stefk <stephaneklein221@gmail.com>
Date:   Sat Jun 15 08:21:32 2013 -0700

    Merge pull request #30 from claroline/ignore-bin-dir

    Ignore bin dir

commit 4cb5a1f00d09fbbf546c1464aad142ae0b20cc12
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 15 17:02:26 2013 +0200

    Restored default theme configuration

commit 2f1bffad6cfad9baff7c6693174993fa792bd714
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 15 16:57:51 2013 +0200

    Modified links to fontawesome according to new tarball structure

commit 2bd0a890598704202d67f83960956d09f7f598aa
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 15 16:57:51 2013 +0200

    Modified links to fontawesome according to new tarball structure

commit 15eec3c922c9479d6c86bf468c0e8da5b38d002a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 15 16:18:45 2013 +0200

    Removed useless placeholder file

commit c58a4f6f0ac8b34e4664e1b97fde0f140319e663
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jun 15 16:14:35 2013 +0200

    Removed generated bin files and added bin dir to .gitignore

commit c78e8058dd518369bb2c6ff8c7cf80dd5f4eb1d0
Merge: 94031a6 dc7ae37
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jun 14 06:41:57 2013 -0700

    Merge pull request #14 from claroline/theme-generator

    Theme generator

commit 85ddc1c1eea1bd9ecce3e61b07c88e9dc9bad417
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 14 15:08:12 2013 +0200

    Changed workspace list display

commit a835d7715fe586845ca184c9269553d26fed96d3
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 14 15:08:12 2013 +0200

    Changed workspace list display

commit bc99e90a5efa3b26e354bcca4ea8ee42a8aacd31
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 14 15:00:02 2013 +0200

    Added Activity repository

commit 2d7898d01727ebd85b281bd116ac1106e3fea366
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 14 15:00:02 2013 +0200

    Added Activity repository

commit 29e73e3a15c7d14c1f50c94952e84fb07f23931e
Merge: 4e79ab1 9a470dd
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 14 14:41:19 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into theme-generator

commit dc7ae37052832fafae40a762df2c4a5d6256ec21
Merge: c002e69 94031a6
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 14 14:41:19 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into theme-generator

commit 4e79ab1d9a917d4ab522769a6eaa6bcd03195128
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 14 14:40:56 2013 +0200

    Theme generator update

commit c002e693625110fab48134cafea26ac1a81a5412
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 14 14:40:56 2013 +0200

    Theme generator update

commit 9f3f75e0925e98a177a024dd8de460a6b9a3092e
Merge: 244aeb6 9a470dd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 14 13:11:10 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into upgrade-to-2.3

    Conflicts:
    	composer.lock

commit e842edafae5d1a431ea221881aaae15e7dfa1e67
Merge: dd745d9 94031a6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 14 13:11:10 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into upgrade-to-2.3

    Conflicts:
    	composer.lock

commit 94031a62765b9099a61b14e18c57cfc12baf6e13
Merge: efd43f6 97a0e5b
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jun 14 04:00:03 2013 -0700

    Merge pull request #19 from claroline/master-fixes

    Master fixes

commit 97a0e5b53f70c235b3cae8ae9681d73eb520e42c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 14 11:36:16 2013 +0200

    Update frontend bundle version

commit 9a470dd9922fb145bd07691cf19522c0903f62c1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 14 11:22:16 2013 +0200

    Fixed broken tests

commit 1b28255ecce4562f8718133d47d1896c6cbbd457
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 14 11:22:16 2013 +0200

    Fixed broken tests

commit efd43f6b1cd36eca292dd3e8169f3329800c1183
Merge: 1911876 f8acd6e
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jun 14 02:14:35 2013 -0700

    Merge pull request #16 from claroline/refactor-query-builder

    Refactor query builder.

commit a4196b5018d2bee821d91fdad5145ec4a7580756
Merge: 1be44bc b677707
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jun 14 02:14:35 2013 -0700

    Merge pull request #16 from claroline/refactor-query-builder

    Refactor query builder.

commit 191187618718c20b91230b318f145420fd81ade7
Merge: cc540ee 80a2cbe
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jun 14 02:14:03 2013 -0700

    Merge pull request #10 from claroline/workspace-tags-in-right-management

    Workspace tags in right management

commit 1be44bcb5aefe2afdca19f91acc27125aeff8dcc
Merge: 4deac0e ee46c1f
Author: stefk <stephaneklein221@gmail.com>
Date:   Fri Jun 14 02:14:03 2013 -0700

    Merge pull request #10 from claroline/workspace-tags-in-right-management

    Workspace tags in right management

commit 9179d58a033d230211358a7e3e61e44ca1d91ee3
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 14 10:40:25 2013 +0200

    Theme documentation update

commit 9a95ee6fac1bd02b8a7fe2f8fb88e98449239106
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 14 10:40:25 2013 +0200

    Theme documentation update

commit 244aeb6dbc679da8e4c061439fbf018bf5996eba
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 14 10:37:27 2013 +0200

    Temporarily fixed resource import

commit dd745d9b06d2ca2e260ef92f8b6d8d9ddfe3a6a0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 14 10:37:27 2013 +0200

    Temporarily fixed resource import

commit 21c8d6ddd890b6bcd2eeecd0112f5336ec6b7a25
Merge: 0acce59 4deac0e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 14 10:30:14 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into documentation

commit 4de2624a33b77c3a6f6f24e3a9584801b913be97
Merge: 66f0aa9 cc540ee
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 14 10:30:14 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into documentation

commit 0acce5953d8a8e64413876be772ac47928f15e54
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 14 10:29:55 2013 +0200

    Theme documentation update

commit 66f0aa918d0fedeb5bd6470830314470eb9841f4
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Jun 14 10:29:55 2013 +0200

    Theme documentation update

commit 4deac0e5915a461be00c53cb3ac062d2e1125b3b
Merge: ba176d3 327b2c1
Author: Panos <ptsavdar@gmail.com>
Date:   Fri Jun 14 09:59:00 2013 +0200

    Changed chart data and date range picker

commit cc540eebff11e6894b64298ff89dca18a6ff6019
Merge: c32abe9 a8abfec
Author: Panos <ptsavdar@gmail.com>
Date:   Fri Jun 14 09:59:00 2013 +0200

    Changed chart data and date range picker

commit 212a1efc7db8eb66f0f9f6d6b7681a671fe29c7e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 14 09:45:42 2013 +0200

    Removed calls to deprecated HttpKernel::forward

commit 7ec19b36ff5a1bd2ca77137b195cc841457fd35d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 14 09:45:42 2013 +0200

    Removed calls to deprecated HttpKernel::forward

commit ba176d339cf2cbacf1c6c4d63771d40a87bea7ba
Author: Panos <ptsavdar@gmail.com>
Date:   Fri Jun 14 09:37:26 2013 +0200

    Changed date-range and stats forms

commit c32abe9dafd083691ad171a70981b26bbe54eb61
Author: Panos <ptsavdar@gmail.com>
Date:   Fri Jun 14 09:37:26 2013 +0200

    Changed date-range and stats forms

commit a8abfecac565eb319ab85657940dd1473ec55291
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 14 08:42:49 2013 +0200

    Downgrade forum bundle version

commit 80a2cbe9bb8d3ad301ac7e0e13a34b8944af87de
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 14 08:37:56 2013 +0200

    Changed a function call in workspace list function

commit ee46c1fc23c701c1349fc33e320adb5120a838bd
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Jun 14 08:37:56 2013 +0200

    Changed a function call in workspace list function

commit 42549b3004efe0b1b649aaeb9320971f0ed37bc3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 13 17:30:35 2013 +0200

    Fixed css selectors

commit 3ec65455bdedfe004322536306534d0299c67551
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 13 17:30:35 2013 +0200

    Fixed css selectors

commit 327b2c1ba7d3e65b95b2676ddfb8160beee0a817
Merge: 9de0251 8bc7a9d
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jun 13 08:12:56 2013 -0700

    Merge pull request #15 from claroline/user_csv_import

    User csv import

commit 3434788245e6c7acb8d19a57ddc2e87723e36397
Merge: 770c4bd dd36ab0
Author: stefk <stephaneklein221@gmail.com>
Date:   Thu Jun 13 08:12:56 2013 -0700

    Merge pull request #15 from claroline/user_csv_import

    User csv import

commit 9a81ee2a00db86c5c065c3ab3436ca1314e0352e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jun 13 16:16:53 2013 +0200

    Refactored duplicate code for workspace list into a service

commit 321477be600269ff62295fbbf97272b60e2747bc
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jun 13 16:16:53 2013 +0200

    Refactored duplicate code for workspace list into a service

commit 8aadb8e1700c03318ddf56b0746a0ad3eee3c975
Merge: daa3410 9de0251
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 13 15:39:51 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into documentation

commit 61c8d3f71c821547fcc79d8059a563ad59ff5574
Merge: b984b37 770c4bd
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 13 15:39:51 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into documentation

commit daa34109a763458bffffb27483589ee92c9c2f18
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 13 15:39:39 2013 +0200

    Theme documentation draft

commit b984b373ac1ae91a5691aca24dcb8f0209978a88
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 13 15:39:39 2013 +0200

    Theme documentation draft

commit 9de025183d73df3022b3ff87b8300ab0d07c5d90
Merge: 06f2631 7bbafd1
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jun 13 15:11:36 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 770c4bd052fb7587bf97333976f652c5d1f53ea2
Merge: 750bc2e b33281e
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jun 13 15:11:36 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 06f2631771db1d4313a7f1897686568b22813b4c
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jun 13 15:10:39 2013 +0200

    delete message_config.js

commit 750bc2e4e75b7c23bd49ab20a38906c158d73a71
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jun 13 15:10:39 2013 +0200

    delete message_config.js

commit c3782174b30f292e36b4623e4f14d8b0fdeadf8b
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jun 13 15:07:32 2013 +0200

    add ressourcelinker tinymce

commit de5aecdeeaf85154e9224bcddfb4073e78126811
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jun 13 15:07:32 2013 +0200

    add ressourcelinker tinymce

commit 4eb34b461dfa2f5d2fd28068639073fe8fedca62
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 13 14:27:04 2013 +0200

    Adapted css selector syntax

commit 1d472b160a26e99f6eea273b582d84400835b009
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 13 14:27:04 2013 +0200

    Adapted css selector syntax

commit 457dd592194c84043ad3d3ed56e7ce42ed001665
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 13 14:07:35 2013 +0200

    Adapted DQL to new CONCAT function signature

commit a28a559a7a39c97bc54d5fce6e2d4e7bf28e4184
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 13 14:07:35 2013 +0200

    Adapted DQL to new CONCAT function signature

commit a40dc4072b98d1306beb23073389a476ac493bde
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 13 13:35:07 2013 +0200

    Submodule update

commit 69336b1e4cc1863560462ddbf584853a4b030d9a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 13 13:31:38 2013 +0200

    Removed calls to deprecated 'bindRequest'

commit 352b1c388623e81fd5f5d19737c68a6960e8af6f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 13 13:31:38 2013 +0200

    Removed calls to deprecated 'bindRequest'

commit f8acd6e28dadc47b03e85e409dd86628643567bf
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 13 13:16:42 2013 +0200

    Refactor query builder.

commit b677707abdde90d7c9e2443f86239bd20c51632f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 13 13:16:42 2013 +0200

    Refactor query builder.

commit 8bc7a9d49bb3b502a65f8afedbe080057286669c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 13 12:57:39 2013 +0200

    Fixing tests.

commit dd36ab060dad4ce3200e38d067290b5f1eb3fda1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 13 12:57:39 2013 +0200

    Fixing tests.

commit 0ed50ae6e3e57148c62bfe77d2c44e261840c21a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 13 11:20:22 2013 +0200

    Removed calls to deprecated 'getEntityManager'

commit ead3b1d17953b9e89f55b20b8488e1b0658ceccd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 13 11:20:22 2013 +0200

    Removed calls to deprecated 'getEntityManager'

commit 8cbbf3f46fb752be8de94d054e22121488adf69a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 13 10:25:06 2013 +0200

    Users can be added without personal workspace (it'll be created of the first login).

commit 113ade736f12c0e4e3007776b4edd576a114e4f6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 13 10:25:06 2013 +0200

    Users can be added without personal workspace (it'll be created of the first login).

commit 256afce3639b19c18fd6d2252e117a6ff0e7cfd6
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jun 13 09:52:15 2013 +0200

    Fixed bug in workspace tool role parameters

commit 26ad2d1173230619c0d1c0b9b223158d709c35b5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jun 13 09:52:15 2013 +0200

    Fixed bug in workspace tool role parameters

commit 1b91511165ab79e94e6c5a33a8e242a53c00541c
Merge: 62ef4e7 b33281e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 12 17:29:23 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into workspace-tags-in-right-management

commit 38b497703b9dfba4ae179b7c2d7ea3bf3e954a09
Merge: d883db8 7bbafd1
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 12 17:29:23 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into workspace-tags-in-right-management

commit 7bbafd1465ab179352755a8f7c160af2b186e747
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 12 15:49:41 2013 +0200

    Revert work in progress

commit b33281e20de939246c94f826886420ce3b3cf071
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 12 15:49:41 2013 +0200

    Revert work in progress

commit 8c56cb89f3c2c6144c9782a8d089589bc1b8fb42
Merge: a738328 d141571
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 12 15:40:44 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit dce068b40dae95fefb9ce438910f255f40fcb5d7
Merge: f823666 107c57f
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 12 15:40:44 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a73832844c1db71a9a1a4adf28a090aedced452a
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 12 15:40:29 2013 +0200

    Debug route for directory in logs listing

commit f8236662e374a9106f406cef95073e68b6eb9e48
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed Jun 12 15:40:29 2013 +0200

    Debug route for directory in logs listing

commit b0326e49d6335ab4bf95581ecde8bad860fa540b
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 12 14:58:07 2013 +0200

    Fix position of ajax message 'please wait' (the message was not visible when scroll)

commit c64863e32150e9d38361227988cb4f5fe2c4ed48
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 12 14:58:07 2013 +0200

    Fix position of ajax message 'please wait' (the message was not visible when scroll)

commit 61643d097718059b2340741ee89cf064ca666340
Merge: bc739e0 d141571
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 12 13:25:09 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into theme-generator

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/config/routing.yml

commit 76ebb5280c3a3c32c8bc09641b2f94a53fc7e53a
Merge: a1edb41 107c57f
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 12 13:25:09 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into theme-generator

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/config/routing.yml

commit bc739e01919df118a4cbe25da19ac6e8e1eff09b
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 12 13:21:02 2013 +0200

    Theme generator update (Views, Translation, Templates, Preview, JavaScript, etc)

commit a1edb4133bcacf186633fb5fd6588af5d5a0bf9b
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Jun 12 13:21:02 2013 +0200

    Theme generator update (Views, Translation, Templates, Preview, JavaScript, etc)

commit d2efe766e5e4521a1d55ce36ff7bf2350c6d2a7d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 12 10:53:00 2013 +0200

    Get back to original TwigJsBundle repo

commit cfb1965cde11f3c4f5fdf071cfaa143d62db6d4f
Merge: 882e8a4 d141571
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 12 10:39:25 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into upgrade-to-2.3

commit e59218e4107e5cafd4af9852b8c1ae99a44ab00f
Merge: d7cfed0 107c57f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 12 10:39:25 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into upgrade-to-2.3

commit d7cfed01830e28a6afa179ac60decbbd6ecbb89e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 12 10:38:44 2013 +0200

    Take non-portability of pcntl functions into account

commit 182a136c0e7e23bc078f13da738533029c69e9d2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jun 12 09:21:01 2013 +0200

    Upgrade to 2.3.1 (doesn't require lib-icu)

commit 882e8a42571ff62a9d5a999f7d62e9594d829be9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jun 11 17:16:44 2013 +0200

    Adapted annotations to new api

commit fb1c6fb1ded2d359f90bf97009c312056772b561
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jun 11 17:16:44 2013 +0200

    Adapted annotations to new api

commit 6645ca6d0d341ebb5a04b47d34e36740e9aa7240
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jun 11 17:06:42 2013 +0200

    Modified installation script to allow interactive building of parameters.yml

commit ef25fd2f4e5fd7023ae4d19302054df0b962c6ad
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 11 14:45:37 2013 +0200

    Users list can be uploaded with csv.

commit 21b8b8a62c79d01c1d0a39cb9b811095dbe758bd
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 11 14:45:37 2013 +0200

    Users list can be uploaded with csv.

commit c9f931859d1c9ee619b26288bc5521ded4159e5f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 11 10:48:29 2013 +0200

    Refactoring the administration menu.

commit 7bed689095bf050453a23eea68fe4e5ca5bf2e51
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 11 10:48:29 2013 +0200

    Refactoring the administration menu.

commit 62ef4e757f4e037cf17f9e5abb3e85cf917a6bd9
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 11 09:41:37 2013 +0200

    converted isTagDisplayable function to static

commit d883db812ad38656277f4a29fb86478bbed317a0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 11 09:41:37 2013 +0200

    converted isTagDisplayable function to static

commit 1cec4e95af4af2b8a2d641afa171bb7299ca27a7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jun 11 09:07:33 2013 +0200

    Upgrade with a temporary switch to a TwigJsBundle fork

commit eb9320701d13a0f6802dfd3d2e4d83b59b852c0d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 11 09:04:34 2013 +0200

    checkstyle

commit 3f4f3e232222dcee22de3b3738937188093c799b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Jun 11 09:04:34 2013 +0200

    checkstyle

commit d141571141ccc2e3af9f070c3544603b87c35ccf
Merge: f3c9874 23ae3c4
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jun 10 23:33:39 2013 -0700

    Merge pull request #9 from claroline/breadcrumbs_macro

    Breadcrumbs macro.

commit 107c57f781508cd881474c3ea3d2fe63a607151e
Merge: 1b89cb2 87707a4
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jun 10 23:33:39 2013 -0700

    Merge pull request #9 from claroline/breadcrumbs_macro

    Breadcrumbs macro.

commit ceccb01b322bafd95b8ba55b37d138399f138c4a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 10 17:31:21 2013 +0200

    Performance increase on user creation (remove some flushes).

commit b2a19e56fedeec5dbe15380c6ec1332c259e7501
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 10 17:31:21 2013 +0200

    Performance increase on user creation (remove some flushes).

commit d23824c1bbac8b5eeb58784759a00f2fea1b39d4
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jun 10 16:59:46 2013 +0200

    Added workspace list in right management in resource parameters

commit 292c8272169d7cbfc4abcf9954581cf26031717d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jun 10 16:59:46 2013 +0200

    Added workspace list in right management in resource parameters

commit 41584d3a4fbf89717f14b2b91c5a05b3455e749a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 10 16:01:23 2013 +0200

    Updated dependencies

commit 23ae3c4a00a751091b28bb7f2ed630834a1d36df
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 10 15:30:05 2013 +0200

    Breadcrumbs macro.

commit 87707a4cbb75bc63d2d5266625acea89ba82cd6c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 10 15:30:05 2013 +0200

    Breadcrumbs macro.

commit 083ad307a4d8748fd4c906140346a08740f25c5b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 10 15:22:16 2013 +0200

    Adapted custom validators to the new api

commit 5dc3be07d23cd8e3a5df206cd2733f7df80400ae
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 10 15:22:16 2013 +0200

    Adapted custom validators to the new api

commit fb9eed9306d08a0996c9accd9eaedeef1d3872d5
Merge: acd605a 1b89cb2
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jun 10 15:21:27 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into workspace-tags-in-right-management

commit 0f04a6c092a69542c4ebb33f927fc529c4f330fa
Merge: a74cfb0 f3c9874
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jun 10 15:21:27 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline into workspace-tags-in-right-management

commit acd605aa5304631e576c841570eea9082914762e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jun 10 15:21:00 2013 +0200

    Added workspaces list in right management

commit a74cfb064d4a5296e0ba237de675f0c44f2faf21
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jun 10 15:21:00 2013 +0200

    Added workspaces list in right management

commit f3c987400696f8d924f94f55ff418ef2bb8548f6
Merge: 286fa5e 1a1c474
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jun 10 05:55:29 2013 -0700

    Merge pull request #6 from claroline/plugin_tool_options

    Plugin tool options

commit 1b89cb27fbc888f39690f1092e0d1f6e6adfa053
Merge: 78dacbe 5844246
Author: stefk <stephaneklein221@gmail.com>
Date:   Mon Jun 10 05:55:29 2013 -0700

    Merge pull request #6 from claroline/plugin_tool_options

    Plugin tool options

commit 1a1c474b1435b5773c8ffd308be3b53ae1981b44
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 10 13:17:48 2013 +0200

    Fixing tests.

commit 5844246f09812ae0f050bebcbab05b7c423f05db
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 10 13:17:48 2013 +0200

    Fixing tests.

commit f0ff9020f1e362c9999cd741ace52b3ccc4191e8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 10 11:34:56 2013 +0200

    Update doc.

commit 6a5ef5459d7d0a9641370bb2927d90aef06aa85d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 10 11:34:56 2013 +0200

    Update doc.

commit 2a15bc009b3e1428ab226dff3cbf648cf350a51a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 10 11:05:55 2013 +0200

    Delete WorkspaceWidgetParameterController.

commit db498f887a1c4e7f3f33507f8c12c28acbfee09e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 10 11:05:55 2013 +0200

    Delete WorkspaceWidgetParameterController.

commit 14d093bc2e6a8fe31d30721654bf4946a73776db
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 10 11:02:38 2013 +0200

    Param conversion and some small code fixes.

commit fd9cab43513707b0864dcb6ae8e727ab5d78ca7d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 10 11:02:38 2013 +0200

    Param conversion and some small code fixes.

commit f142cb5da6629760f5a59423dd206fd478e1250e
Merge: b9b458b 286fa5e
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri Jun 7 14:53:15 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit ac79cf37365241dfde03d88284b2aa7c3d095a39
Merge: eb6815d 78dacbe
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri Jun 7 14:53:15 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 75caf68e70c144959eec71b7a5b56be3b138f070
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 7 14:29:46 2013 +0200

    uncommenting tests

commit 3f59fa16191b4fbce68f3ecbbe2024f9f73b6e4d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 7 14:29:46 2013 +0200

    uncommenting tests

commit b41633312f06381038e575900e9f83acefd28bc5
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 7 14:28:41 2013 +0200

    Updating fixtures.

commit 55e523154bded3549fc6abc20b8825bf0691e13f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 7 14:28:41 2013 +0200

    Updating fixtures.

commit 0ca2fc239fcaf2eb5bce5593473d5f9513a87156
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 7 11:55:05 2013 +0200

    Event for desktop tool configuration.

commit 2813ef2ef8ff974e0b07eae63ebf36de4d38ab8c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 7 11:55:05 2013 +0200

    Event for desktop tool configuration.

commit 20d3ef36d0879268f2d936a5d7d1cfabbb7e68c2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 6 17:32:10 2013 +0200

    Workspace tools reorganization.

commit 0e4fd170ca0921eeffeb03677c3a1e2f30ca3bbb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 6 17:32:10 2013 +0200

    Workspace tools reorganization.

commit 286fa5e55407ae4500351a7397dc2cd9f3a08275
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 6 17:21:21 2013 +0200

    Fix web path bug in theme service

commit 78dacbe5fed149c260cf5840ea5a143a75fc40b0
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 6 17:21:21 2013 +0200

    Fix web path bug in theme service

commit 5b1def7b34e912facaff1e5451a85fe61b07dfd2
Merge: 13fe693 103002b
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 6 17:16:50 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e5c2a9325044cd2fb698e567befc6627aea76510
Merge: 638b3f0 43dda9a
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 6 17:16:50 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 13fe693502c76fa56604e1c90694fe1cbfa2c5f7
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 6 17:15:32 2013 +0200

    New theme service for compile templates and new command to compile themes (claroline:theme:compile Claroline)

commit 638b3f0b691e9a6f68b63490616ba635bb37d5e9
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Jun 6 17:15:32 2013 +0200

    New theme service for compile templates and new command to compile themes (claroline:theme:compile Claroline)

commit 43dda9af5cda868a845b84325fdbc5819a6877d3
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jun 6 16:10:02 2013 +0200

    Allowed anonymous to access to workspace list

commit 103002bc837536ce304d3a208000786b6821e49b
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jun 6 16:10:02 2013 +0200

    Allowed anonymous to access to workspace list

commit 72cee0abe3bbfbdbacf5a0e77dfc2ca9846589d6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 6 14:58:35 2013 +0200

    Moving Tool/WidgetController to Tool/HomeController

commit 4bebf1c9f65fe04f60d0048cb03a19ff2d1a0755
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 6 14:58:35 2013 +0200

    Moving Tool/WidgetController to Tool/HomeController

commit f891724d7c6617e14ca77ad357183374958439f3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 6 14:45:09 2013 +0200

    Event for workspace tool configuration.

commit bdbd20134c10a5ca192b97203b5832b0f788f90b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 6 14:45:09 2013 +0200

    Event for workspace tool configuration.

commit b9b458b6d0c24514bbacdcfa76b44bf20e776e99
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Jun 6 14:01:00 2013 +0200

    Remove console.log in js file

commit eb6815d582be3eeab6f34e639ab3a55f6999f2f8
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Jun 6 14:01:00 2013 +0200

    Remove console.log in js file

commit d2df92e22c455a9a426f72f554c7acd0b7e98368
Merge: 1c3de4f ee14097
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jun 6 11:51:40 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 7fbea6de26b07f43b59e0e42d9a53aca39ca33cf
Merge: dfd3b4b 6c5e8ac
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jun 6 11:51:40 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1c3de4f6cb7f4ceaa0c6d2ed88c54eb5097de83d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jun 6 11:51:15 2013 +0200

    Added hierarchy for private workspace tags

commit dfd3b4b91b9a05cac1fc42ac02235e87c5512595
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Jun 6 11:51:15 2013 +0200

    Added hierarchy for private workspace tags

commit 974c1c11e2aac6c4c6031a84be03f353c88cbe52
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 6 10:59:12 2013 +0200

    Updating database and plugin installation.

commit 165817ff2b74b5fa0e5d50db196fc00143a4895e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 6 10:59:12 2013 +0200

    Updating database and plugin installation.

commit ee140970758234a9e0eefc1c5287462148f008c5
Merge: 730bfd0 33984e7
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jun 6 10:55:04 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6c5e8ac71e857a987d004763123d27c1397997d5
Merge: d1feeed 6c16cc4
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jun 6 10:55:04 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 730bfd0ca2ede99b6e7e020017ff4ee826c7b419
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jun 6 10:54:55 2013 +0200

    checkstyle tinymce&calendar

commit d1feeed7c3145b8286b4914fcc8170c3a8337b04
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Jun 6 10:54:55 2013 +0200

    checkstyle tinymce&calendar

commit 33984e7d285eee1ab80e401b424a289b8eaa942b
Merge: 16b0370 9d6adf6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 6 10:25:46 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6c16cc4137147a8186316a827366162e8dcaa333
Merge: 0e1e242 9b7b89f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 6 10:25:46 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 16b03707cb665b605025d4db176ece3b02712605
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 6 10:25:08 2013 +0200

    Fixing tinymce image picker.

commit 0e1e24284c3b5ddad166f8585fc9e7aa64e57a93
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 6 10:25:08 2013 +0200

    Fixing tinymce image picker.

commit d5eb6983bd562ce6dee953099fb4abd701c6b8a1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 6 10:20:03 2013 +0200

    Upgrade to Symfony 2.3 (#4)

commit 9d6adf6f65f37f226e9fe6a5d8a76287b45f7b65
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jun 6 10:15:17 2013 +0200

    Remove useless css file and add web/css directory to the .gitignore file (all css files come from bundles)

commit 9b7b89fa91bc255af72df5dd9ae86cb4fe94d8c9
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu Jun 6 10:15:17 2013 +0200

    Remove useless css file and add web/css directory to the .gitignore file (all css files come from bundles)

commit f32531cebc8eaa6eb516f7d8ab9abc5e2f4d9012
Merge: b17c11c ef0db9e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 6 09:55:34 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e3eaf751e4a53f6b8c8d58ef064166b523333243
Merge: f5b9a47 0a7332a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 6 09:55:34 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b17c11c5ec058e9f58e903876eacda25f36a6fa9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 6 09:55:09 2013 +0200

    pre pull

commit f5b9a4754945d0882c4de0f8045c81c217fa0245
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 6 09:55:09 2013 +0200

    pre pull

commit d2a20352eae8368e9713b26883e9836bac4915bd
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 5 17:50:54 2013 +0200

    Search at desktop root level includes every ws of the platform.

commit 4d9e8c1bf8fff53d990c08061f3193894ec1a819
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 5 17:50:54 2013 +0200

    Search at desktop root level includes every ws of the platform.

commit ef0db9e3d3926bbd7e3ac1bf6ad96cfb12555a4c
Merge: bf744b5 2c7c67f
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jun 5 16:00:12 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Form/MessageType.php

commit 0a7332a74d41ef4748c3eaef7191af2b02e1ad33
Merge: 0392b44 1b7cf38
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jun 5 16:00:12 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Form/MessageType.php

commit bf744b5b01ccbd1d24116e4adf4c6cd1ebca2c31
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jun 5 15:56:48 2013 +0200

    image in tinymce

commit 0392b44264f9a8223f04ed0293e81003f23aeb7b
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jun 5 15:56:48 2013 +0200

    image in tinymce

commit 2c7c67f47807e266cbd5149f3295dc79e6516623
Merge: 62adcc2 edbb6c0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 5 14:01:01 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1b7cf380ca7b95aa989ac1ea0e8f7df3a284cb60
Merge: 4134b1a 910c44f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 5 14:01:01 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 62adcc27da9fe7b5c1b7db16c84a21872e42f0b2
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 5 14:00:50 2013 +0200

    fixed merge issue + checkstyle

commit 4134b1a125e52abda7a34cbc75b70daf39c4eef8
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 5 14:00:50 2013 +0200

    fixed merge issue + checkstyle

commit edbb6c0700d5c96af6315424901b9a4d1dbb7461
Merge: 1db6f81 2d2f1ee
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 5 13:30:55 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 910c44f07387c346ec069d0bc6c0cc621a8ee203
Merge: 500a242 6f611d0
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 5 13:30:55 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1db6f817f982c1ac9546e372f1a658b8430edd3c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 5 13:29:59 2013 +0200

    _resource is required for the workspace layout when displaying a resource template. The workspace parameter is removed.

commit 500a2420ae394378ef313d76caa00c31b6574972
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 5 13:29:59 2013 +0200

    _resource is required for the workspace layout when displaying a resource template. The workspace parameter is removed.

commit a14e418138cd9c8504933da60d7b21089e32a457
Merge: 05ee5f9 2d2f1ee
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 5 13:22:46 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php
    	src/core/Claroline/CoreBundle/Controller/WorkspaceTagController.php

commit f8a77b04eefc6390c40ff97d5919b4ea2c3b530d
Merge: b8ffcf9 6f611d0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Jun 5 13:22:46 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php
    	src/core/Claroline/CoreBundle/Controller/WorkspaceTagController.php

commit 2d2f1eeb641bb77b14e00426fe6acc7a0ecb4273
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 5 11:03:31 2013 +0200

    Update phpDoc

commit 6f611d0c4a0737b67239db87165425e478ae3f82
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed Jun 5 11:03:31 2013 +0200

    Update phpDoc

commit 9f73f4135ebe7cd4bb8c5c88c4324c52389030c8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 5 10:37:00 2013 +0200

    Removing _workspace from query string.

commit 0ce2abc9e6709031368d949cd4c84f384e228e92
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 5 10:37:00 2013 +0200

    Removing _workspace from query string.

commit 42f3cfdde4424847429b6d79deb35c056231439c
Merge: 3e7fada 8063a48
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 4 17:34:25 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 24fad63f9e5ada7f9b0b3fccb7204ed64bbb1344
Merge: a442e3f c9237a8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 4 17:34:25 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 3e7fada78e2fc5a89077566a2258ac63e2d5a98f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 4 17:23:06 2013 +0200

    Basic javascript filter for resource manager.

commit a442e3f1cb3a6b95be290bd1fb06e54f2643bd8a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 4 17:23:06 2013 +0200

    Basic javascript filter for resource manager.

commit 8063a485601829bc749e6222ae8f234dadf30cb5
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 4 15:31:38 2013 +0200

    Theme Update (fix body margin in 768px mode)

commit c9237a8fa63c4149d18f4faa74892c2929601d7a
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 4 15:31:38 2013 +0200

    Theme Update (fix body margin in 768px mode)

commit 8119e4c23c2736e2c9af9d1a8730d4a7ab125c4b
Merge: 2746e39 8fcf1dd
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 4 14:22:45 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b0aadd6b694aa6f77cd3c1ff48aac4d621a27fa1
Merge: d8e78eb 496ec40
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 4 14:22:45 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2746e39a54fe44f66f5d97eb37def50bfadd1647
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 4 14:22:38 2013 +0200

    Rename some data fixtures files

commit d8e78ebc5e3454b20acc9bc23b0098d5e4df370b
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 4 14:22:38 2013 +0200

    Rename some data fixtures files

commit 8fcf1ddc259e8ec764149fbd818add11106453d2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 4 14:04:46 2013 +0200

    Empty the role list before each search (resource rights options).

commit 496ec40481f37eee9e286db283a8a23069963225
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 4 14:04:46 2013 +0200

    Empty the role list before each search (resource rights options).

commit a683604dc12c27fed8ee6ca8661acbb340caf978
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 4 13:42:20 2013 +0200

    Moving some logic out of ResourceRightController.

commit 001036b4c448b01e9879b00ff00710984f064af2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 4 13:42:20 2013 +0200

    Moving some logic out of ResourceRightController.

commit 5063f251228c4f6504d61384a5d8072f66f962d7
Merge: b019331 902e1cc
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 4 11:42:05 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/plugin/Claroline/ExampleBundle

commit ef161738199212ce10c12959294015a6a8f8c345
Merge: f670a5e 8de5225
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 4 11:42:05 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/plugin/Claroline/ExampleBundle

commit f670a5e87f95fe3d42f8f75c3a40fc15c827aa97
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 4 11:27:57 2013 +0200

    SubModule Update

commit b0193310b7731da6236234d4b0603e0a87461ba0
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 4 11:25:04 2013 +0200

    Themes update + Introduce the posibility of overwrite a core twig file from a plugin

commit 37236e4475702a3e049fea22b2353b403e5dcffa
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue Jun 4 11:25:04 2013 +0200

    Themes update + Introduce the posibility of overwrite a core twig file from a plugin

commit 902e1cc09a15773708a6be70a99ba75d26a1202e
Merge: 2af7cb5 dad0c58
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 4 10:12:03 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 8de522522a55e3be9e79c15949a7c02c96943548
Merge: c5dbea2 6d49e20
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 4 10:12:03 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2af7cb542a8be1a417f260becbcd61ada661251d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 4 10:10:55 2013 +0200

    code_analysis

commit c5dbea24e17e4caa7dc9ee5514ed263739c53370
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 4 10:10:55 2013 +0200

    code_analysis

commit e44867c1815edc4bd9adb6b93c5b18cc360a0ec1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 3 17:40:07 2013 +0200

    Rights on resource roots can be changed.

commit dc472986e343982040dd94ce8a39e00478443f85
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 3 17:40:07 2013 +0200

    Rights on resource roots can be changed.

commit 05ee5f9d1fd58d9f526e54f9f712d17f22fcd53c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jun 3 17:04:45 2013 +0200

    Added workspace tag hierarchy

commit b8ffcf9fc7dac272ac4647b351f59fab38252d06
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Jun 3 17:04:45 2013 +0200

    Added workspace tag hierarchy

commit dad0c58ea1c7026dc43d0f212dec590a5b5c73c1
Merge: ad1c017 45028b4
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 3 10:41:03 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6d49e205d16000c5b94a32f7a46fdebc02e25291
Merge: 26a8037 5cadf82
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 3 10:41:03 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit ad1c017f95ac5cc091b8ad2c41bb3979ddae56aa
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 3 10:40:45 2013 +0200

    Clean LogRepository

commit 26a80373aeb0b521cf3c1b6bf6c11abfaf71ac79
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Jun 3 10:40:45 2013 +0200

    Clean LogRepository

commit 45028b4a784097decf7d25d2b2ba8049c755101f
Merge: 2ad36e8 e0bc37b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 3 10:38:59 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 5cadf82be4805e716a231abf44297a5aeb6259af
Merge: ea55de4 b0abfbc
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 3 10:38:59 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e0bc37b24cf3981c67c80e59d1a4951953615314
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri May 31 15:17:28 2013 +0200

    Removed useless access to container

commit b0abfbca4a145c985bf2e71cc1709fa6046d200d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri May 31 15:17:28 2013 +0200

    Removed useless access to container

commit a5ba9bd14815a12e517f381ab3fcc8d8703ac16c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri May 31 15:04:20 2013 +0200

    Update frontend bundle

commit 58512dbf68fc189e7a501a6bb80db2caae474481
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri May 31 15:04:02 2013 +0200

    Added dev dependencies to composer install

commit 2978557fa138fb6e271ef298b299c39f0b6766ee
Merge: 20de59d 6470d82
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri May 31 13:42:29 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 850a76bbf494be3c931197e71e9c9c3430d9c305
Merge: 8f548c9 4b7acc8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri May 31 13:42:29 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 20de59dfe03ff63bfb700f863074256da61a1f96
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri May 31 09:44:37 2013 +0200

    Refactored query string handling

commit 8f548c9687da2db57db2723a1590a91f8d7c7d3c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri May 31 09:44:37 2013 +0200

    Refactored query string handling

commit 6470d824e7e84dc23f2392ea9e86ad339866b624
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri May 31 11:36:29 2013 +0200

    Debug Log repository for postgresql compatibility

commit 4b7acc880769e38bd1a3450f93a28cacffaef0e5
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri May 31 11:36:29 2013 +0200

    Debug Log repository for postgresql compatibility

commit 07192e76715bdc94ed06be7ba197eeaec56ae824
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri May 31 08:50:02 2013 +0200

    Added mockery test case

commit eee4ac4b61c0e0ffaa07e90b0ee859efb9aa3f28
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri May 31 08:50:02 2013 +0200

    Added mockery test case

commit 83fd78ef5114bec5b6f4d26a7de0a23ff50ef197
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 30 15:40:31 2013 +0200

    Added mockery

commit 2ad36e820858b286d03f146967f1c166cc5b0243
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 30 14:19:17 2013 +0200

    Recursive search for resources (follow links).

commit ea55de45131ceac1efdd73e10985b671d0e4879b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 30 14:19:17 2013 +0200

    Recursive search for resources (follow links).

commit 42cca43ca2aaf1a2148788192670100c84663fd2
Merge: 7856fcd 9441741
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 30 13:31:26 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a01f657ef865c9a5e7e1fb75b664211ce5b2f682
Merge: 23b027f c1ba8e5
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 30 13:31:26 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 7856fcd7957ccc37f614050ea7e9ebdbb19c1c99
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 30 13:30:32 2013 +0200

    fixing Workspace/layout.html.twig

commit 23b027f9fb72dfd57375651bddc334639e539e92
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 30 13:30:32 2013 +0200

    fixing Workspace/layout.html.twig

commit ce8058a772efbd1649483b692d68b84b2b71a3a4
Merge: 375943e 9441741
Author: easy-es <esdras005@hotmail.com>
Date:   Thu May 30 11:46:25 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f2b9f5284bb6b00c94f9f5e08bdf5fe88c052965
Merge: 4ce0afe c1ba8e5
Author: easy-es <esdras005@hotmail.com>
Date:   Thu May 30 11:46:25 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 375943ef89316d6f46d5d3d356078eb6e1e25d1d
Author: easy-es <esdras005@hotmail.com>
Date:   Thu May 30 11:46:20 2013 +0200

    tinymce bundle config

commit 4ce0afedd31517dac05826a966c5d5ffc6dc087a
Author: easy-es <esdras005@hotmail.com>
Date:   Thu May 30 11:46:20 2013 +0200

    tinymce bundle config

commit d0182eeb2b1372bcf41183fb3a5d6bcf0dfadadd
Author: easy-es <esdras005@hotmail.com>
Date:   Thu May 30 10:43:57 2013 +0200

    closes #3

commit ceea03b1180920a9f08d2d7a380bffa7de522f6a
Author: easy-es <esdras005@hotmail.com>
Date:   Thu May 30 10:43:57 2013 +0200

    closes #3

commit 94417416777ca5a484a572e97d087e3fe1f9b876
Merge: 8c49201 58e453a
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu May 30 10:21:14 2013 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit c1ba8e5fce61727fdd1b67a3a0d546e5192ef7e2
Merge: b49157a 6dcf2dc
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu May 30 10:21:14 2013 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 8c492013baf1c393e772bf0a6e1bda3e7ece9a31
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu May 30 10:20:27 2013 +0200

    Update phpDoc on DesktopController

commit b49157ac69ffa817dffef0f53bab8fd358ce4d73
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu May 30 10:20:27 2013 +0200

    Update phpDoc on DesktopController

commit 6dcf2dc5ccb9ea197a10f0a6b81685bae3d6f905
Merge: 20ed0c2 b7a3454
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 30 09:58:46 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 58e453adad49380805c0c9408e3c98bba4205064
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 30 09:58:14 2013 +0200

    Fixed broken test

commit 20ed0c266b8c2858455408e0ca705d06823954a2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 30 09:58:14 2013 +0200

    Fixed broken test

commit b7a3454859cd61b01e133244f8c7eeb5bd32b9e2
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Thu May 30 09:43:02 2013 +0200

    Submodule update

commit e8fa3c25b3f613df7a6a35acb7b864fedbde7b6c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed May 29 16:27:12 2013 +0200

    Submodule Update

commit 8a7dc3b2736e1b4e053e657cc1af247f60790eb0
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed May 29 15:52:50 2013 +0200

    Plataform option update

commit 5daff2a8ececf7bc512fe886b267c3d4fbf43508
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed May 29 15:47:22 2013 +0200

    Submodule Update

commit 296d8374328ebd1c60c04ebe8bce93b3843f4ab2
Merge: 3fda27b 2beea40
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed May 29 15:41:53 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/layout.html.twig

commit e79ce423f91fa8b62a9eda2ea60be08ef8b65621
Merge: 8c0ba26 8393cf2
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed May 29 15:41:53 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/layout.html.twig

commit 3fda27b5dad558d9a42cd7cca078521b6eafbdae
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed May 29 15:38:07 2013 +0200

    Themes update + Submodule Update

commit 8c0ba26bdaed550fcbb9c61ec8ce9fa5a2372fc6
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed May 29 15:38:07 2013 +0200

    Themes update + Submodule Update

commit 2beea4019b7a80f88eef5ca08d8624dc6085e6f5
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed May 29 16:36:36 2013 +0300

    Correct link to main readme

commit 8393cf27347d21058ca5669f97962bc626e0c8f1
Author: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date:   Wed May 29 16:36:36 2013 +0300

    Correct link to main readme

commit 10614358a0707a554c3150c1f323156bf5d45234
Merge: b20abd0 71b0513
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 29 14:12:34 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d21b61eba690ab64047946dcaafbed0d8e9294c4
Merge: 171de60 641d724
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 29 14:12:34 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b20abd02424376e47273621bdc2524d56e4cfe5e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 29 14:12:29 2013 +0200

    Include theme template if exists only

commit 171de60de30f9995d1ebd992daa32f42c2f4a01b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 29 14:12:29 2013 +0200

    Include theme template if exists only

commit 71b0513160337d60079ca73e35b527032dea19ae
Merge: c1531df 8927905
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 29 14:10:14 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 641d724973e160061d747a5978022284994c5d8c
Merge: 7dc11e4 6c79022
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 29 14:10:14 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c1531df774fe2a77d4c4548e238cbcbdfe49f9b5
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 29 14:09:45 2013 +0200

    Themes can be defined in plugins.

commit 7dc11e4014adf719a1dbede0e4f5031ab4029722
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 29 14:09:45 2013 +0200

    Themes can be defined in plugins.

commit 89279053b16bc6772407ac98acef428a194b6969
Merge: a75ade4 a7bd8a8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 29 11:58:22 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6c79022902e122c8e5e14ddf00c6b2b966358512
Merge: fd4949f c4e1fd9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 29 11:58:22 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6865e6630d7f5ef6b679b9fafe6c8f71f25e5f15
Merge: 7d3ba53 a7bd8a8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 29 11:58:14 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c6c3a72bfbc7747071e0e098f992d09d69da781c
Merge: 4b205e4 c4e1fd9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 29 11:58:14 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a75ade4a764cf9fdc27395213d1fa060c8b15bde
Merge: 2d4058b 2a44202
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 29 11:57:47 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit fd4949f686cc7ad7593b443a83e264c4fcd652df
Merge: d82350f fedcf0b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 29 11:57:47 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a7bd8a87f55b8f1826de6b659a6821bca2825678
Merge: d6ef4de 2a44202
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed May 29 11:57:45 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c4e1fd935bce94c95224be716d712b008260e72b
Merge: d206ed7 fedcf0b
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed May 29 11:57:45 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2d4058bb4b60fbf6b0507166b6304a7be77c9b9e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 29 11:56:35 2013 +0200

    Fixed association mapping (closes #2)

commit d82350f53214fe5f1784c50dd5f32a1aa213110d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 29 11:56:35 2013 +0200

    Fixed association mapping (closes #2)

commit d6ef4de643bc7698286a35d4e1cebc70df78c395
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed May 29 11:51:45 2013 +0200

    New entity, data fixture, repository and twig extention for ThemeContoller

commit d206ed7b6aef556fb69a901cac51ea0248621261
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed May 29 11:51:45 2013 +0200

    New entity, data fixture, repository and twig extention for ThemeContoller

commit 7d3ba539ec7ea603e9ebc3c94b7317bc6ed3c749
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 29 11:51:19 2013 +0200

    Editing ResourceQueryBuilder for future recursive search.

commit 4b205e43e786b1c25638abc5b4c4db56542e6638
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 29 11:51:19 2013 +0200

    Editing ResourceQueryBuilder for future recursive search.

commit 2a442026749e0f77a309bc4c2be5fe14c04ae7ba
Merge: e94d287 6fa794f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 29 11:03:10 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit fedcf0bbe44ca4992add6d78c703f689cdeb4be6
Merge: 71d46e7 a2fa5ec
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 29 11:03:10 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e94d2879b2ab5eb3c79f050dd5c536ca31c56574
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 29 11:01:18 2013 +0200

    Fixing _path twig method.

commit 71d46e78a513d4e3e5894aa3ee24e459b8d74f5a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 29 11:01:18 2013 +0200

    Fixing _path twig method.

commit 6fa794fa54fed1fabcd60ff219163cc792820058
Merge: 28ddefb 594fbe0
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed May 29 10:20:01 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a2fa5ec09577273c15d4ad1a6772835cddafb6e7
Merge: 97aeda5 bdd8f70
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed May 29 10:20:01 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 28ddefb05efd510246b28ab14a8cad8c39f8a504
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed May 29 10:19:43 2013 +0200

    New Theme Controller sketch + Delete some generated files that are not being used

commit 97aeda5bdc5b59da73cf289abfbdf80d0a76ab35
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed May 29 10:19:43 2013 +0200

    New Theme Controller sketch + Delete some generated files that are not being used

commit 594fbe087f8a2b395a793d753bbc9afdf5435c48
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 28 15:37:10 2013 +0200

    Fixing test.

commit bdd8f7088f4bc7051c51cda3cdf9928091ce976b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 28 15:37:10 2013 +0200

    Fixing test.

commit 20dd14c600d2138ea109049ccfb151872ed6dc87
Merge: ae883ef a24ab9c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 28 15:08:02 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php

commit cd0ebdc458b05b56d12a7949bb13b4fdb76be83a
Merge: 418700b 482a7aa
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 28 15:08:02 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php

commit ae883ef534a8f9d54c16dc3d56b551ea90e9fc5a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 28 15:06:58 2013 +0200

    Resources can be openend outside the creation directory.

commit 418700b7ac31666d468185baaa655bfc40a004ca
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 28 15:06:58 2013 +0200

    Resources can be openend outside the creation directory.

commit a24ab9c9f9685379725d632c593d3e6a28578200
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 28 11:58:11 2013 +0200

    Added cast in comparison

commit 482a7aaec4b2fd8f626969bfa25a83deb27ad8e1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 28 11:58:11 2013 +0200

    Added cast in comparison

commit 43b5e663231abe1a6f5e655f44e4395d78ae3ec0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 28 11:57:44 2013 +0200

    Fixed broken test$

commit cc4f78bb442f4b815dbcb9263c3d19840319d742
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 28 11:57:44 2013 +0200

    Fixed broken test$

commit 7f4c90162eaa1de08a7a2802a4e97d331d9cea8f
Merge: 8aab726 c20da0d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 28 11:09:27 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 701afd85c46971f1df7410ed9a1da37643a813f2
Merge: e46d949 3d3b409
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 28 11:09:27 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 8aab726f60f0f35c7db176ee69d6a07a873ce7ee
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 28 11:09:05 2013 +0200

    Forbidden anonymous access to parameters tool

commit e46d949b2a5252324c16117b61da2c8b28483533
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 28 11:09:05 2013 +0200

    Forbidden anonymous access to parameters tool

commit c20da0d4a741b4a98ca77c622cff93cb14f2f97b
Merge: 79b4deb 9b4c933
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue May 28 10:11:41 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 3d3b4092e59dc4f13a02da248105731ff94e77c9
Merge: 4117984 a71cac0
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue May 28 10:11:41 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 79b4deb76ac1cf27f5e93b0150f2cf5677f2c252
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue May 28 10:11:33 2013 +0200

    Fix color errors in dropdowns of home interfaces

commit 4117984505350a1fe3ff74c4e9063fe9f3faf356
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue May 28 10:11:33 2013 +0200

    Fix color errors in dropdowns of home interfaces

commit 9b4c933bd14697869270ec59df3a8ad14873cfde
Merge: d791139 8b7c9f4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 28 09:48:36 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a71cac0f37d83a4b64807ba1c890f2aff780201c
Merge: 6794ae3 e0ca389
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 28 09:48:36 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d791139f76d392277dc6b30fc87a2aa9ed604ff2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 28 09:48:15 2013 +0200

    Removed access denied http exception (allow authentication of anonymous users before sending a 403)

commit 6794ae3f2cb6a4373e316f33f959f2243c4d6965
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 28 09:48:15 2013 +0200

    Removed access denied http exception (allow authentication of anonymous users before sending a 403)

commit 8b7c9f47c6a7d037ff0a120e5fd68c87feab5d3c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 28 09:47:38 2013 +0200

    Fixing broken test.

commit e0ca3895aa1b532797b713980b2f733de44c5628
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 28 09:47:38 2013 +0200

    Fixing broken test.

commit b04c1ab0188cd4517f3a2f03811d0763bebd122c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 28 09:23:47 2013 +0200

    Rights verification for resource ordering.

commit e92ed8f6d33a0cc347fa31b5d6f600d7c1f06ff2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 28 09:23:47 2013 +0200

    Rights verification for resource ordering.

commit f885fc17ec0c037a7554498217e17ff3c45411c7
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 27 17:37:26 2013 +0200

    fixes #1

commit 1f5a263328ae888af591aff4ee55ff70962534b1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 27 17:37:26 2013 +0200

    fixes #1

commit 15872c3f2b977e1855ac8748ca9ab9b43aa34b06
Merge: 45b3bfb 58a186f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 27 17:36:29 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 90109c1ddb8b8c485c8dfab17f9aa96047bc7521
Merge: 58b3d8c 3d9b60d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 27 17:36:29 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 58a186fc2aab7c2615a4641273940c1546feedf5
Merge: 5e7efd8 954345a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 27 16:14:28 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 3d9b60dd58fe080f2df5961a1c84a787890a1900
Merge: 894a4f5 fe61fbb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 27 16:14:28 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 5e7efd85c7b92bf72cf95d8845e57247832c0f50
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 27 16:13:49 2013 +0200

    Fixing ResourceQueryBuilderTest

commit 894a4f59795326688d187210c003d1681a2db34c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 27 16:13:49 2013 +0200

    Fixing ResourceQueryBuilderTest

commit 939e400ca85ae73637b7f2de1292eccdbd724eb8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 27 15:48:50 2013 +0200

    Resource drag & drop reordering: fixing InsertBefore method and tests [2]

commit 05905515a2ed8daa08402b8ea250968fb8730753
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 27 15:48:50 2013 +0200

    Resource drag & drop reordering: fixing InsertBefore method and tests [2]

commit 45b3bfbe6b858c45c1b11d63ea2c3e1dfd9c038d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 27 15:13:07 2013 +0200

    Made workspace group management tool read-only for anonymous users

commit 58b3d8cc37a3196c2e6f7834a65d98194336757c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 27 15:13:07 2013 +0200

    Made workspace group management tool read-only for anonymous users

commit fe61fbb53e8083f6d4d2f0f663756d7b2036fa68
Merge: e3ec5a6 6a464ed
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon May 27 14:48:29 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e3ec5a64306add6d7544fc15608854e46aa642ef
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon May 27 14:48:13 2013 +0200

    Delete NodeJS & Lessc dependency from documentation, The themes are now compiled with LessPHP

commit 954345a59054fcdc85409b98f772cd35435c14a3
Merge: 7ad848f faa6117
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 27 14:35:50 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6a464ed00abc468ba8834258107a488e3ef54b1a
Merge: a063195 fabbe5e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 27 14:35:50 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit fabbe5e7720aee2332229c64302ee60a17df181a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 27 14:32:46 2013 +0200

    Updating submodules.

commit faa61172dcaa74640ce6d10aa02fd45bbeca1ff8
Merge: c68604a 93f3757
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 27 14:31:52 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0029f9ff540a5cd617769b2bfb296d09c462f588
Merge: b39f9cb 7b1a612
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 27 14:31:52 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c68604a3ccf50955f11c1718a02ba6b5331dd4db
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 27 14:30:37 2013 +0200

    Drag & drop for resource manager (part 1)

commit b39f9cbe3a1b1c9d92b9b7a358747d46c9ffbb08
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 27 14:30:37 2013 +0200

    Drag & drop for resource manager (part 1)

commit 19045522072938e25f88d0d53cefcec7a9dce0a1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 27 14:30:11 2013 +0200

    Fixing breadcrumbs + method for changing the resources positions.

commit d21f3a8afc824df2f35cb2a9e44280db8fe7d0a7
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 27 14:30:11 2013 +0200

    Fixing breadcrumbs + method for changing the resources positions.

commit 7b1a612576bf79fd38d642054d67c80d00fa48ba
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon May 27 14:27:28 2013 +0200

    sub module update

commit 7ad848f7564cf9994e34c86b67c147586e7fecd2
Merge: 5772686 93f3757
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 27 14:09:47 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a0631954a354e418324f7a57d9361f5f775afba0
Merge: f4ef1a4 7902bcc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 27 14:09:47 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 577268628d1af6a348a11684aa5aba2d8bad5e42
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 27 14:09:37 2013 +0200

    Check for global existence before using it

commit f4ef1a4bb8e5ae43e41e37f530edcc74f259f9a8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 27 14:09:37 2013 +0200

    Check for global existence before using it

commit 93f37577a7621fe64698e286b41fa696065ead11
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon May 27 14:09:20 2013 +0200

    Fix style for dropdown-submenu in the top bar (979px mode)

commit 7902bcc0f0d177a752369f388260941f48c910c7
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon May 27 14:09:20 2013 +0200

    Fix style for dropdown-submenu in the top bar (979px mode)

commit 2718f19cbfd9f89cf526ae4180b4f3be7c68598e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 27 14:08:37 2013 +0200

    Uncommented some tests

commit d35dda39c25ef48368a7038446848683ba597861
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 27 14:08:37 2013 +0200

    Uncommented some tests

commit 85e5d65f3813a3f643286e0446250c411d067493
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 27 13:48:49 2013 +0200

    Added comment

commit 398a3934ca62ffb6a21cc33b8c18f0ebfdcd00b3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 27 13:48:49 2013 +0200

    Added comment

commit 982f93047785041c8f89d8f7e8bf2a94b897f732
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 27 13:48:25 2013 +0200

    Made workspace user management tool read-only for anonymous users

commit 07e1f1d23db1f7e846cec6f7f4c6b02e9216f993
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 27 13:48:25 2013 +0200

    Made workspace user management tool read-only for anonymous users

commit 164ad8aba6ae66f5864a15cc7a551896a9452299
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon May 27 13:36:57 2013 +0200

    Change disable links html&css in resource manager

commit 6c3e74d049b59de2e8f406f3948f11c65e49d0a4
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon May 27 13:36:57 2013 +0200

    Change disable links html&css in resource manager

commit c6d2263dff182a561a19d1addac8c42e38a58510
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon May 27 13:16:25 2013 +0200

    Fix user parameter JavaScript error

commit 5be0a53d11b4317efc6b68ed45273c840adbc31b
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon May 27 13:16:25 2013 +0200

    Fix user parameter JavaScript error

commit 29560815f44076b36bc0313e9a2fbf635c525319
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon May 27 10:06:24 2013 +0200

    Active links fix

commit f32d7f837c439c34042a186a804e1c829154ee35
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon May 27 10:06:24 2013 +0200

    Active links fix

commit 2617de6c920fd5c78b38dd05fb508bf7f064590a
Merge: b133cd3 bfe364c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon May 27 09:34:05 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d17a6f39a1141cf1d8135fbf5ce6ef7ec96bd298
Merge: 25fa3fd 2dc120c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon May 27 09:34:05 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b133cd308c0804a0396d1d67ae498145ecad6d3a
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon May 27 09:33:48 2013 +0200

    Themes Update + Active links fix in top bar by twig extention

commit 25fa3fd45d17a54fb1edc24023b13860fbced1a2
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon May 27 09:33:48 2013 +0200

    Themes Update + Active links fix in top bar by twig extention

commit 2dc120c5161930449afc3e52ae1d3d0ca49ff1c0
Merge: 67a7091 57ea543
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon May 27 09:14:50 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 67a7091904a0a32cc5f2b8f5c0452a4eb2829400
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon May 27 09:12:36 2013 +0200

    Submodule update

commit bfe364cfb75702fc7ada7c80cd7dec36b619c048
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 24 15:42:10 2013 +0200

    Fixing some tests.

commit 57ea543fb6f0de0b48d12a8f2056b80858368841
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 24 15:42:10 2013 +0200

    Fixing some tests.

commit 8dddf3ade6647576b07293f99c83d084d434f85d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 24 15:26:30 2013 +0200

    Resource manager search breadcrumbs fixed (still doesn't follow links).

commit f501737c42d361cd86e06a49760967fdd4dcc744
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 24 15:26:30 2013 +0200

    Resource manager search breadcrumbs fixed (still doesn't follow links).

commit ea14b91d1170ba4bb9faa890e44cec2c4eb734e6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 24 13:16:08 2013 +0200

    Template are stored with an hashname.

commit 6e5cfd4709292e27f00fc209afc627348cf4e10d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 24 13:16:08 2013 +0200

    Template are stored with an hashname.

commit 495d4c44b7493251ac429beb93ee4b065f44e3fc
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 24 11:08:55 2013 +0200

    Creating new right for role outside workspace updates the perissions table.

commit d16716ff11596196ff2a565863ef5b3b5210d3c4
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 24 11:08:55 2013 +0200

    Creating new right for role outside workspace updates the perissions table.

commit 51d22f06ff7ca4499ea79cc25988346ddee07aad
Merge: 0b8ee05 29d8c85
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 24 10:17:43 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 57c958a6be817522e27a482b03712d1cf45f2f16
Merge: c7517a3 170647a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 24 10:17:43 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0b8ee05038295ef4620c51d0a83a80e17665b04f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 24 10:15:51 2013 +0200

    resourceType creation permissions handles recursivity for roles outside the main workspace.

commit c7517a35f5e5dbf83dedb0e2203fc1e346357efb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 24 10:15:51 2013 +0200

    resourceType creation permissions handles recursivity for roles outside the main workspace.

commit 170647af6f31a33164813fe85a6be493f23331f0
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri May 24 10:05:17 2013 +0200

    Git ignore for font-awesome files

commit 29d8c855ef14edac04cafcc3026a405c2d6917f0
Merge: 0c58aa6 ed91a76
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri May 24 10:04:01 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2fd8d1872b081482e5edd2ad53324b3d5efbcac0
Merge: 5ea86c0 c36cccd
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri May 24 10:04:01 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0c58aa633a6c8f4e695bb7f5d780d29b03083e32
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri May 24 10:03:51 2013 +0200

    Files no longer tracked

commit 5ea86c02189c199698b2df91beadb89a59fed1cb
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri May 24 10:03:51 2013 +0200

    Files no longer tracked

commit bc152d9ec57795674a2f0a0eff59c02f16c63657
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri May 24 10:03:32 2013 +0200

    Font Awesome Update

commit 7259f9014d314602ea6658a10425e5975dd582c4
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri May 24 10:03:32 2013 +0200

    Font Awesome Update

commit ed91a769eeaeba462c4d42b03ae16311fd4c8885
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 23 17:46:21 2013 +0200

    Test for the path validation.

commit c36cccdf0638f1965c421d2aac7452de4c706c49
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 23 17:46:21 2013 +0200

    Test for the path validation.

commit 3e277a847d7cc2e511efd213b6cf2e3786bb08a9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 23 17:18:13 2013 +0200

    uncommenting tests

commit 9668b2a5233bafe58ae35b6c77376a8515e92003
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 23 17:18:13 2013 +0200

    uncommenting tests

commit 994d393987cc67428272c6f68dc8ab7bef7682ad
Merge: 2191409 6ba2937
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 23 17:17:21 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f5089b7260f084f017edaa2bab1827341a6fb117
Merge: 693fcb5 bbb856e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 23 17:17:21 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 219140961c003105333c3f99c6916e9c6dcc2d97
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 23 17:14:37 2013 +0200

    Resource can be ordered (backend)

commit 693fcb5f61559854ae8e5aec42050574ae550b99
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 23 17:14:37 2013 +0200

    Resource can be ordered (backend)

commit 6ba293727bd38d4b04ec033e32534e9ea12e7541
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu May 23 16:42:38 2013 +0200

    Fix problem in collapse of the top bar

commit bbb856efe3b1e19c586e57341b96ad13aca1f396
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu May 23 16:42:38 2013 +0200

    Fix problem in collapse of the top bar

commit 8747a64bce6347dcb80324946667d9b713fba73e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu May 23 16:21:13 2013 +0200

    Youtube z-index fix in DataFixtures + HomeExtention Update

commit 3866499cecdd93fa00e85b3813457d3fad577c8c
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu May 23 16:21:13 2013 +0200

    Youtube z-index fix in DataFixtures + HomeExtention Update

commit c6639bd3fe76e8aea97be0d8b317dd5bc68ea31e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu May 23 15:50:18 2013 +0200

    Composer.lock update

commit dab4c9b4ad3fe2194c66d893b9bb3b3a167c7a03
Merge: e8944b4 3b543eb
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu May 23 15:28:57 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a21366659df18c4db94581dbe10f340477f96733
Merge: 7d402fe 40229c1
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu May 23 15:28:57 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e8944b497752b9f7273ee6ef5d58e74a1abd7cae
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu May 23 15:28:18 2013 +0200

    Files no longer used

commit 7d402fe0aef2bb4230350526d51c0ad41e2ac549
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu May 23 15:28:18 2013 +0200

    Files no longer used

commit 5c4a0076ae51ee350e2a90687b9f440a5a3060f8
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu May 23 15:27:46 2013 +0200

    NodeJS no longer used to compile less

commit 815616994d799b424a446402150bfcea8927c2d6
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu May 23 15:27:46 2013 +0200

    NodeJS no longer used to compile less

commit 3b543ebe64d49ca5e142a80912c705a0b54eecfa
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 23 11:27:30 2013 +0200

    Fixed youtube player z index problem

commit 40229c1a0bae45c1351e01354fa34630a2e1b935
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 23 11:27:30 2013 +0200

    Fixed youtube player z index problem

commit 52e307853f3e5f2efd0fb96751e94e901fc04115
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 23 11:02:42 2013 +0200

    Fixed last broken test

commit 33188b2c891dbf946695e31cd0df915a4be51e62
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 23 11:02:42 2013 +0200

    Fixed last broken test

commit 8ec67390c0e5952e4b4d2f519cf230fcd53511de
Merge: 7086593 7adf819
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 23 10:53:44 2013 +0200

    Merge remote-tracking branch 'origin/master'

commit 202b8c922c2350ce18aa35162282f9a282a030ba
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 23 10:53:21 2013 +0200

    Merge

commit 7086593feaae14f22c27b3258a1b962933a7eb63
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 23 10:53:21 2013 +0200

    Merge

commit 02fcd165368e499d48e8cf39c0966f4b14eb21c9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 23 10:49:14 2013 +0200

    Removed double response layout

commit e52c4022b4f8c5bde217f037cfde6a04c5c77ce5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 23 10:49:14 2013 +0200

    Removed double response layout

commit d3004f152dc2a17a430d18528ec1375f66c2b6a5
Merge: 7cf9077 1c2c8e9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 23 10:32:54 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 7adf8197fc1619a9c80cbe08275c1997d609ef79
Merge: 0bf9e89 0e7e3d6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 23 10:32:54 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 7cf90775313a1b0b4a037ccf8026d14d161b1aa1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 23 10:32:05 2013 +0200

    Fixing some tests.

commit 0bf9e897115382357461cdb335b74047d3f23501
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 23 10:32:05 2013 +0200

    Fixing some tests.

commit 770ea2bcb2e4838094e5ce6b350c54a50cb1c8f1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 22 13:55:46 2013 +0200

    Exception thrown on invalid breadcrumbs.

commit 82c17594547cfb63dbdf80ecb9c8ec4c697b49e7
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 22 13:55:46 2013 +0200

    Exception thrown on invalid breadcrumbs.

commit 1c2c8e98f1ada6feb11c51edecef43298c9bfc98
Merge: dd7530b b04a946
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 22 11:11:46 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0e7e3d6a92408c16f231786e2b468868385a9d21
Merge: d0bae01 0388ab5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 22 11:11:46 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit dd7530b62d5b69c79761ae5ce5fcba2af13433f0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 22 11:05:53 2013 +0200

    Added log tool to default template

commit d0bae01d6b32644b8c77de8bc701003de1475be2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 22 11:05:53 2013 +0200

    Added log tool to default template

commit 0388ab5d87d7b6261471dc0131e92361f10cc590
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 22 10:07:45 2013 +0200

    Submodule updates.

commit 26cc40e21087a53892306488e526e0be6bd9dc36
Merge: bc686d0 a08bfab
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 22 10:03:24 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b04a94642faf36ce69151f77adca6c7c243dcdea
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 22 10:01:37 2013 +0200

    Adding RSS  to the demo fixture.

commit bc686d0b9d537209a4031a9daf982ca86ff9e0a3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 22 10:01:37 2013 +0200

    Adding RSS  to the demo fixture.

commit a08bfab440d70ccaf897aa589bd5fd7a1f0be0e9
Merge: 7e7ef77 adc0652
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed May 22 10:00:54 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 7e7ef7788cbfacc480f9b1fd9847d882ab6be76d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed May 22 10:00:45 2013 +0200

    submodule update

commit 3350ebc4fa33c0436e70bb8276dd310ac4059e1f
Merge: 2c56c71 0ee526b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 22 09:40:15 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit adc0652744929e5e73ea8cdb41642b6a5b906a66
Merge: 355f044 f7fa7c0
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 22 09:40:15 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2c56c71b4a8db7b2f1b75b7efcd852c814dc6e7e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 22 09:37:13 2013 +0200

    Fixing error on workspace delete.

commit 355f04473d3ab5489828eb1ad77e717e84242045
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 22 09:37:13 2013 +0200

    Fixing error on workspace delete.

commit 0ee526b397e713bae3e0a1e68b3f27b5716ecf99
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed May 22 09:20:01 2013 +0200

    fixed activeLink bug

commit f7fa7c0fb0acf0ba7de5b0904697798fb1d67e5f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed May 22 09:20:01 2013 +0200

    fixed activeLink bug

commit 361fc2a9447992532fb6e65d33c15f9324b4ee13
Merge: 07e6d7f 30de0e8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 21 17:33:38 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f8fd0fac0213c0e8efa117b0708d909df0af1530
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 21 17:32:17 2013 +0200

    Fixing both tests errors.

commit 07e6d7f68fc381da93fa7172d0b215fc8b586c07
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 21 17:32:17 2013 +0200

    Fixing both tests errors.

commit 30de0e8a35f6bca01c23a99a132dbbf91a197a6c
Merge: 04fb41c cb74b5d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue May 21 16:44:25 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 04fb41c2162e4985d38b2d1d2e5f1cf407f8d782
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue May 21 16:44:15 2013 +0200

    submodule update

commit e9107d2f358c5f56e8a88ba60118c66639d60a9b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 21 16:27:50 2013 +0200

    Removed access to unauthorised workspaces from the workspace list

commit cb74b5dd0ea314583f588f7aa463fe8dbefb680f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 21 16:27:50 2013 +0200

    Removed access to unauthorised workspaces from the workspace list

commit ba341f74c78fcaeb6787fcf15b212282a7bbe075
Merge: a90a9d7 f7ef3b2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 21 16:17:00 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b04425867dd73a3ca84b43fd50f9d7351f74c1d2
Merge: 29ddaea 7ef5d9f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 21 16:17:00 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a90a9d760726786a7f6ec6151c4fa190cd2910c0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 21 16:15:55 2013 +0200

    Refactored template generation + test fix

commit 29ddaea4056fdfb1a40c99cdf0a11d7402837432
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 21 16:15:55 2013 +0200

    Refactored template generation + test fix

commit f7ef3b21cfe24891372b76af654fbfdafbadfb76
Merge: d4fc56d c1f6b18
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 21 16:04:20 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 7ef5d9f61409bad2f7c6a5eae13807d9afb84b84
Merge: e09ab0a 8d43b57
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 21 16:04:20 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d4fc56d40b9542bcda0160acfa7aacbd3210e619
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 21 16:03:07 2013 +0200

    Breadcrumbs passed in the url for resources (draft).

commit e09ab0aac3a9119104bb974c5adc5c4e8a4c693f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 21 16:03:07 2013 +0200

    Breadcrumbs passed in the url for resources (draft).

commit c1f6b18f22741030d58ff769f4d4a7159ff6d6fd
Merge: 3520b6b 180a8b5
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue May 21 14:56:05 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 8d43b57d58303e12c0a398c38e42fcf0df804c3e
Merge: c2fbd72 ce48b62
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue May 21 14:56:05 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 3520b6b6752439b7535d927f856fe01004203766
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue May 21 14:55:51 2013 +0200

    Gui update for widgets in desktop

commit c2fbd725848d1776f827d0d48cb8df80552525ad
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue May 21 14:55:51 2013 +0200

    Gui update for widgets in desktop

commit ce48b62da752d6ce6d040e910b48cb10a080dbbd
Merge: d5b1478 41399bc
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue May 21 13:53:35 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 180a8b5c14669b120af51a1b297307da1e7176f4
Merge: 2dbc756 1abc820
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue May 21 13:53:35 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d5b14781d01861de16c851faaa530879eadc176c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue May 21 13:53:28 2013 +0200

    submodule update

commit 1abc820058193a469fcaa6ee2942cee9e58f3dbd
Merge: 8ac37ec b11d9aa
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue May 21 13:44:58 2013 +0200

    Manual merge

commit 41399bca1aa0a15250bd2efdf7a1322d3e617fa7
Merge: ea3de42 34b5de5
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue May 21 13:44:58 2013 +0200

    Manual merge

commit 8ac37ec6ac7b62d2b778245604caea94dac8b026
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue May 21 13:37:40 2013 +0200

    Files no longer used

commit ea3de428a6534d8996a4c4031b0933b50db03c4f
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue May 21 13:37:40 2013 +0200

    Files no longer used

commit b1ddc681141b2d376d71a4ae02677f651c349c2e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue May 21 13:36:47 2013 +0200

    New entities and repositories for HomeController + Reduce complexity

commit dcf7e122baa76711c0a037b70e646eeb0f769b79
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Tue May 21 13:36:47 2013 +0200

    New entities and repositories for HomeController + Reduce complexity

commit 34b5de530c101ec08576cc18ec8098182cd7f14f
Merge: 864bbe2 2b63a9d
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue May 21 11:22:29 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b11d9aa1257dc649ba2d29107cd6a1f6481f905a
Merge: 91853a4 0eb7dc8
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue May 21 11:22:29 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 864bbe2ff1bedee9e7ea60d02bc81003357f7b39
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue May 21 11:22:06 2013 +0200

    Add test's log repository method, add zoom to log's chart

commit 91853a4602c647bb9b8cf08d8f12a093c381076c
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue May 21 11:22:06 2013 +0200

    Add test's log repository method, add zoom to log's chart

commit 2dbc75616f16a45040e42b8c9d098541e345dace
Merge: d1a6c32 0eb7dc8
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue May 21 11:18:26 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 14c5590a4d25dd7c29127843fcf6cb5200b1c3b9
Merge: 98ccf8b 2b63a9d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue May 21 11:18:26 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d1a6c324bb1f9d88ddf413704d428778d33efa32
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue May 21 11:16:43 2013 +0200

    Allowed creation of several resources at a time

commit 98ccf8b83ec3aff069e216fea3ad5b95487e16f0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue May 21 11:16:43 2013 +0200

    Allowed creation of several resources at a time

commit dd025e147a3ea8ac1633c7947501948532c1a59a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue May 21 11:14:56 2013 +0200

    submodule update

commit 0eb7dc8531c5d6b5a934a576be1fe2938af77045
Merge: e1829fa 2715b4e
Author: easy-es <esdras005@hotmail.com>
Date:   Tue May 21 10:32:09 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2b63a9d28a96b10100501460acaa3055d1fe946e
Merge: c168922 48bf593
Author: easy-es <esdras005@hotmail.com>
Date:   Tue May 21 10:32:09 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c1689226016f92be5fa36f821d2e4430d0b1ea63
Author: easy-es <esdras005@hotmail.com>
Date:   Tue May 21 10:16:31 2013 +0200

    Submodule update

commit 48bf5930e82bcaebcb5089f9144f97dede9dca7d
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue May 21 10:06:19 2013 +0200

    Debug rename interface

commit 2715b4efea709982591a784608439d1a650293ee
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue May 21 10:06:19 2013 +0200

    Debug rename interface

commit ae9e3fdf29371281466c47533f5345d9a7a6700d
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue May 21 10:05:03 2013 +0200

    Debug rename interface

commit 6223d03c10d4a8312892501fa20c20f6cbadde5a
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue May 21 10:05:03 2013 +0200

    Debug rename interface

commit e1829fa06763dfde28ead45b22c69f52173cc58c
Merge: 3e01862 14a8ef9
Author: easy-es <esdras005@hotmail.com>
Date:   Tue May 21 09:33:32 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	app/config/config.yml

commit 6a7e4e63cf664b2b963ee2839410b6af70ead373
Merge: 4483fc4 2473460
Author: easy-es <esdras005@hotmail.com>
Date:   Tue May 21 09:33:32 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	app/config/config.yml

commit 29ca87749ec53b61788b68017d3e6a8efe926825
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 21 09:30:09 2013 +0200

    Fixed interface file name

commit d4dd3d536f454a2c11b1530038ec6842aa04f88a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 21 09:30:09 2013 +0200

    Fixed interface file name

commit 3e018626bf74abe8f77c39d006e665f35a685c46
Author: easy-es <esdras005@hotmail.com>
Date:   Tue May 21 09:20:05 2013 +0200

    tinymce + calendar filter

commit 4483fc4797ff1c3c0b73970539317f0fcaaf8b5d
Author: easy-es <esdras005@hotmail.com>
Date:   Tue May 21 09:20:05 2013 +0200

    tinymce + calendar filter

commit 247346087238512326e5472de50ef86512f375bf
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri May 17 17:43:26 2013 +0200

    Correct syntax

commit 14a8ef989d842b90140d2f33736fa11a33525b2d
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri May 17 17:43:26 2013 +0200

    Correct syntax

commit 7bd5cf16385f3e3ae28b1a00ded80a77401d9a54
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri May 17 15:20:55 2013 +0200

    The logs display no longer uses DQL function SUBSTRING.

commit 7468fd7aca9f2c52b057f29d3a329f617ff70287
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri May 17 15:20:55 2013 +0200

    The logs display no longer uses DQL function SUBSTRING.

commit 8423b4ccacd8b050684d39c2b54c290cb5826176
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu May 16 17:45:24 2013 +0200

    Add possible values for chosenRangeKeys parameter

commit 75281ace59179f23e86c447240b2db009f247587
Merge: 6dd2133 8e46844
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu May 16 17:40:55 2013 +0200

    Merge Testing log with master

commit d63c35b3abd4ac8413c600082e53ba49ef26263f
Merge: 6ed74a8 3912583
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu May 16 17:40:55 2013 +0200

    Merge Testing log with master

commit 6dd2133c889dcc35140a02319d98af408811b06f
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu May 16 17:35:31 2013 +0200

    Testing logs

commit 6ed74a8cac16159e035f2ac4e381215780659b9d
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu May 16 17:35:31 2013 +0200

    Testing logs

commit 8e4684417995a580fa8dd040840e078d088a9be9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 16 14:46:56 2013 +0200

    Fixing broken test.

commit 391258383bbccac6fa4e4e6fe4a71987621a1466
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 16 14:46:56 2013 +0200

    Fixing broken test.

commit 59aca3bfd53f75347b1c9970b4fb8ddb84749406
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 16 14:22:47 2013 +0200

    The javascript resource manager display the correct path when following links.

commit 08d20e5c3b5bc94ae1d8adbc800ab06ddbba3f7e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 16 14:22:47 2013 +0200

    The javascript resource manager display the correct path when following links.

commit 4154188e416fe33673e8644db2e5c50f64425c11
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 16 10:18:07 2013 +0200

    Recursive resource rights edition.

commit f7511cf1ee512085c629fc2174295483d415f806
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 16 10:18:07 2013 +0200

    Recursive resource rights edition.

commit 04d255bea0a5bfc2a804b9a0e5c27349ca9daef3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 16 09:47:37 2013 +0200

    Removing owner rights from resource.

commit 9b04473bcbf4773c17f986c094b2dd4df51f3524
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 16 09:47:37 2013 +0200

    Removing owner rights from resource.

commit c97b32060546db0f167020f605e6c96a4595be2e
Merge: a636f01 5c6b193
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 15 17:13:29 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit ed1de816a7f75b6b90c457caa7c31d4e59c5dcd9
Merge: cf30b74 38726bf
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 15 17:13:29 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a636f014dc88e2787155afb1ca032a33cd66bea2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 15 17:12:26 2013 +0200

    Recursive option for rights creation.

commit cf30b7460ea8b462f0bd3a70f84ad19981b452de
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 15 17:12:26 2013 +0200

    Recursive option for rights creation.

commit 7a1546d02b2c2cbfb0f88592226cd4a438471d99
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed May 15 16:42:57 2013 +0200

    Enhance tests withs logs verifications

commit 4000307bad9757c3dccbba696fa644ed4642add3
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed May 15 16:42:57 2013 +0200

    Enhance tests withs logs verifications

commit d027b9e586464f76685363b2ed3b629066c7156b
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed May 15 16:37:17 2013 +0200

    Debug log filter

commit b5c9b0720d94b87e5df982668eaf8ed8404088f0
Author: Vaince <vincent.saisset@gmail.com>
Date:   Wed May 15 16:37:17 2013 +0200

    Debug log filter

commit 38726bf44d7f56f424c09036f0073edf2507a79d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 15 15:33:18 2013 +0200

    Fixed wrong directory name

commit 5c6b193f5d44f647022bf1e6406176e711c40607
Merge: 39a68ee 1c2218e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 15 14:48:56 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 9ebca4b0338e6b1127414df986cb9a1aba6225e5
Merge: f70d7ed 97548c1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 15 14:48:56 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 39a68eeb6ae2e6686b019f5864e862da750d7c29
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 15 14:09:29 2013 +0200

    Reorganized startup.js

commit f70d7ede54969d95eae3d8684d63ff195dfbccb0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 15 14:09:29 2013 +0200

    Reorganized startup.js

commit 1c2218e04c8faab6b48ecfb7896cfd746caaa8b2
Merge: 4f4d396 8b6d60d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 15 13:26:24 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 97548c1a126e2b4137915a3709cc9bc3f43f519a
Merge: 5f8e247 e049781
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 15 13:26:24 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 4f4d3960a5048ab5fbaa4bbaf45c612bef9d7dda
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 15 13:25:50 2013 +0200

    Fixing some code style errors.

commit 5f8e247fbce9f66247b740a0f5a2c3936ae963a3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 15 13:25:50 2013 +0200

    Fixing some code style errors.

commit 8b6d60db42c02af91dc3da56d8633c65878ece7a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 15 11:56:03 2013 +0200

    Moved js dependencies to frontend bundle

commit e04978116e2dde49b6d9476afe0fc44d26c2faa2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 15 11:56:03 2013 +0200

    Moved js dependencies to frontend bundle

commit cff553d15840e3b416e9be00f52faeb1a90c5370
Merge: 27c93d1 b7592f0
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 15 10:31:30 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 24ff7bfcec2d9c1ea1d53c19406578a1c1e00ecc
Merge: c1dfd5f 05eed21
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 15 10:31:30 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 27c93d1bec3f3dc465fcee025f5ab6615d56859a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 15 10:30:58 2013 +0200

    Resources will display their breadcrumb once open.

commit c1dfd5f8a42af5699e218527535f4c0c25cd8fda
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 15 10:30:58 2013 +0200

    Resources will display their breadcrumb once open.

commit b7592f009b54c2e4c25414e5bf11bae89ca105c6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 15 09:42:39 2013 +0200

    Fixed broken tests

commit 05eed21243822d0f6069d9b259ab4f326b2fc833
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed May 15 09:42:39 2013 +0200

    Fixed broken tests

commit 73b416c1bd6ebccbae819317fc62d0b4abc4c9ec
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 14 17:37:39 2013 +0200

    Fixed broken test

commit 0ef5f0c0da9f22e5e28ad89f2d256e6e8e4e5cb9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 14 17:37:39 2013 +0200

    Fixed broken test

commit 80d0339e88eefbd7a0e4abd3c7580c182836fa75
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 14 17:10:56 2013 +0200

    Submodule update.

commit 4d4a0dff97c00ec822114378b8391225feba1d22
Merge: e65c11b 148eb51
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 14 17:09:29 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f6b1d6b5d2725df66c924154f859f3fa841de441
Merge: 94053b3 92f4a4e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 14 17:09:29 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e65c11b51cf0ee60e45b6470f384f542d6ffd2f6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 14 17:07:47 2013 +0200

    Renaming roleType property and iconType property.

commit 94053b3bf162e1f372e0f707c8a60c5fd3809675
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 14 17:07:47 2013 +0200

    Renaming roleType property and iconType property.

commit 148eb5138401839a0390374b75bc15edd5dd2378
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 14 16:28:56 2013 +0200

    Added todo

commit 92f4a4eb8490a21fdb65e60b1eaac906550b1953
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 14 16:28:56 2013 +0200

    Added todo

commit d8049fb40180522c24a95632a89c46e30c3e632c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 14 16:28:37 2013 +0200

    Added lock on exporter bundle

commit a5708631ec8999bd2e45780c7e1b41c77b27b9c7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 14 16:28:12 2013 +0200

    Added tinymce bundle configuration

commit 1ccc10bbcee8410d98c5228da30ca593aa7a5294
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 14 16:09:58 2013 +0200

    Renaming resources dates.

commit 6ca9971d5a5c1e939ad5436b074a7db866ac3c0a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 14 16:09:58 2013 +0200

    Renaming resources dates.

commit d59483b0ed34cbeac9f440f31b00d87a415d6dc8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 14 16:07:26 2013 +0200

    Renaming activity dates.

commit 921637a77f58c6aa6fde5974c5b7bbb9476fbc59
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 14 16:07:26 2013 +0200

    Renaming activity dates.

commit 14612b832e403a3c78db183ab10885a81dd63398
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 14 16:05:05 2013 +0200

    Renaming roleType into type.

commit d2ae63287c387427a359aedaf30e30477840eb64
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 14 16:05:05 2013 +0200

    Renaming roleType into type.

commit 88d394737a51133b3fa435a8f56f35115671091a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 14 15:27:07 2013 +0200

    Updating the recursivity for ResourceRightController editRightAction.

commit 0d8523c0fba6a214db4b09bb4aedd344341daea9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 14 15:27:07 2013 +0200

    Updating the recursivity for ResourceRightController editRightAction.

commit 208852b7eb95e82cd879410dd1695ae4c965a01b
Merge: fb1a39a 796397b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 14 14:00:46 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 18e0c831fea6b68f554ccb2814c0643c432ca5f1
Merge: 7c84f2e cb12590
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 14 14:00:46 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 7c84f2eb4932c36f1e33a0b5499b00943fe8d3d3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 14 14:00:21 2013 +0200

    Submodule update

commit fb1a39ae8e239f4ff50fb8245e6a3ca69e4712a1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 14 12:04:03 2013 +0200

    Fixed css alignment/size bugs

commit 16f4f47ade27285a7c610708042b160e0ca59417
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 14 12:04:03 2013 +0200

    Fixed css alignment/size bugs

commit cb4e95a578a9a6b72db015293ed550b45d18f4ff
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 14 11:29:39 2013 +0200

    Used global ajax events for wait msg management

commit b73b9489fde832f890f71df08351b327ac39ad8a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 14 11:29:39 2013 +0200

    Used global ajax events for wait msg management

commit 407fd4e4d823a63af0347e4506d3049d112525f4
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 14 10:00:20 2013 +0200

    User outside of a workspace can have a rights on a resource.

commit 6d49a7578b846e53700db048f61e2d03e3716305
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 14 10:00:20 2013 +0200

    User outside of a workspace can have a rights on a resource.

commit 796397b81fb409413667cbe2b74a092396e3432b
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon May 13 17:48:16 2013 +0200

    Debug two_level_select uses in AdminLogFilterType and WorkspaceLogFilterType

commit cb125909508eccbd4e1583ed745e03cc4fa18cfe
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon May 13 17:48:16 2013 +0200

    Debug two_level_select uses in AdminLogFilterType and WorkspaceLogFilterType

commit 6b1e338330da5bee140698be802a11b61503f8a7
Merge: 5fe9b84 e728cb9
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon May 13 16:28:51 2013 +0200

    Merge from master

commit ee623cf07aaa833ad7256a4ed9fabfd218a76642
Merge: 1304318 7765c47
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon May 13 16:28:51 2013 +0200

    Merge from master

commit e728cb9939cd80947d494b074a81b4dc81c782eb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 13 12:59:33 2013 +0200

    Updated uml diagram

commit 7765c47920621db402738a86742b061f20c05a71
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 13 12:59:33 2013 +0200

    Updated uml diagram

commit 7d08003c01660723c1e11ae4992b6febc719fc46
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 10 11:36:40 2013 +0200

    AjaxSetup is back in manager.js (some bugs appeared when it was removed).

commit d181f97600ae08082447152153dbb24acaa60c93
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 10 11:36:40 2013 +0200

    AjaxSetup is back in manager.js (some bugs appeared when it was removed).

commit 0e2f52310daa6501e50c1f38d38f285796374ea2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 10 11:14:09 2013 +0200

    Removing workspace from ResourceRight.

commit fe06fd1ca97b558606ff2ca7ac955b9e1d47ff7d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 10 11:14:09 2013 +0200

    Removing workspace from ResourceRight.

commit 2244ff664607e3a0721a3c8d03bf6e24a213e3d6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 8 16:23:41 2013 +0200

    Updating ForumBundle.

commit e1c7033b28d3cce63a375f7cefe6e2b1877973bf
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 8 15:36:35 2013 +0200

    Only display the current workspace roles in user/group tools.

commit d6fb23572e72acc2f54829ad48f9ba55f1cde655
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 8 15:36:35 2013 +0200

    Only display the current workspace roles in user/group tools.

commit 4de9f0ad6e07cc0623acbc0678451f23de29c882
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 8 13:15:07 2013 +0200

    Removing redirectResponse from user & groups tools.

commit d7395deac87e6b7b392a34a182548ff534e9cbb7
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 8 13:15:07 2013 +0200

    Removing redirectResponse from user & groups tools.

commit 32e57176a221c62c67fa290c20de779564877f27
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 8 11:28:28 2013 +0200

    Pagerfanta for forumbundle.

commit b25074a91e9d97b4afb86f9e1386f73ee37116d3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 8 10:27:23 2013 +0200

    Removing useless tests.

commit e1744cd4b9806ebaa5ac76799acedc492af7cb53
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 8 10:27:23 2013 +0200

    Removing useless tests.

commit 818eb8ebdcc6e9132dd87fee7c531c023d8e0436
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 8 10:23:41 2013 +0200

    Fixing jquery ajax context.

commit 91d09908ed67231f39bfb673b547ccf89e483324
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 8 10:23:41 2013 +0200

    Fixing jquery ajax context.

commit b868071fdf50641f496e17352a89e8f2ff1ebf3e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 8 09:26:25 2013 +0200

    Fixing tests

commit b50e37b5f0d4ccf382682955179234855002b932
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 8 09:26:25 2013 +0200

    Fixing tests

commit 7f80bc380d8b7dc417910c2b5891f618b540360d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 7 17:18:57 2013 +0200

    Fixing a wrong url in log.

commit 5daa11bf960a9c7592c71a40aab77a5bbbe9ca4e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 7 17:18:57 2013 +0200

    Fixing a wrong url in log.

commit 14c208610781115360bcc0fdccd422c6ff789436
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 7 17:12:49 2013 +0200

    Pangerfanta for user and groups tools.

commit dd56d1c276c4ba553dafbea26c999605f8ceb7a1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 7 17:12:49 2013 +0200

    Pangerfanta for user and groups tools.

commit 1034b3b57082ec7de3010e2732dec76c72caa7d0
Merge: 6bcfdb0 1d8f6fb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 7 12:00:52 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/plugin/UJM/ExoBundle

commit 3a57953575fca5ac00866f0a32df8908e2f7dc46
Merge: 26ceafc c6844c8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 7 12:00:52 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/plugin/UJM/ExoBundle

commit 6bcfdb054e06243fc983d4978c79f89a0606e615
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 7 11:55:29 2013 +0200

    Pagerfanta for the messagery.

commit 26ceafc294b6e4a316ff15cf6ccbfbb57ba1afb3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 7 11:55:29 2013 +0200

    Pagerfanta for the messagery.

commit c6844c81e13cc95b0291a705af0625cfdd931821
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 7 11:45:08 2013 +0200

    Submodule update

commit 1d8f6fbb3a3034f0851019ab102bf8c86f5acb53
Merge: 7b1d8ee 5cd3337
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 7 11:43:02 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d498e166a5fd1427c44fefed1dc618ea40590fc0
Merge: 16c6a23 abbbe44
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 7 11:43:02 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 7b1d8ee9040894d5b9bf8ddf81f1de01cadc9f8b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 7 11:42:49 2013 +0200

    Fixed demo fixture bug

commit 16c6a23c8e59c6e01025a2665bf5475096aeacd9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue May 7 11:42:49 2013 +0200

    Fixed demo fixture bug

commit 5cd333769d9a256400829efcfad6465fa18e08d7
Merge: 15f69cb bd516b7
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 7 10:14:57 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit abbbe4457ff9eb63f5d7b2260f3d2ce5974c78db
Merge: 69eed99 513ba98
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 7 10:14:57 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 15f69cbf6b60c7e4cd3c97e030979bdd07fc8ad8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 7 10:14:12 2013 +0200

    Using pagerfanta for administration.

commit 69eed99f7587d891447f4689161a82c593f8812e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 7 10:14:12 2013 +0200

    Using pagerfanta for administration.

commit 513ba988f7c3e0ab4207c77903fd4883b0bf5272
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 6 16:29:45 2013 +0200

    Submodule update

commit 5fe9b844ead51ef6cbaecadc8c2adc26a622ccb2
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu May 2 17:19:48 2013 +0200

    Merge with master

commit 1304318a140568b4f66c95b5b29f727eb3ba56af
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu May 2 17:19:48 2013 +0200

    Merge with master

commit ae7ca6e0d3e2d895e0d2885ee0dad4b359800892
Merge: 022240c bd516b7
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu May 2 17:18:02 2013 +0200

    Merge with master

commit 960d0dd969dc65a2f20076c1bb017a9907c9ea98
Merge: ea28f1a 017f51d
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu May 2 17:18:02 2013 +0200

    Merge with master

commit 022240c9201685394f284f4d72216f63669929cf
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu May 2 16:35:20 2013 +0200

    Logs : add tool in desktop, workspace and administration; add Widget on desktop and workspace

commit ea28f1a5ecf650ba3c2bd6061f8957e4fd8b44e1
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu May 2 16:35:20 2013 +0200

    Logs : add tool in desktop, workspace and administration; add Widget on desktop and workspace

commit bd516b75fa9178fc80b4bb523d5e5da931e372fb
Merge: 87022c9 928ca69
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu May 2 11:45:27 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 017f51d77130a3ae5ff4a3cbb4f3537ceb5936b8
Merge: 4900285 1ed15e1
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu May 2 11:45:27 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 87022c9f39fd934c6a4c9ec35e59ca630e33218e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu May 2 11:45:15 2013 +0200

    Fix CSS problemes in 768px mode (for phones)

commit 4900285bb04a028ba5f15bf821aebcaf1b9c8017
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu May 2 11:45:15 2013 +0200

    Fix CSS problemes in 768px mode (for phones)

commit 928ca6968f42a94fb926d408d91be2ac02d4f42b
Merge: f95f03c b50ffc8
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Apr 30 14:59:43 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1ed15e128233efe3bd10661868ddff77047b6674
Merge: fb37703 2dab3f9
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Apr 30 14:59:43 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f95f03c1518e2134a3b1d67a437d312f2705fb06
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Apr 30 14:59:24 2013 +0200

    display hours in agenda + tinymce4.0

commit fb37703c54f3b43913718805011380d39ba92725
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Apr 30 14:59:24 2013 +0200

    display hours in agenda + tinymce4.0

commit b50ffc8d5e5b43cfab7c20d86e8a911b75a2ee1c
Merge: 55b89c4 d3e5a8a
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Apr 29 14:52:12 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2dab3f999a2285c12e3250663f27f669aad202bf
Merge: 8b9f979 dcc0dca
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Apr 29 14:52:12 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 55b89c49d8271e1addb0d906fc07a6b86a8ec6a5
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Apr 29 14:51:40 2013 +0200

    Fix an ajax bug in prod

commit 8b9f97926a1af8e18c6ea5ec037e33b630de81fd
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Apr 29 14:51:40 2013 +0200

    Fix an ajax bug in prod

commit d3e5a8aa4174f4f5da69e87dce1f8edb32401749
Merge: 350c564 a9f6c33
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 29 14:15:46 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit dcc0dca7965866cf80264e679a8117bedb994987
Merge: fae7942 932b6ae
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 29 14:15:46 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 350c564c4255bd83d5c009d08d4fef3966948c37
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 29 14:15:30 2013 +0200

    Made last test compatible with postgres

commit fae79423df119bb0d292b8bbbe13c9a5659479e4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 29 14:15:30 2013 +0200

    Made last test compatible with postgres

commit a9f6c33df3156dd31e2704353db10bd3fba516d3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 29 11:42:52 2013 +0200

    Submodules updates.

commit 932b6ae2e3bbeb4de610a2b4842cf7954b5a9e25
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 29 11:42:52 2013 +0200

    Submodules updates.

commit 339a995e0eedf564d17722747a3d611a9f5dfa55
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 29 10:50:28 2013 +0200

    Removed php 5.4 syntax

commit 05d9d82bf323ae64494087c2686fde63f0cf8702
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 29 10:50:28 2013 +0200

    Removed php 5.4 syntax

commit daa4feb7a5b150233c711ee0c04e460ab0ae115d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 29 10:19:15 2013 +0200

    Added scorm bundle as submodule

commit 79863064d661fc44d78490ee691d21f97bc94c8c
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Apr 25 16:54:27 2013 +0200

    Reduce complexity

commit 2806fcb8a1337ecf3eaae6fbfbab874976a3b1d8
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Apr 25 16:54:27 2013 +0200

    Reduce complexity

commit 797f2d6a2e08df051aa0505d33d391b4d16273fc
Merge: 04553f3 6bfa971
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Apr 25 10:56:15 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1fd1dbbe7c520eb170389c2deec491b39f7b940e
Merge: f7dfc23 5fceb07
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Apr 25 10:56:15 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 04553f31c158479b83900980e87b65bcc5e6b20c
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Apr 25 10:55:55 2013 +0200

    Correct a bug when resize content

commit f7dfc23a4efb8a5ddd6d3d6b556506713545dde6
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Apr 25 10:55:55 2013 +0200

    Correct a bug when resize content

commit 6bfa9710911691c0f6c8b742ec3e4514d0d5f850
Merge: d874f8c 41829ca
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 24 13:21:11 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 5fceb07524b5b16d431d6d7564b0c5b12a5b35b0
Merge: affb285 be49265
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 24 13:21:11 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit affb2854510d37af6768ed7f7dc5a6a4d2e8d1e6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 24 13:20:52 2013 +0200

    Submodule update

commit d874f8c8aeedb66f26820f1f3aa52ce57f3b6056
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 24 13:20:37 2013 +0200

    Fixed broken test

commit cef380fa7452157402086dfec9cfcb7e4ce10244
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 24 13:20:37 2013 +0200

    Fixed broken test

commit 41829ca5651c21e9ea2fc1f3aac7c5971a05bc99
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Apr 24 11:53:33 2013 +0200

    Fixed missing comma in LogResourceShortcutEvent constructor

commit be49265ed60e781381c5d5c69a1485d5216efcca
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Apr 24 11:53:33 2013 +0200

    Fixed missing comma in LogResourceShortcutEvent constructor

commit 2b7cfb7ba125dde193b928f8a1f9165d021657b0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Apr 24 11:28:26 2013 +0200

    Fixed bug of empty workspaces list for anonymous

commit 13ece6c664452b04d6c08b0411d66e74e0432f6f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Apr 24 11:28:26 2013 +0200

    Fixed bug of empty workspaces list for anonymous

commit 039213e4c9089064922b896b4121e24039c73199
Merge: c7409ca d8312fb
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Apr 24 11:26:57 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 8eba698b981ac20782f56fbe539eb7535c0d9583
Merge: 2ca0406 c015762
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Apr 24 11:26:57 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d8312fb8041ad9f8771ef1b84a383da1614d3485
Merge: 50030ee 6430426
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Apr 24 11:09:35 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c015762f7491356d55d240d5806a7e56131866ce
Merge: f78e408 f73fcb0
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Apr 24 11:09:35 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 50030eecbe3d0eb5d4e824227269ce5a52d6f1ac
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Apr 24 11:09:19 2013 +0200

    CyclomaticComplexity

commit f78e4082ceeab7290f1dd5b1f247d7fbe46aee8e
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Apr 24 11:09:19 2013 +0200

    CyclomaticComplexity

commit 2ca04062bc7549fbf352c7425047deb1df331c05
Merge: 0b8f533 f73fcb0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Apr 24 10:59:58 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c7409cafef3748d8c3dfb56218ba19932faba4f6
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Apr 24 10:59:38 2013 +0200

    Organized workspaces list by tag for anonymous

commit 0b8f53338e996832ae9ddb75f60da0cac17d7737
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Apr 24 10:59:38 2013 +0200

    Organized workspaces list by tag for anonymous

commit f73fcb033b0c7ecd6fc4038cc45c1698851ff489
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 24 09:06:30 2013 +0200

    Submodule update

commit 64304260dcde0c0cb38140273310b84007a988d2
Merge: 4bb2185 a067002
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 23 15:35:42 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit dbb25593bec0f5c6ecf60fbd05aadef9d411b2f0
Merge: 7c145f0 83efca2
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 23 15:35:42 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 4bb2185ef4654a67b0139add0382fbaef39f4a90
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 23 15:35:27 2013 +0200

    Reduced nb of sql queries for WS admin tags

commit 7c145f0afdb7feb502a4debe3f85224eb8c5fe0f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 23 15:35:27 2013 +0200

    Reduced nb of sql queries for WS admin tags

commit 755026db956972dee5e1095e8b49c8c905f7d5dc
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 23 15:03:38 2013 +0200

    Reduced nb of sql queries for WS tag

commit 254916be6a621dd8b374b2a9ae67c0ed056ef15a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 23 15:03:38 2013 +0200

    Reduced nb of sql queries for WS tag

commit a067002f4ef992cad882ad1072efb02b600f7ae7
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 23 13:37:04 2013 +0200

    Fixing the remaining broken tests.

commit 83efca2f36485d4d41c31c8b118c51777a4faddd
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 23 13:37:04 2013 +0200

    Fixing the remaining broken tests.

commit 8bad1906a25aeeda03096e157df3a0da66f418b3
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 23 13:34:17 2013 +0200

    Moved method from LogRepository to WorkspaceRepository

commit 65bf8c9e6945d5dcc2b5f0b0036831306beb03dc
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 23 13:34:17 2013 +0200

    Moved method from LogRepository to WorkspaceRepository

commit 41d143c3c17943911f8096860274bdd76e995551
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 23 13:11:53 2013 +0200

    Fixing 2 tests.

commit b7a494fb4eaf3b596251a993d80e0894b4223cbd
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 23 13:11:53 2013 +0200

    Fixing 2 tests.

commit d39514c40fb86313321ecd4b40690b5c85fbc514
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 23 12:03:41 2013 +0200

    Fixing the recursive resource rights edition.

commit ac33334e3947a365f63332fc0a2f742f67b67713
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 23 12:03:41 2013 +0200

    Fixing the recursive resource rights edition.

commit be7405d23186e9226de52ed7c4bbd1a83e4b68a9
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 23 11:49:40 2013 +0200

    Fetch last logs depending on roles

commit 5e7e924d19d273ae227197cea3ce8171abc332a9
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 23 11:49:40 2013 +0200

    Fetch last logs depending on roles

commit 0221b924e1ea94fe466013feb9d1efda2353e740
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 23 10:22:59 2013 +0200

    Deleted WorkspaceLog from DB

commit 8af8d6799aaba3263dff3d04df816493c88e2942
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 23 10:22:59 2013 +0200

    Deleted WorkspaceLog from DB

commit 9e7d5e94661af36d4f09fb5af69d88b09e824a7f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 23 10:19:53 2013 +0200

    Merged/Deleted WorkspaceLog files

commit a4540c192250b58c20e1c59fa2543450230956f1
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 23 10:19:53 2013 +0200

    Merged/Deleted WorkspaceLog files

commit b5af83ed57da5a86518f2801172c097fd88b6b81
Merge: 773d761 66f8957
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 23 09:01:44 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6cd3e6b60a1aa518655ad46f083de67ee09237ee
Merge: 110701b 1148f7d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 23 09:01:44 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 773d761435a50c6ea0dae32349bb6678e0d65076
Merge: 8a1bf09 b49a907
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 23 09:01:21 2013 +0200

    Merged ICAP tracking branch

commit 110701be7aabb9e15164e5ea86fa4c5ed5df203e
Merge: 09e73d9 6a4425a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 23 09:01:21 2013 +0200

    Merged ICAP tracking branch

commit 66f895764f5880a5e6a98d5bc20c35262e0096bd
Merge: 068b87b 8a1bf09
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 17:23:56 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1148f7d2f9a93303f22e5efbb1b200792387f26b
Merge: 6838a3f 09e73d9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 17:23:56 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 068b87b9229bcfa43065df09854450dce3a37826
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 17:23:08 2013 +0200

    Workspace role usurpation redirect to the main workspace page.

commit 6838a3f6fc605ea59fb323f981f56cc117ed6c48
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 17:23:08 2013 +0200

    Workspace role usurpation redirect to the main workspace page.

commit 8a1bf09f680ad0859fd90cd340f6a9b1cedd8cf1
Merge: 989b433 17cdd27
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Apr 22 16:12:37 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 09e73d982fbc998d8416890add5bf1cbc286e233
Merge: 2e19ff8 a068e91
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Apr 22 16:12:37 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 17cdd274e4aa67e1547e4b72360b61d395aa0582
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 22 16:11:59 2013 +0200

    Added missing translations

commit a068e91dc5f2f267c4caeb7056eb27bb1b55b381
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 22 16:11:59 2013 +0200

    Added missing translations

commit 989b433cd4a07e02895d6ca164de4dd039f41749
Merge: 24958b8 865f3c5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Apr 22 16:11:41 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2e19ff8df76299cc882a4e9ac3cb37f8cd745946
Merge: 721b2de cb60bbe
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Apr 22 16:11:41 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 24958b8a7ef3c4c2212a6305839a7d79cf8f5c84
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Apr 22 16:08:38 2013 +0200

    Used roles instead of user in many dql requests

commit 721b2de625672c7c57618136540671d1dd82ceea
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Apr 22 16:08:38 2013 +0200

    Used roles instead of user in many dql requests

commit 6c8e2500ba7c00a8d109283590068ebd8a1ea448
Merge: 0accd55 865f3c5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 22 15:24:45 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2c9a2f5d1e66b9327316cd204942a1ba627ab89c
Merge: 3e0cc71 cb60bbe
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 22 15:24:45 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0accd55febcb3a7c6eaf6b40bb89940cba9a21eb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 22 15:24:26 2013 +0200

    Updated uml diagram

commit 3e0cc718ef4e68f3eb86bfec8545ed3e825e0a7e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 22 15:24:26 2013 +0200

    Updated uml diagram

commit 15a08ab46ef8c4ab492e3f9e04cd082eeded0741
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 15:20:04 2013 +0200

    checkstyle

commit f49f627314bb7bc27c05339114354d9a297447fe
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 15:20:04 2013 +0200

    checkstyle

commit cb60bbeb7a6094a5b9d13f6227bc88daf8054de1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 15:14:42 2013 +0200

    Submodules update.

commit 865f3c5c4eff12cf667e3a2bacdbf8b1717bf761
Merge: 59e1d0d 94beec6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 15:09:26 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 09983f85e16e717eeb5b24fe84f9dc6354fec6a4
Merge: a12ba0a c5694fc
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 15:09:26 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b49a90745b9147cb2cd958991c2e021bbdef9b45
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Apr 22 15:04:00 2013 +0200

    Debug merge master

commit 6a4425abbb8df0df51d762ad997a49d86eb5f4d2
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Apr 22 15:04:00 2013 +0200

    Debug merge master

commit 59e1d0d3312d53723df666d12a92a947da9aca22
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 14:57:22 2013 +0200

    Test import resource manager.

commit a12ba0aec09c7f9090f0c656cd987afbc7e67e97
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 14:57:22 2013 +0200

    Test import resource manager.

commit 94beec660a3ff1f75cec390fb5ecd9e2c592d5c5
Merge: 5e79bda 068d635
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Apr 22 13:09:09 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/DataFixtures/Content.php
    	templates/default.zip
    	test/templates/config.yml
    	test/templates/default.zip

commit c5694fc37c16cae077eb2ec1dcd8c356cc26f4c6
Merge: 39631c1 683d560
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Apr 22 13:09:09 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/DataFixtures/Content.php
    	templates/default.zip
    	test/templates/config.yml
    	test/templates/default.zip

commit 5e79bda6ab19123ffa9d3a4419d378e344179863
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Apr 22 12:57:53 2013 +0200

    New functionality Copy&Paste links in order to get externals contents inside of a content in the home page

commit 39631c1e379ef22080967a8e782b8b7772593e57
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Apr 22 12:57:53 2013 +0200

    New functionality Copy&Paste links in order to get externals contents inside of a content in the home page

commit 3d985c25ec4f64559d5920408fc7cc9625d6117d
Merge: e3d3460 068d635
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Apr 22 11:07:41 2013 +0200

    Merge with master

commit f072cfc2340155e8ba23e35d6eb980cd1281fc10
Merge: ae8f83b 683d560
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Apr 22 11:07:41 2013 +0200

    Merge with master

commit e3d34609913ae794c573e343aa282e6798f6a807
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Apr 22 10:37:35 2013 +0200

    Correct translations key

commit ae8f83b9c08ac04f67ef2ea5ea80c5e40b3801aa
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Apr 22 10:37:35 2013 +0200

    Correct translations key

commit 068d635a1ef1a17c9fef86ac0ea5b535fa8cc062
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 10:02:32 2013 +0200

    Workspace creation refreshes the security token.

commit 683d5607fd35c61f42505bd0bd633de9e0980fe2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 10:02:32 2013 +0200

    Workspace creation refreshes the security token.

commit f3c7e1fe52ac7fd2c0a431f801e29e90434c199c
Merge: 1af37f9 92d692e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 09:28:01 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 5241f98affec216daf07c6ac6d47cd5ebf0b5fee
Merge: 0e4717f c524bcd
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 09:28:01 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1af37f9c5655ac7f99bb79684a34aa56161d9be0
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 09:26:48 2013 +0200

    Renaming getOwnedRoles.

commit 0e4717f25bad4f97c77174720fec36a03603fbd1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 22 09:26:48 2013 +0200

    Renaming getOwnedRoles.

commit c524bcd76c626f881fd5c9e40b99069a9d828ff8
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Apr 22 08:43:44 2013 +0200

    submodule update

commit d6ba5f9cc354549b70ca91a58eed9cfc06b791ca
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri Apr 19 17:01:11 2013 +0200

    Change naming convention for changeSet. Delete CamlCaseToUnderscoreFilter. It was incorrect

commit f45bf659e0ea6d8ded4229bd6efb65ff6445dbc3
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri Apr 19 17:01:11 2013 +0200

    Change naming convention for changeSet. Delete CamlCaseToUnderscoreFilter. It was incorrect

commit 92d692e295ee20d8e75daa4292aeb8d53055c397
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Apr 19 15:53:51 2013 +0200

    Updated uml diagram (2)

commit dc10360abb93f17fbc26c85d3c149048d5482d5f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Apr 19 15:53:51 2013 +0200

    Updated uml diagram (2)

commit a2d5058004db13542ac130937d63b953b0ecc190
Merge: 4f94480 bef71bc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Apr 19 15:39:52 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 472c7630cb19b8f59782a8492eea76096f56332e
Merge: 2c063db f9a89a3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Apr 19 15:39:52 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 4f944802a79da2d4c9fea3406f9cfe6bb99090e1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Apr 19 15:39:28 2013 +0200

    Updated uml diagram

commit 2c063db20830f08b7ea76a68fb319893f9e96fe8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Apr 19 15:39:28 2013 +0200

    Updated uml diagram

commit f9a89a3699fad5fab68a9134d9fdae4bf3a4ea5b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 19 15:38:59 2013 +0200

    Updating the security firewall.

commit b6cba7b255a7735444fa2fd620af9680d2adf0c0
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri Apr 19 14:52:40 2013 +0200

    Correct log delegated view mechanism

commit 8330c6569e1a17912902fa89abea133c80ec13fb
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri Apr 19 14:52:40 2013 +0200

    Correct log delegated view mechanism

commit bef71bc5f99e9df0697494e7cb2bb58b53bf2723
Merge: 89ce4dc 9586c7a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 19 14:36:48 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit eb6c81a0dd2eae3a59a85ff0177fd1004288b55b
Merge: 1b78e90 2c1ccd1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 19 14:36:48 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 89ce4dc06ae8f0f9fd0be932c8521e2c09cb595c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 19 14:35:05 2013 +0200

    Making phpmd happier.

commit 1b78e9092992d926192e89035b2fe98c95798816
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 19 14:35:05 2013 +0200

    Making phpmd happier.

commit 2c1ccd10652691f216609775e0cdaf271bc908c0
Merge: d045aca 308deb5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Apr 19 14:22:12 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d045aca8f759d768d03df1780f799c234677377f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Apr 19 14:21:31 2013 +0200

    Added dir parameter to code analysis script

commit 9586c7af31888f6713258e9fa08a4b51e8a604d8
Merge: 7ca2c3c f6665e3
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Apr 19 14:09:14 2013 +0200

    merge postgres compatibility

commit 308deb551177e24d104b46d54e330ec00233d110
Merge: 680fa10 ae2ae14
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Apr 19 14:09:14 2013 +0200

    merge postgres compatibility

commit 680fa10a938bab2a8183fc8f285c1fcc3dba1ae8
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Apr 19 13:07:25 2013 +0200

    deleted template files

commit 7ca2c3c94f542615f020898d9f227c2c14d3034a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Apr 19 13:04:50 2013 +0200

    postgres compatibility

commit 5c6597274f890b405fd40a8aff59ea3811173281
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Apr 19 13:04:50 2013 +0200

    postgres compatibility

commit f6665e3f23f355ff61e58ee6b8a74b7e74381b4b
Merge: b5ec5de b39bc0c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 19 11:50:44 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit ae2ae14b6086da4f2550f336e76e2d14b3559783
Merge: 3d9b45b f7d944d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 19 11:50:44 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b5ec5def0ea9a9ed99f98be5d5efa4e10a7ebc85
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 19 11:49:44 2013 +0200

    checkstyle

commit 3d9b45b6e8a4107d2c3a59696cfaa64976724c91
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 19 11:49:44 2013 +0200

    checkstyle

commit d697a6b57aaf32b84b0353c5729f67cc6437b993
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 19 11:17:21 2013 +0200

    Fixing resource manager disabled menus.

commit 2038413cff0701f4b5b6be4aba42458b1b3246c2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 19 11:17:21 2013 +0200

    Fixing resource manager disabled menus.

commit b39bc0cae1c4acf0304ed2a0bc6ec9733ea56eed
Merge: 5ff1c6f 4570e77
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Apr 19 11:04:10 2013 +0200

    delete template

commit f7d944daee67817c99726654a6e128f14971c574
Merge: 27c5428 6ee452a
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Apr 19 11:04:10 2013 +0200

    delete template

commit 5ff1c6f5723244a8ad609c1eb8928bf70d88619e
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Apr 19 10:51:10 2013 +0200

    calendar filter + lots of bugs

commit 27c5428bef5645609812bad996ad9170f9aae3d5
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Apr 19 10:51:10 2013 +0200

    calendar filter + lots of bugs

commit 6ee452af50f2463f3bc226086f5ac2d7435b2325
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 19 10:46:26 2013 +0200

    Updating submodules.

commit 4570e7761b128a82de4150b90aeb0bf38dc056bb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 19 10:44:35 2013 +0200

    Workspace role impersonation tests.

commit 4bc5692943dd115caf1b5d857684a229954e6a5d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 19 10:44:35 2013 +0200

    Workspace role impersonation tests.

commit 5875b88bd4cd5aa51e676e0e88702b8d07bf1eff
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 19 09:31:46 2013 +0200

    Twig "has_role" extension.

commit 389649e1532915e25f45126fbd145237ea14d248
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 19 09:31:46 2013 +0200

    Twig "has_role" extension.

commit 01b4d1f3268189e7a6134ecbd79e41cfa5dc1f2c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 18 17:57:42 2013 +0200

    Using roles from the security token instead of the user.

commit 6d6062c7eb95ca79869d0e21f6e77770863b1d57
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 18 17:57:42 2013 +0200

    Using roles from the security token instead of the user.

commit 4821a3f563a63151adb418eb2591b90014726352
Merge: a3c6da8 e79e80a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 18 17:41:46 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Library/Security/Utilities.php

commit d0428bb53fab48a4e1a942eb624b7654884af5a9
Merge: c31465d f504382
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 18 17:41:46 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Library/Security/Utilities.php

commit a3c6da83eaa81e8e9877feecc84cae74e32274a1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 18 17:37:23 2013 +0200

    Workspace managers can see their workspace as role XXX.

commit c31465d2fc50da9334851e3f6896f94e0057ec56
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 18 17:37:23 2013 +0200

    Workspace managers can see their workspace as role XXX.

commit 71b44f781a4655e6b54051deb1e504e6a7e33a2f
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Apr 18 16:44:19 2013 +0200

    Follow refacto multi platformRole for users

commit 426b2d1e42b0cbc9b22f6e5d3a210c0688cdca06
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Apr 18 16:44:19 2013 +0200

    Follow refacto multi platformRole for users

commit 47c94ccbabaab72d277fc219e536f56ab419b742
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Apr 18 15:49:21 2013 +0200

    remove debug

commit 821c92c68db434362a5375dd134e9bfedf46af5e
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Apr 18 15:49:21 2013 +0200

    remove debug

commit 58f679dde2d5f43f9e079af02acddda7bbeee5bd
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Apr 18 15:48:20 2013 +0200

    Add log change right create resource in folder

commit e72592dd856a2afc1f0e293e2d39146a374614d6
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Apr 18 15:48:20 2013 +0200

    Add log change right create resource in folder

commit e3f27952be067abfb9011525f59e0f692d4d274a
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Apr 18 14:38:38 2013 +0200

    Repare log login user. Using DiExtraBundle for catch security.interactive_login

commit 7023f1c9a2222894c57a9500f4758cf61c003b05
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Apr 18 14:38:38 2013 +0200

    Repare log login user. Using DiExtraBundle for catch security.interactive_login

commit f504382b378671bbae186ec4d126cd410d8a8a5a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 18 13:44:33 2013 +0200

    Submodule update

commit e79e80aa2bf1c8fa5260eb486a554d86cc950c42
Merge: 1cd9a28 772aca6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 18 13:43:29 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 150915b9e01c244ce5a6e86775cf6cb57df9ad73
Merge: 2302fe1 ce1bcad
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 18 13:43:29 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1cd9a28577cb1f0c8f02c27edb6a1d0f59655ab7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 18 13:38:34 2013 +0200

    Moved core routing file

commit 2302fe102df69684e5ff0261a8a6483ceee2f239
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 18 13:38:34 2013 +0200

    Moved core routing file

commit f13c40f341120376dfc7e256cb9e297a834eca10
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 18 13:36:56 2013 +0200

    Used annotations for core services (7)

commit 0bd15f8437ec60f91aaeb26ca40de08873a7fb4b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 18 13:36:56 2013 +0200

    Used annotations for core services (7)

commit 7047af38cc09fafa36e8dc1eb47331c6f9de91d8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 18 13:13:31 2013 +0200

    Used annotations for core services (6)

commit b131a06905f67ff745f55caa24d9e17bf22b9c5a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 18 13:13:31 2013 +0200

    Used annotations for core services (6)

commit f9ffcb93b0180fef8071dcc0d2c2b7e7a92a0be8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 18 12:03:19 2013 +0200

    Used annotations for core services (5)

commit 4cde1fc2118c6e909a0003681265857cf2f627fd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 18 12:03:19 2013 +0200

    Used annotations for core services (5)

commit 50f486d42b99f5ef8df53e0483a998002134035d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 18 11:46:12 2013 +0200

    Used annotations for core services (4)

commit 6391e25cfdd9c59f49d486f6f86f4e1c1c007501
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 18 11:46:12 2013 +0200

    Used annotations for core services (4)

commit 12191b361bd0e7d9d97d754ac6e627664b6c6138
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Apr 18 11:33:09 2013 +0200

    Refactoring log translation using params in translation

commit 4a0044891fe43450887b9ac05b3fb95d78c48ec0
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Apr 18 11:33:09 2013 +0200

    Refactoring log translation using params in translation

commit 772aca6d190842eb551805fd25b28d91993e9ac9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 18 11:23:29 2013 +0200

    Fixing workspace template for tests.

commit ce1bcad6d7468e1af50ac9ba73deb605e21fac3f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 18 11:23:29 2013 +0200

    Fixing workspace template for tests.

commit 9dd180922cd4d6fee3afbc4b0f60e13c25ab43a9
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Apr 18 10:25:42 2013 +0200

    Change algo for NotRepeatableLog

commit 469c3490c3fff089f62988db5e7c2e07f0d5c51d
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Apr 18 10:25:42 2013 +0200

    Change algo for NotRepeatableLog

commit f09ce342af23b3facf9d128574db86bf3af8fb99
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Apr 18 09:28:43 2013 +0200

    Folder tracking, Plugin tracking with delegate views, identify rename

commit 6518ae9e85c2b173a21ba6946a81e6e225012a26
Author: Vaince <vincent.saisset@gmail.com>
Date:   Thu Apr 18 09:28:43 2013 +0200

    Folder tracking, Plugin tracking with delegate views, identify rename

commit 9dcef543f382f26d9acb72ceb569f997846eba63
Merge: e7e094b b4bb73a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 17 15:46:34 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2e1b5caf85131442957f9a483c678d5aa837ad2e
Merge: e873894 5e5d62b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 17 15:46:34 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e873894935432c398f6bfe4b8369a7dd690f1a1b
Merge: 4c51827 d1896a3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 17 15:45:30 2013 +0200

    Merge branch 'new_branch_name'

    Conflicts:
    	templates/default.zip
    	test/templates/default.zip

commit e7e094b633dcb0584a8c1b23475eaaa352c7ccfd
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 17 15:33:47 2013 +0200

    Fixing user impersonation by admin.

commit d1896a3d16d284478b92aaf8d9ad6dc16820e7fe
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 17 15:33:47 2013 +0200

    Fixing user impersonation by admin.

commit b4bb73a266122c3564bdc4a2790ac70ab45f9f22
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 17 13:38:16 2013 +0200

    Added error handling in archive creation

commit 5e5d62bd7c9bf24772948ff1ca8c0705b032571a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 17 13:38:16 2013 +0200

    Added error handling in archive creation

commit 3758752a9cdbb153d120d0fd707a975497583250
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 17 11:53:05 2013 +0200

    Validator translations.

commit 6adf9030acd67f5824393a03bf470d24ffda4880
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 17 11:53:05 2013 +0200

    Validator translations.

commit c2ca2072c700740e8c63b82137fae85901087bfc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 17 11:34:02 2013 +0200

    Used annotations for core services (3)

commit 1b83dd4f1e223b42d1d4d799d5d97f037f0e8c09
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 17 11:34:02 2013 +0200

    Used annotations for core services (3)

commit 8ce2827cb84f58a3c10889fa105e80dec719f6af
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 17 10:47:44 2013 +0200

    Fixing some phpmd errors.

commit db7f84936ec03e11a052cb97454d03237393ba94
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 17 10:47:44 2013 +0200

    Fixing some phpmd errors.

commit ea5173c83810230b68b231e13a401bd68586cf76
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 17 10:11:26 2013 +0200

    Used annotations for core services (2)

commit 48a45fd0a067b35243ddb317dbbdaacbbe675ffb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 17 10:11:26 2013 +0200

    Used annotations for core services (2)

commit 67d1d789b2f4fad875d63fcfc821464b6ca6131f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 17 10:01:21 2013 +0200

    Moved home twig extension to library

commit 0644610114791149ed22c92a3f2ded79a8089fac
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 17 10:01:21 2013 +0200

    Moved home twig extension to library

commit 89d2808d842cd1a1240ad732fe74b57d5376777d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 17 09:56:02 2013 +0200

    Used annotations for core services (1)

commit b2e8b6e8dbbcfb9645bed1c3167d760d886a7b9e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 17 09:56:02 2013 +0200

    Used annotations for core services (1)

commit 4c51827aeaadaf4cd1ebf34c3ed6f34b5bc7a3b8
Merge: 2fd47f0 b153b6f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 17 09:50:11 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	templates/default.zip
    	test/templates/default.zip

commit 2fd47f0ce9d1f69b0cf5642990502b1e226ffa70
Merge: e2d0608 4d68e49
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 17 09:44:57 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e2d0608630256893582c132baaa0f3ad0508f210
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 17 09:43:35 2013 +0200

    Display the duration of the raw_install script.

commit b153b6fd91cc58e32c9e6e1286d946f4cb624780
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 17 09:39:47 2013 +0200

    Untracked generated templates

commit 3cfe9f69926e90b13fbadb15f653d2cafa98a195
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 17 09:34:35 2013 +0200

    The tool 'parameters' cannot be removed from the desktop.

commit 4dfbf3bcc37aef914e4f3802ab205df99cf998c9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 17 09:34:35 2013 +0200

    The tool 'parameters' cannot be removed from the desktop.

commit 4d68e498e18fc52c94dd5eca447cb408ded68267
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 17 08:57:04 2013 +0200

    Downgraded submodule reference

commit bebf09321cfe02cea82b7cea31194fa31eece8ca
Merge: 2046e7e 3e85647
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 17 08:50:18 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2046e7e9dc9785583fe02801217d7b2b8ef969a3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 17 08:50:10 2013 +0200

    Submodule update

commit 461a97dc25af6172139fc6812fc375384601d4e9
Merge: c8f84a1 e5e5f76
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 16 17:36:55 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 3e8564754b71a2674242f716e22548040f8c8d7f
Merge: a5e4560 63e8faa
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 16 17:36:55 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c8f84a1de053e75608d5d9291eb4a0b281497735
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 16 17:36:17 2013 +0200

    Activity player test + desktop parameters tests.

commit a5e456072e2dd887e917b50e61603c9dee720712
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 16 17:36:17 2013 +0200

    Activity player test + desktop parameters tests.

commit 63e8faa7fa59af4c632bdc782b29fc57c1da3291
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 16 16:09:44 2013 +0200

    Submodule update

commit e5e5f76cd78d03ed71bc88fdfd8c40991f8cd13d
Merge: 5df2a6c 0650786
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 16 16:06:13 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 06378ecef0199f6fe2bb3b906ab5eeb43f93b34c
Merge: a3801d0 dc6b2ff
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 16 16:06:13 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a3801d0ee6b7f7ce55ebb16596a5bc083137c9f9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 16 16:05:18 2013 +0200

    Removed unused parameter

commit 5df2a6c8ca1329113e041212048c821abeceb88a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 16 16:03:50 2013 +0200

    Moved template dir to parameters file

commit a1a5b4b8aef988c00116d4a756d0573ebdb29ee4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 16 16:03:50 2013 +0200

    Moved template dir to parameters file

commit 06507861c7d247acc76a5dd26fb6cab659b403d3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 16 15:55:11 2013 +0200

    Uncommenting tags tests.

commit dc6b2ff0a9007a0db44276c0c67c3613d2fa980f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 16 15:55:11 2013 +0200

    Uncommenting tags tests.

commit a440ecb25220a0d292e79809dfebf0b4cbec6d99
Merge: 00a456a 46dfd97
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 16 15:39:49 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f9ea319454d7656ba4a4923878fc2e2d12a8cee9
Merge: ae33512 73198d1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 16 15:39:49 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 00a456a1d629acd1a9a5e212009b3a4f8936a30f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 16 15:38:52 2013 +0200

    More tests for tool/ParameterController (+ some bug fixes)

commit ae33512d254d380efd599fdebdaff13e519fd532
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 16 15:38:52 2013 +0200

    More tests for tool/ParameterController (+ some bug fixes)

commit c4f8257730a10125e08d4a8056e5b4ed520b4ca2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 16 15:23:01 2013 +0200

    Refactored workspace configuration

commit 4be1a263e5915abe02b9253f77241b516d49a1ff
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 16 15:23:01 2013 +0200

    Refactored workspace configuration

commit 3fddbfd768e3935fbeba1491c8603df8e5b3ad56
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 16 15:09:51 2013 +0200

    Fixed bug in test environment

commit b8e2d17a49114c28e72600f479546f9c889dea46
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 16 15:09:51 2013 +0200

    Fixed bug in test environment

commit 522ed6defad25ac5bea9e0898a4e183c6bf33200
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 16 14:10:20 2013 +0200

    Fixed test broken on Windows

commit 3862817a86eae833ae883ac342607922b3480ff0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 16 14:10:20 2013 +0200

    Fixed test broken on Windows

commit 73198d121175a0a7c71cf281fb09542c15a98e47
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 16 11:33:12 2013 +0200

    Submodule update

commit 47c1cec57c5e3fde053f513fe5e543af90b681e8
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Apr 16 09:56:47 2013 +0200

    Add read directory log + move, copy and shortcut details + follow routing refacto

commit 469d01e58fb2fd41819a573188381953b62f2dce
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Apr 16 09:56:47 2013 +0200

    Add read directory log + move, copy and shortcut details + follow routing refacto

commit 46dfd97ac3b8bf4b4972be3fcbdfa58241f5f53a
Merge: b0e00ec ca18a0b
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Apr 15 17:28:52 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 9a8945d3d4cb9ff74e3b313fb8e7849ba2afad82
Merge: 8f34aca 34a52a0
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Apr 15 17:28:52 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b0e00ecae4215a7bcd1d908a0ba21dfed4f3b68f
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Apr 15 17:28:28 2013 +0200

    New functionality to reorder content in home page

commit 8f34acac6e071983ab7d6ca901f092c92830a76a
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Apr 15 17:28:28 2013 +0200

    New functionality to reorder content in home page

commit a75d920e852529583ecbae3022ac5aa38795fa1c
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Apr 15 16:44:30 2013 +0200

    Add ResourceExport log + translate toolName and ResourceTypeName

commit 79f8377866f56164695b4aa7fe35435fce38e22f
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Apr 15 16:44:30 2013 +0200

    Add ResourceExport log + translate toolName and ResourceTypeName

commit 147a6ef975e7c13bb7374ec2386bbce5cc561534
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Apr 15 14:56:40 2013 +0200

    Remove WorkspaceLogListener

commit 8aee1cde8f6e2adf26747d45f1388ca880454295
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Apr 15 14:56:40 2013 +0200

    Remove WorkspaceLogListener

commit a282cf1a9e1cc20d9d06b69c9d709f5c2a957855
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Apr 15 14:37:26 2013 +0200

    Merging from Master

commit e3b9a2029700ad180200640ba8ce045c43420eb3
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Apr 15 14:37:26 2013 +0200

    Merging from Master

commit 34a52a02e50f7dad9d44766fe63ffe1efe286332
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 15 14:19:26 2013 +0200

    Databasewriter tests for template update.

commit ca18a0b9eabe73ebc171296310853130ab953c92
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 15 14:19:26 2013 +0200

    Databasewriter tests for template update.

commit 37557f28fcc499e3f709300d505d123044a670b7
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 15 13:58:47 2013 +0200

    Fixing a test.

commit bcb6e4482c01d3e6ec1aaa2b68f0aa6accc03ebe
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 15 13:58:47 2013 +0200

    Fixing a test.

commit dead6aef0fb463ba6c36446e641be2a54ae8984c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 15 11:56:37 2013 +0200

    Uncomment the session setter un AjaxAuthenticationListener.

commit 89136eed052573108a7c20e43be30e7b1717d0a1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 15 11:56:37 2013 +0200

    Uncomment the session setter un AjaxAuthenticationListener.

commit 9aff8eabb665c63b7e8146d7eab89e1eb69c2109
Merge: 74e3699 84e2649
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 15 11:53:42 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 558573a2eb735de8559796677d7d2901d65490bd
Merge: d51ebe6 7e1a40c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 15 11:53:42 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 74e3699981572d3a9a07118c5ae5e2c7753fc341
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 15 11:49:06 2013 +0200

    Ajax error handling.

commit d51ebe678d354823345aa30c26803f65643ef7d0
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 15 11:49:06 2013 +0200

    Ajax error handling.

commit 4af8d31bf3a223b1d775d6ec24dd6c144ac8e69a
Merge: 1998b86 7e1a40c
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Apr 15 11:43:44 2013 +0200

    Merge with master

commit c486a68689e8d86ddd17fa11e33bdae2f8ddc23f
Merge: eac7622 84e2649
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Apr 15 11:43:44 2013 +0200

    Merge with master

commit 1998b86d7761e9b3137771824654a8b81590a0d2
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Apr 15 11:25:06 2013 +0200

    Add Workspace Event (create, delete, toolRead) Add NotRepeatableLog logic

commit eac7622b262a109a3b68577de5aed40973d75f23
Author: Vaince <vincent.saisset@gmail.com>
Date:   Mon Apr 15 11:25:06 2013 +0200

    Add Workspace Event (create, delete, toolRead) Add NotRepeatableLog logic

commit 84e264968a46509c298cb12a84412d5f3b7abb4b
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Apr 12 11:26:38 2013 +0200

    ignore templates/* & test/templates/*

commit 7e1a40cf2bb8978a8e7b87fc545bc49d4b6a1ed6
Merge: 78ee282 2fa0d6e
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Apr 12 09:32:53 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6972d0552c7e8be44a311b0e0a485dbf472ab790
Merge: 77c33c9 5391985
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Apr 12 09:32:53 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 78ee282995121d917281f0041ae99258302bca3d
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Apr 12 09:32:23 2013 +0200

    add displayName to tools

commit 77c33c96d8c242feca6dc7c98bbdd3c9faa430f1
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Apr 12 09:32:23 2013 +0200

    add displayName to tools

commit 2fa0d6eecfa7c452d9a0b5a990aa1918a41dd01f
Merge: 0518edc ed9e856
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Apr 11 14:10:23 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 53919858158f4512b6a7dcfa45815e1cee10b5e2
Merge: 72db26a 7e44b0e
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Apr 11 14:10:23 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0518edcf7da2f9c670b9b0e57464eb999c1f7053
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Apr 11 14:09:49 2013 +0200

    Edit functionality in the content of home page + CheckStyle

commit 72db26a0b2f8bb0b961da1905d366104b0d0e4bf
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Apr 11 14:09:49 2013 +0200

    Edit functionality in the content of home page + CheckStyle

commit 5a72db45d9a87136115b63401ce8293cc807e7e8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 11 13:45:27 2013 +0200

    Fixing wrong relativepath for IconCreator.

commit 450eed275b93d7d95445a6d3cc244eb96c16e3ee
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 11 13:45:27 2013 +0200

    Fixing wrong relativepath for IconCreator.

commit 7e44b0e7320d1841a6378953e7251b4ec8bbd875
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 10 18:05:51 2013 +0200

    Removing templates directories from the gitignore.

commit ed9e856d323125c992281d0ae045e97e42196930
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 10 17:05:09 2013 +0200

    Fixing (and commenting) some tests.

commit eb720b0c3119240d4aea151b2322f99c5c662a4a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 10 17:05:09 2013 +0200

    Fixing (and commenting) some tests.

commit 06de540e405cf4492110d915ecc09079340b6213
Merge: 509ebd7 58055a2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 10 13:51:12 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	app/config/config_test.yml
    	src/plugin/Claroline/SiteBundle

commit c3423278a8c6b542be3ef33b7ebdb890dbb00426
Merge: ec3f99c ba56a32
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 10 13:51:12 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	app/config/config_test.yml
    	src/plugin/Claroline/SiteBundle

commit 509ebd75c7d80a6ac05c17e44568edcb0f0e13cc
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 10 13:33:34 2013 +0200

    Update default template dynamically when adding a plugin + splitting ToolListener.

commit ec3f99c843c2c5912a027fcad760dd6dfa94f30f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 10 13:33:34 2013 +0200

    Update default template dynamically when adding a plugin + splitting ToolListener.

commit ba56a3227086aedd1052fc63b7b5c37b97eecff8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 16:53:49 2013 +0200

    Fixed typo

commit 58055a2caa330bd32257317323db8f6e09434c38
Merge: 0216afe 01ef561
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 16:17:30 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6b80c7b2dbb4961440a7c667feae5f3435abe59a
Merge: d1c712d 6745b59
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 16:17:30 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0216afefc5d1f55719e735b7e41940c081ad3fa5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 16:17:12 2013 +0200

    Fixed typo

commit d1c712dfb4e16aa4b569ed6107df625bf3126851
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 16:17:12 2013 +0200

    Fixed typo

commit 01ef561fb3ada24873b3b200169d67b7172b84ca
Merge: 2561b28 f6e7051
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 9 16:11:41 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6745b5961b32007f86295c693d1917af988d91df
Merge: 31b2a42 8508be6
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 9 16:11:41 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2561b281ffb023294d9effa2cba44912625f67b0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 9 16:10:46 2013 +0200

    Added tests for workspace admin tags

commit 31b2a42fb55a9960c0c2cf3921f134b9d75af276
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 9 16:10:46 2013 +0200

    Added tests for workspace admin tags

commit 8508be66340b5199a1908efbec3e608d1f01b533
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 16:10:15 2013 +0200

    Submodule update

commit f6e70511b6ee3273df7851a9e060e46faa029c7e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 16:06:30 2013 +0200

    Renamed core container parameters

commit edb3b224a6e2ba43f381c94ae0740fd6b934faa2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 16:06:30 2013 +0200

    Renamed core container parameters

commit 2e206fcb26ccb5fcbd4c8f2e93815ca3715d2db0
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 9 14:30:58 2013 +0200

    Added workspace admin tags

commit 34339a75a5793e9a90f415f634377c4417914057
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Apr 9 14:30:58 2013 +0200

    Added workspace admin tags

commit f5c488fd77d334af7057934fa4520e7c205bcc2f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 14:03:26 2013 +0200

    Submodule update

commit b16ca25c0cc2601d74f36eb2f86ad78fce960e01
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 14:02:44 2013 +0200

    Moved container parameters and env-related services to specific files

commit 96d6de624000cd7bf64bce2e5ae06912f33a8e09
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 14:02:44 2013 +0200

    Moved container parameters and env-related services to specific files

commit 8a41721a8d4123fbc10944a77ed9cdc8747aec5d
Merge: 26ed042 c6139a3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 9 13:40:36 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 5f766adf2c5b3220dde8787f5f5b1cd6f704553c
Merge: df186cd 749cf3a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 9 13:40:36 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c6139a3d61d7d8122593235fcb0e47e414db2aaf
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 13:04:05 2013 +0200

    Removed is_visible option from doc and stub plugins

commit 749cf3aa772f6574eb810bdfe1245bccd30ef477
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 13:04:05 2013 +0200

    Removed is_visible option from doc and stub plugins

commit fcedb40b289f650adc672bbc934124d9094c00af
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 12:06:32 2013 +0200

    Submodule update

commit 1e6507961dd1b56be01800712a1a4c5b6a3cb5d9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 11:12:43 2013 +0200

    Removed session history component

commit 501d8c59862af0b14434262dccc9a627ff34b0c4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 11:12:43 2013 +0200

    Removed session history component

commit 26ed04294bfa2d7620569854c6efc2ed19ec5e9f
Merge: 6ae3c15 32c2470
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 9 10:55:43 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit df186cd1c5b05483e498aa9b079c545fd7080e9f
Merge: 58a9313 47309a6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 9 10:55:43 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6ae3c1519e1ca370fd656d065a97056acffb3c88
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 9 10:54:18 2013 +0200

    Default template updated when a plugin is added/removed.

commit 58a9313c9b43fc44924491b40365668bab8bead7
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 9 10:54:18 2013 +0200

    Default template updated when a plugin is added/removed.

commit 47309a673c396551a6a78c66ea3260db6e882e1a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 10:41:21 2013 +0200

    Fixed ant script

commit e825adfd53eed584fbcfa547bc150a8718c0b46a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 10:30:38 2013 +0200

    Submodule update

commit 32c2470b235a609288a672ece774948ccd617394
Merge: 72c861a e5ba2d2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 10:28:22 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/config/services/listeners.yml

commit 12bee631aa28beae83ed28dbcbb0cb31d50ca304
Merge: 0533858 52af731
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 10:28:22 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/config/services/listeners.yml

commit 72c861a2262a4c5c8eab1baba233170f653bbef4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 10:23:05 2013 +0200

    Removed unnecessary cache resets

commit 0533858a3c7f25bf952e12401d247842a547eef7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 10:23:05 2013 +0200

    Removed unnecessary cache resets

commit 15c388dc19b9ff6852bb51c24a8f890eeec067c2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 10:21:58 2013 +0200

    Fixed broken test

commit ace514fdb3bb100d69cc58e8b6bb9bcdeae263b1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 9 10:21:58 2013 +0200

    Fixed broken test

commit 254e982a5f99ae9eadd312d6cf91f37ccc927941
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Apr 9 09:29:11 2013 +0200

    Add new route for log details, add new twig filter caml_case_to_underscore, add basic view for log details

commit eebdd34bf4b53cfbfaf54821bbcc1b69800616a6
Author: Vaince <vincent.saisset@gmail.com>
Date:   Tue Apr 9 09:29:11 2013 +0200

    Add new route for log details, add new twig filter caml_case_to_underscore, add basic view for log details

commit e5ba2d2c708e7952d9592167afe88d2419d1c89a
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Apr 8 16:18:04 2013 +0200

    CheckStyle

commit 52af731573789647726d55ac9c3c2a55f14e7cc0
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Apr 8 16:18:04 2013 +0200

    CheckStyle

commit 37675a16d467726266bb9cf2c71c78236b78cfcf
Merge: 497e7d2 149329a
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Apr 8 15:09:14 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 281adb4f9d2a9ab07aaaa84feff2ff8feb6c0020
Merge: 3c61703 783fed5
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Apr 8 15:09:14 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 497e7d226b05d3f3a9ff377f96e623d4aaefc86c
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Apr 8 15:09:00 2013 +0200

    File no longer used

commit 3c61703a8301226f8841ae50adc5f8bc15369d38
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Apr 8 15:09:00 2013 +0200

    File no longer used

commit ae0ce840d6877cc7cee570ea2b0f13eea42cbd9e
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Apr 8 15:08:06 2013 +0200

    Add a confirm message when delete contents, Show modals by ajax and check style

commit 85ae0ba9119d5847dce15815722d723bd427d0cf
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Apr 8 15:08:06 2013 +0200

    Add a confirm message when delete contents, Show modals by ajax and check style

commit 24d2e91a7f0aab53c3549a617d0ebb0fe2333844
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 8 14:51:22 2013 +0200

    Use strict comparisons

commit 2ac83a62c659ebf55fb264e88a26d892ac5172b5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 8 14:51:22 2013 +0200

    Use strict comparisons

commit 684a6dc6f85f3d0fd6811094b7ff4b05d6ff89e9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 8 14:52:29 2013 +0200

    Default .zip template only references kernel resources. Exceptions thrown during the workspace creation if plugins are not found.

commit 95cbc419c4f1049d43978993f7be9d2ce6dd23c9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 8 14:52:29 2013 +0200

    Default .zip template only references kernel resources. Exceptions thrown during the workspace creation if plugins are not found.

commit 005802c22823b5cf99d810be135a9a2eb074fe7c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 8 14:50:04 2013 +0200

    Fixed wrong event name

commit ded8e5f256f303ff5a60662897cc839a6342ef84
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 8 14:50:04 2013 +0200

    Fixed wrong event name

commit 8495ff65a35922b4b914842b4adf8717f1511155
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 8 14:49:42 2013 +0200

    Fixed undefined variable bug

commit 7ef2e957464f1152e1f68ad51cb928daefcc694b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Apr 8 14:49:42 2013 +0200

    Fixed undefined variable bug

commit 149329ab0f987c206bbd016444d92c67ecfaf597
Merge: 0eb076d 774ce2b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 8 13:49:22 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 783fed552eebdefe6df0d738d15c42b603b11334
Merge: 585d66c a01dd58
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 8 13:49:22 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0eb076db824b0d74ee31c2bbc039e398bd7bdf22
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 8 13:48:43 2013 +0200

    Making PHPMD happier.

commit 585d66c7de3d7cfc4631c5c08ef616839ea309da
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 8 13:48:43 2013 +0200

    Making PHPMD happier.

commit 9d428adef4e9c228d888f136f94ee8bef5750851
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Apr 8 13:44:29 2013 +0200

    deleted workspace delete links from workspaces list page

commit de336789955dd3a36949a0c3106635c34532d771
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Apr 8 13:44:29 2013 +0200

    deleted workspace delete links from workspaces list page

commit 774ce2bc633e507b88d4be7f90529eff0d8cb7bd
Merge: 93ad010 ca18220
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Apr 8 13:15:26 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a01dd5827e6ef5ee8287b06b4c415f36ecc2d293
Merge: 36ff20f beb8176
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Apr 8 13:15:26 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 93ad01068b61806409bdebe3f494bad37603f889
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Apr 8 13:15:17 2013 +0200

    Added tests for workspace tags

commit 36ff20f2afc3f6d371bca8906040d84690c8f21f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Apr 8 13:15:17 2013 +0200

    Added tests for workspace tags

commit ca18220ff6ebe07c102281e2f3eea2b42c4bf18b
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Apr 8 11:18:53 2013 +0200

    fixed syntax

commit beb8176c4ea710d75343f82ba7d1243fc98869bd
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Apr 8 11:18:53 2013 +0200

    fixed syntax

commit 97abcb16d1cc6b2b94517d3ad44f65ab4ebe98f9
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Apr 8 10:41:51 2013 +0200

    Fixed bug when adding tag to workspace

commit aeaaed4b348b169973a98a729ce48d52482a250d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Mon Apr 8 10:41:51 2013 +0200

    Fixed bug when adding tag to workspace

commit 0a72ff56cf5597f81168e6ad6da3110b0763dddd
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Apr 8 10:25:14 2013 +0200

    app_install fixed

commit dc65e74f8ea9551a796256668ddd32dca3de916c
Merge: c06b27f 1927c42
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 5 14:17:59 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b18b9fd0d7ae8eaed6e52e688cc9cc42163b7abc
Merge: 5f05936 1b9050d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 5 14:17:59 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c06b27faf12292fec7344368f00cde0810259228
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 5 14:15:28 2013 +0200

    Fixing a broken test.

commit 5f0593619d3f37bd902a95bfd6df2f1332acaef9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 5 14:15:28 2013 +0200

    Fixing a broken test.

commit 1927c422ac1d4613788c2d7e3e92f7595bb7f598
Merge: 6bc3f8c e4e1c9e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Apr 5 14:11:03 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1b9050d9c1c6bc9e8b8586f130fcc64fafd8421d
Merge: b26110e c221ae2
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Apr 5 14:11:03 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6bc3f8c5d2516e4ccf0776a14925482a9b46d01d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Apr 5 14:10:46 2013 +0200

    Added tag removal for workspace

commit b26110e0cdb86069ed71b01e14b23110d07db940
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Apr 5 14:10:46 2013 +0200

    Added tag removal for workspace

commit 62e09ba61e65eb12500e9b897c029715514c392c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 5 14:07:07 2013 +0200

    Templates folder permission verification for the graphical installer.

commit 949f84f175c5a4c14d9eda2407eb0222c527ce7a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 5 14:07:07 2013 +0200

    Templates folder permission verification for the graphical installer.

commit e4e1c9e97d2ff86c825a6e1d372188ec76101bc1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 5 12:02:41 2013 +0200

    Exception thrown if the template directory is not writable.

commit c221ae25ff98d64938877ab73a0142108f37991c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 5 12:02:41 2013 +0200

    Exception thrown if the template directory is not writable.

commit ffed029b0548a8d461f32bce212d45bb18a03df1
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri Apr 5 11:39:15 2013 +0200

    Add tracking for user updating. With change set details. Missing details, and resource update

commit abc4feafeb4f77f7f4d73878ff74128058aaf803
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri Apr 5 11:39:15 2013 +0200

    Add tracking for user updating. With change set details. Missing details, and resource update

commit 892a95f1ed53b3e6344173b02834fa2e1240d667
Merge: 659a961 54b39a0
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 5 11:13:46 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 7ab7eda7e970e38a45bbdf393c4c6d71b0e5f995
Merge: 7d952f9 a0a1dc5
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 5 11:13:46 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 659a9617372a5e4f6c09cf3e250f42d0f3e4e728
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 5 11:11:43 2013 +0200

    Removing isVisible from ResourceType.

commit 7d952f96136a52880ecb185a69e35fa6cad92203
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 5 11:11:43 2013 +0200

    Removing isVisible from ResourceType.

commit 54b39a06a44a0fe0732f191823f3f37a6bde736b
Merge: 6f782e2 dfcaf4f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Apr 5 10:06:14 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php

commit a0a1dc573bd3b52e88300fa0495057ddfe6fa93f
Merge: b9a4a5f 76e6c08
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Apr 5 10:06:14 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php

commit c4546d9eee87caa080d08b41af60216738aa4b9b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 5 09:47:48 2013 +0200

    Removing a useless flush + fixing the left menu bar for admin.

commit 8fca37df2087b2e8932763c82b41b3239fa825ad
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 5 09:47:48 2013 +0200

    Removing a useless flush + fixing the left menu bar for admin.

commit 629fee88850d6a002e3bf64676a8948517744cb8
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri Apr 5 09:43:51 2013 +0200

    First version of Tracking-Log system. It's include resource and user log (missing user update)

commit d2f74ac8a39d6fef6ee0c06fb38a8bb0a1bbde1b
Author: Vaince <vincent.saisset@gmail.com>
Date:   Fri Apr 5 09:43:51 2013 +0200

    First version of Tracking-Log system. It's include resource and user log (missing user update)

commit 6f782e2dd0aa1a5514b920835ee5163e33a93916
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Apr 5 09:03:19 2013 +0200

    Added tag for workspace

commit b9a4a5fbc61bc61d7b3ecc55ddefe8fc82239877
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Apr 5 09:03:19 2013 +0200

    Added tag for workspace

commit dfcaf4f4a7e77a5514af342c5e8067d567189af4
Merge: 334b278 d21553b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 4 16:36:43 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 76e6c080f5073697d5ff695bffe5576105bbaea8
Merge: 47fec87 ba5c415
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 4 16:36:43 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 334b278f4b54d886f989f3646830dfe1a85c54e5
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 4 16:36:06 2013 +0200

    Increased performance for resource/ws/user creation.

commit 47fec873756450b1195fe72ef46bee3c55f62f3b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 4 16:36:06 2013 +0200

    Increased performance for resource/ws/user creation.

commit d21553b1f3547599cb2c892e2b93d6f79565c60c
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Apr 4 14:42:01 2013 +0200

    Fix error in case of delete all contents in home

commit ba5c4151fc114b59d35ab970266562df4ba06446
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Apr 4 14:42:01 2013 +0200

    Fix error in case of delete all contents in home

commit 1edad3f574d7c2c3def2de62b057feac48a2fd43
Merge: 3160bc9 43b83b2
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Apr 4 14:25:56 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2226ee30fc498054d364d706968fe5dcaa567977
Merge: 766614d 2e4063b
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Apr 4 14:25:56 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 3160bc91bfab9a8cad304539e710571c9ba5c40d
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Apr 4 14:25:45 2013 +0200

    New deleteAction in HomeController

commit 766614dc5f841471ef4f882fca318663392de3a7
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Apr 4 14:25:45 2013 +0200

    New deleteAction in HomeController

commit 6046c2fbb1fa225e9b2699d45f58b3748ec56be7
Merge: abaf179 43b83b2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 4 13:11:55 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 3109d86ee3a0ab4daee259eedcc8ba25ac7be11e
Merge: 38c3fb5 2e4063b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 4 13:11:55 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit abaf179566ba30a1bb52e30cd3bc9262a209799e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 4 13:10:43 2013 +0200

    Resource creation INSERT performance increased.

commit 38c3fb516d5ea8910bfbba42042f478c50fbbc72
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 4 13:10:43 2013 +0200

    Resource creation INSERT performance increased.

commit 43b83b29a1589fd891497371c837a79137343734
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Apr 4 11:58:46 2013 +0200

    fixed bug in installer

commit 2e4063b3aea1a612afb734bbe16e77d9954a25f2
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Apr 4 11:58:46 2013 +0200

    fixed bug in installer

commit a2641684f4aec69aaee26f71f5c378c22857644a
Merge: 26f2274 f66537e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 4 11:45:07 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 259dda6c6d049f46671c0c56c42f6b0cee9be940
Merge: 49c978a d6c865e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 4 11:45:07 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 26f22743224d2697cce07eb531709affe72be3ed
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 4 11:44:45 2013 +0200

    Use annotations for core listeners

commit 49c978a15aa5ca12952167fa87b60787626b1a46
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 4 11:44:45 2013 +0200

    Use annotations for core listeners

commit 84c36435d37a9ab8e7191654dcf1f69fffb84a8e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 4 11:42:41 2013 +0200

    Restored anonymous authentication listener

commit a634dad4fba87c1afa180a9a686d5580f9082f73
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Apr 4 11:42:41 2013 +0200

    Restored anonymous authentication listener

commit cd2e3579b66f4642b73c33a518005e8f2cffb0b6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 4 10:29:43 2013 +0200

    The workspace user list also includes workspace of user's groups.

commit 740104c8c2b03653983c6095374c4aacfa037728
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 4 10:29:43 2013 +0200

    The workspace user list also includes workspace of user's groups.

commit fedd6b6e9b94b28427ded1466b9fb0cf5e26324d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 3 17:41:50 2013 +0200

    Checkstyle.

commit e629c51fb57d8def479f7fbf4131b240c929107e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 3 17:41:50 2013 +0200

    Checkstyle.

commit f66537ef54bb2754adeae7142d2b00a7ea5ed91f
Merge: 4fc52ad 25efc51
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Apr 3 17:19:20 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d6c865e20c18af0a76fc90955c91ea8e67d5829f
Merge: 2fac9fd 900703e
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Apr 3 17:19:20 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 4fc52ade6561835f28986cc2916c093f4cff03ed
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Apr 3 17:19:06 2013 +0200

    Rename and chage paths of routing files

commit 2fac9fdeede22b2336cb7dc872e7ea170031762d
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Apr 3 17:19:06 2013 +0200

    Rename and chage paths of routing files

commit 3585d2af309696c24c4057faf41772b8bb2f6b6c
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Apr 3 17:18:10 2013 +0200

    New Entities, Translations, Services, TwigExtentions, DataFixtures, Routes and JavaScripts for HomeController

commit 0bf59f33f1735f428ae00109280f3a794bdd6d5f
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Apr 3 17:18:10 2013 +0200

    New Entities, Translations, Services, TwigExtentions, DataFixtures, Routes and JavaScripts for HomeController

commit 25efc51d4e48f733fa30313f9ce6bb16edde1078
Merge: 11083ba 76409cc
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 3 17:12:37 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 900703ef79002917d580b31088597836b00ba784
Merge: a3957ad d870547
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 3 17:12:37 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 11083ba9c2ddc6d97a031133c4899265a240a3f2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 3 17:11:52 2013 +0200

    The database can be filled with a massive fixture (new command).

commit a3957add96aa7a03d8bb57630b15653dcea8ef88
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 3 17:11:52 2013 +0200

    The database can be filled with a massive fixture (new command).

commit b30b677b92b9208ba84b6429b27df278d064194a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 3 16:25:41 2013 +0200

    Removed unused listener

commit 51e9b91184f917cd6cf5851b813b363b0740e9c6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Apr 3 16:25:41 2013 +0200

    Removed unused listener

commit 0c1d36831e6ae8f7d7abf571426beb4fcc040f16
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 3 13:25:30 2013 +0200

    Sets the user - roles relation fetch mode to EXTRA_LAZY

commit 932733378dac9b60b7c13fd3240f4121140225f2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 3 13:25:30 2013 +0200

    Sets the user - roles relation fetch mode to EXTRA_LAZY

commit a80dbfa59b556769f16a014cfb1e0eb6e2cbe9da
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 3 12:07:01 2013 +0200

    Roles aren't nested anymore.

commit 9d46360cd85baa7a83ec7b9b7066b992a1244c95
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 3 12:07:01 2013 +0200

    Roles aren't nested anymore.

commit d870547e0d7c9da486a09b5ec1fdf40ef19f3de6
Merge: a98a29f 3c16546
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Apr 3 12:05:47 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 76409ccb8e5fc191d3d4dec18181885fb4441350
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Apr 3 12:05:12 2013 +0200

    fixed aggregate bug on desktop calendar

commit a98a29f6d32b5ca1437013b9e4f3b4c4a43a615b
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Apr 3 12:05:12 2013 +0200

    fixed aggregate bug on desktop calendar

commit 3c16546a54b3cd2941c121f80f267ef6263a5706
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 2 17:12:46 2013 +0200

    Submodule update

commit 26d089bf7d0d6fd538089331383150466d267c5b
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Apr 2 15:48:44 2013 +0200

    delete Hello plugin (test plugin)

commit 6d79ae004847aca5f13ace4850d5e07838a1bdb0
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Apr 2 15:48:44 2013 +0200

    delete Hello plugin (test plugin)

commit e72990173d406a791e623b911d469654bcbe06ff
Merge: 99ce153 65527ea
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Apr 2 15:37:50 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 88feef0e224b9d5df3e0912db1e29f17788be9c3
Merge: 06e956c 4f2851a
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Apr 2 15:37:50 2013 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 99ce1538e823080a647b9c2ac636f32d0ead821d
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Apr 2 15:35:15 2013 +0200

    add unicity on ressource name and tools

commit 06e956c553dba7c37d763fe527ee61a069bedfb9
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Apr 2 15:35:15 2013 +0200

    add unicity on ressource name and tools

commit 4f2851a9201d15c5cdd7e5d53e331635ca170296
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 2 13:06:49 2013 +0200

    Submodule update

commit 29a313640ccf2d25c9a4a7037befbe5a9ff372a3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Apr 2 11:56:54 2013 +0200

    Submodule update

commit 65527eaf4a2550c24cad22fccddbbb80abdd1429
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 2 10:14:38 2013 +0200

    Changing some translations.

commit 556295943bae40064d72fe3383411ba0ebc45c1c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 2 10:14:38 2013 +0200

    Changing some translations.

commit 78622c46f877ec0c8aa8994db59c55725f055707
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 2 10:01:17 2013 +0200

    Removing useless 'LIKE' in dql queries + submodules updates.

commit 7a71df0e7d903c1f81adecd12edb3f8bc8deed92
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 2 10:01:17 2013 +0200

    Removing useless 'LIKE' in dql queries + submodules updates.

commit 33a195b126140f7f5184fb5eacf5b47e8656625b
Merge: c11b73b 9ab9160
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 29 15:40:55 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 01a675f1f6528e69eb67e39123ff92ee4a781dd1
Merge: c4f40c5 e2468e8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 29 15:40:55 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c11b73b46760415b1eb1c1596d149af9b577f30c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 29 15:39:46 2013 +0100

    Escaping json for users and groups listings.

commit c4f40c5f872220c495768535d9fdfef13698aaca
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 29 15:39:46 2013 +0100

    Escaping json for users and groups listings.

commit c9afde3e7b9ba7b85864c2273b9dffdc0ab179b1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 29 14:54:33 2013 +0100

    Removing RouteCheckerCommand

commit fe9420cfaed199c5ee00e3480d92d154a8b25dd6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 29 14:54:33 2013 +0100

    Removing RouteCheckerCommand

commit 9ab91603457d82b5317f05e869bb7f09ee55c0b2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 29 13:58:54 2013 +0100

    Removed call to deprecated getEntityManager

commit e2468e8f47004b73ec83b745c0304a9fc38651b2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 29 13:58:54 2013 +0100

    Removed call to deprecated getEntityManager

commit e86a4a2d73014d37cfacce9d29ab787866a943cd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 29 13:35:12 2013 +0100

    Submodule update

commit 51eb3504df84cec8023046869f2e95ca5ce3b971
Merge: b54fecc d0e9f57
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 29 13:34:09 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 7253f6b9b519241f7c01a2aa587f6317b77f2c42
Merge: ac2be68 635598e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 29 13:34:09 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b54fecc41bff4b737284410268f692ee37532cf8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 29 13:33:20 2013 +0100

    Added page title on main sections

commit ac2be68d78394044cc385b5906ca522d3f581848
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 29 13:33:20 2013 +0100

    Added page title on main sections

commit d0e9f574ad17352120bc4fe54218b95104817ef7
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 29 11:53:40 2013 +0100

    Fixing a missing route.

commit 635598e2814aad9943858705a76ff2af96136f89
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 29 11:53:40 2013 +0100

    Fixing a missing route.

commit 6421499bcef17b5592d041767d9d5f14c08bf7ff
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 29 11:08:38 2013 +0100

    Adding a missing route.

commit 7941fced1dfd1238d694a46e172fdf302b903e2b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 29 11:08:38 2013 +0100

    Adding a missing route.

commit 93cbecb20d7b46dddba4d4cf17a5777c07716de3
Merge: 7d16321 c3bba70
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 29 10:57:28 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Entity/User.php
    	src/core/Claroline/CoreBundle/Tests/Entity/UserTest.php

commit 32949f945138ba063548ee360a743a7d801b671b
Merge: b1eef77 a57eff8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 29 10:57:28 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Entity/User.php
    	src/core/Claroline/CoreBundle/Tests/Entity/UserTest.php

commit 7d163214d056cf29e5461e2177c3c834fd304ff2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 29 10:46:11 2013 +0100

    Submodules update.

commit b1eef77c99b30e7671826bbabb5ea5d6b439ade7
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 29 10:46:11 2013 +0100

    Submodules update.

commit 41e249f56fdded7b3d4aae449955db3e1ba1af91
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 29 09:52:57 2013 +0100

    Using annotation for routing (part3).

commit f362ed49b960531c4a5f0529658a354fbb2279d1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 29 09:52:57 2013 +0100

    Using annotation for routing (part3).

commit a57eff88ca952a8d53b7b174691bd5fa9e453238
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 17:53:09 2013 +0100

    Submodule update

commit c3bba70fdc5bc41544ab088293f7415d64c7b3f1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 17:43:41 2013 +0100

    Fixed 403 bug after workspace creation

commit 749850679fdeeb22f48d938bd4cde44dd4437aaf
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 17:43:41 2013 +0100

    Fixed 403 bug after workspace creation

commit 5aff7fdced68a74c85a4fbb894e9c507c87e326b
Merge: 5809ef8 92203ee
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 16:18:07 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e6af3c99ffe3e4df5832c3c040e58f39e9fa3a24
Merge: 7ccc235 132979d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 16:18:07 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 5809ef8ffc2f4a74e941a466dcb40093592dc12a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 16:18:00 2013 +0100

    Fixed displayable tool in workspace bug

commit 7ccc2356823b4a422edb22c7b0bbd08977a7fe4c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 16:18:00 2013 +0100

    Fixed displayable tool in workspace bug

commit 92203ee97c1ae6f396438b9cb476262d40b2c673
Merge: f72f463 d0e3199
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 15:49:03 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 132979dbbe39711f77962e531b823e235ea28842
Merge: 9db7e4d 208b007
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 15:49:03 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f72f4631bcd0c465d9a663814c8113e4c55fd2fd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 15:48:52 2013 +0100

    Reduced findByCriteria cyclom. complexity

commit 9db7e4d537b07c9e0b9e24ba3693a556922e1384
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 15:48:52 2013 +0100

    Reduced findByCriteria cyclom. complexity

commit d0e319991f79653121055af024337cfd2e96b102
Merge: df16000 6f686d6
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 15:38:52 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 208b0079ba055d3e5161f5e7d58a0f2078d910e4
Merge: cd81842 7e47605
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 15:38:52 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit df160000354585685bdf13ba24f764f3c62efd54
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 15:37:43 2013 +0100

    update tool name display

commit cd81842cc398b2cef88ae037c247665315b3201a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 15:37:43 2013 +0100

    update tool name display

commit 35c72257e3a5295e7b571da85c1a64a36332053d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 28 15:08:26 2013 +0100

    Using annotation for routing (part2)

commit baead6a016e5a11cc6a988605090c86857fbdde4
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 28 15:08:26 2013 +0100

    Using annotation for routing (part2)

commit 7e476054def5498de3288b1fcd956b1eb14f632d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 15:05:55 2013 +0100

    Submodule update

commit 6f686d61ff096a5f7cd34951e06605eee2613796
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 15:04:27 2013 +0100

    Removed var_dump

commit 9b8a536b7f89886cbfea2f8d00bac9cdc35712c1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 15:04:27 2013 +0100

    Removed var_dump

commit 657084986beddd9d673dbf7b68662fa332817632
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 15:03:03 2013 +0100

    Fixed resource date test

commit cd51d272af7d7e848b394e54027f8b5506f693c7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 15:03:03 2013 +0100

    Fixed resource date test

commit 23510f0538b68abcfae0ee23198e4530a8e2aadb
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 14:37:38 2013 +0100

    disable workspace history when empty

commit 7573eafb623b4e3169f0b2d71b276300d0ed654a
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 14:37:38 2013 +0100

    disable workspace history when empty

commit fc55bfdfed596a686b650d45d04838698949155e
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 13:56:11 2013 +0100

    no workspace history submenu when empty

commit a375a8d02d8cd4b2245a803adb8104ae7f22b2f5
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 13:56:11 2013 +0100

    no workspace history submenu when empty

commit 26669b57916add5f8fe2552baaaea55a80ec2e96
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 13:47:35 2013 +0100

    Submodule update

commit 6753f493134388c1cdcc779f2cb21c2066ca3248
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 13:46:27 2013 +0100

    Fixed user test

commit a30b3a445ac51b04620051ead6db5cb26273f309
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 13:46:27 2013 +0100

    Fixed user test

commit f6a474d0b2fef87df5873cf9f4cbe72d32ba689c
Merge: 829bc32 2d9539c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 13:45:05 2013 +0100

    Merge

commit 842ded2a42bef02c25047ce7656eadb359371a59
Merge: fe4154b 63a99d2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 13:45:05 2013 +0100

    Merge

commit 829bc320b42b05533f1d332170f3b18a75d15b58
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 13:39:18 2013 +0100

    Resource repository and builder refactoring

commit fe4154b8f29a866bd23384736f2e8fa2c2548694
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 28 13:39:18 2013 +0100

    Resource repository and builder refactoring

commit 026e8fbfdb16820a3b1394083a2f78884bb71f50
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 13:06:04 2013 +0100

    display current workspace in top bar

commit 7814f641ca31c1034f2cb0f104b06a644cc77e88
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 13:06:04 2013 +0100

    display current workspace in top bar

commit 8b96328ded21f11821ac2742aa3a110cb6c06f51
Merge: 1dd9b0f 2d9539c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 28 12:08:34 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c6b9f665a4295fe75883feb1ebac78920099da36
Merge: 8cecb6b 63a99d2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 28 12:08:34 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1dd9b0ffc6210e149479cc60f5e648557b2448b0
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 28 12:07:58 2013 +0100

    Fixing the user entity broken test.

commit 8cecb6bc1a376e7facf72e710feffba00ba2f518
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 28 12:07:58 2013 +0100

    Fixing the user entity broken test.

commit 9bf97dd606dec57dd28e045afba92418a8ab9a2e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 28 11:23:28 2013 +0100

    Using annotations for routing (1 part).

commit ee1f2ccc9edeeab674278700cef99049132950f9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 28 11:23:28 2013 +0100

    Using annotations for routing (1 part).

commit 4fd96f7ba3e942ead6a57108ed4ad2b82f351e47
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 10:50:33 2013 +0100

    clean LayoutController code

commit a5ec5ad0997de08f9677d9a908de15b179090ea9
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 10:50:33 2013 +0100

    clean LayoutController code

commit 63a99d2d1d176de0e3b1c5c5f51a71506552047d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 10:16:29 2013 +0100

    submodule update

commit 2d9539cfd4a31b3b6da44ee5b4e34987d4c26e94
Merge: 248f86c a8f91f4
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 10:13:07 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 3e733bd6d0723b637e8d90d76a21f28d3f782b58
Merge: bf11360 de09cf6
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 10:13:07 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 248f86c7061b4788b2133e5d7a241114dcb58581
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 10:12:52 2013 +0100

    added workspaces history

commit bf1136080a11d67ac2744ffe5d3525e1ccfca0dc
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 28 10:12:52 2013 +0100

    added workspaces history

commit e764f7fb427bc313c6c219b6efa6cbc9cfeb5125
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 27 16:37:00 2013 +0100

    Fixed rename resource bug

commit 733e9ca93facedecaf5da6abb81c62ec727e0803
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 27 16:37:00 2013 +0100

    Fixed rename resource bug

commit a8f91f460da3c139e6342f6799d5bac3a7789da0
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 27 15:47:48 2013 +0100

    Admin can impersonate a user.

commit de09cf6b41ba2dcf78011d87b0dab71015405579
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 27 15:47:48 2013 +0100

    Admin can impersonate a user.

commit 91eb659296ee98ea471a5c597051b664ff7dee41
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Mar 27 14:02:42 2013 +0100

    Added log when opening a workspace

commit e0ee0cd81cc8e42228bda51033080cade23a52f6
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Mar 27 14:02:42 2013 +0100

    Added log when opening a workspace

commit 783c07faab73aa69c177eed922f7800ced7a331b
Merge: af91441 2b166ec
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 26 17:26:21 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/InstallController.php
    	src/core/Claroline/CoreBundle/Form/CalendarType.php

commit 5cee2b93d35ffb3f4b19d28694102b8fef86fda6
Merge: 9589a26 2fd19c7
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 26 17:26:21 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/InstallController.php
    	src/core/Claroline/CoreBundle/Form/CalendarType.php

commit af91441479a051e460e26eb084ec1f045825b212
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 26 17:23:23 2013 +0100

    Refactoring the workspace export/import + tests.

commit 9589a2658777829f9155019a76ce6b91ba88c590
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 26 17:23:23 2013 +0100

    Refactoring the workspace export/import + tests.

commit 2b166ec6dd1a2c51d6e892f1911e1c67db3a3ba9
Merge: 21941e0 f5ac3be
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Mar 26 16:42:38 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2fd19c73173c8456720edf1e2fdd0ac34511707b
Merge: 89b5853 a5d4de9
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Mar 26 16:42:38 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 21941e0514bd19bd18a8e4104748cd934e3be6cc
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Mar 26 16:42:19 2013 +0100

    Added tests for message restore and permanent delete

commit 89b5853f2d0ff654a03d5e5ef58947ec45c1886c
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Mar 26 16:42:19 2013 +0100

    Added tests for message restore and permanent delete

commit 03abc261e25870a58362f8fa27fc8dee5fb8d29d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Mar 26 15:37:59 2013 +0100

    Fixed MessageController bug

commit c30c756068bec8620af256b78607379fa2db5011
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Mar 26 15:37:59 2013 +0100

    Fixed MessageController bug

commit 9800502368668089065f064301d00d188cd41856
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Mar 26 15:07:57 2013 +0100

    Update search in message

commit ca567b4f0e4f8d2d3ce179fa397b8d3bcae57a53
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Mar 26 15:07:57 2013 +0100

    Update search in message

commit f5ac3be36852ce8530799066e0d2b0f2cf973e84
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Mar 26 14:24:00 2013 +0100

    get -> setdefaultopion + bindRequest -> bind(3)

commit a5d4de9ea878030634013b0e5d5024b23c924139
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Mar 26 14:24:00 2013 +0100

    get -> setdefaultopion + bindRequest -> bind(3)

commit 25bcb5cd6ad5a7a0fe2bc6351e86f47936062a93
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Mar 26 13:34:45 2013 +0100

    Added message permanent delete and restore from trash

commit 2d112ec113ce290f77a98de17f38b66c2aab4b09
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Tue Mar 26 13:34:45 2013 +0100

    Added message permanent delete and restore from trash

commit f7c06297c868ae4939d29a8e42eacff695c2ec18
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Mar 26 12:01:59 2013 +0100

    get -> setdefaultopion + bindRequest -> bind(2)

commit 89b16ad97ca8ffb86ca775e63a74e9bcb03fe3d5
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Mar 26 12:01:59 2013 +0100

    get -> setdefaultopion + bindRequest -> bind(2)

commit 73c8a4e63a8f786eb0fd091a768b82aff2364901
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Mar 26 10:19:46 2013 +0100

    fixed pull

commit defdb16f04eb47cda17a8b872a93a842c6d89317
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Mar 26 10:19:46 2013 +0100

    fixed pull

commit 6d26ee317c1871be50516d9235ac0005f92da866
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Mar 26 09:57:32 2013 +0100

    get -> setdefaultopion + bindRequest -> bind(1)

commit be8b267502dd491ee43a98b6b7b2b6e8d42cd0de
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Mar 26 09:57:32 2013 +0100

    get -> setdefaultopion + bindRequest -> bind(1)

commit d33a3e1d6f19847bfa16bf1bd0b87aee74076c47
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 25 11:53:32 2013 +0100

    add optionresolver to installtype,admintype

commit 7fd076b40cbd17deccbcb49a2d39f475eb311a9d
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 25 11:53:32 2013 +0100

    add optionresolver to installtype,admintype

commit dfd4f878d8377af36aa09151188c73f5c9a893d3
Merge: 00e3213 b050952
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 25 10:40:10 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Form/CalendarType.php

commit f86c837c242544bee657aa37f6caeaf100c7fc6b
Merge: 7b80e8e d10e48a
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 25 10:40:10 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Form/CalendarType.php

commit 00e321353c805a6283fad173da6c871f56c009a4
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 25 10:28:23 2013 +0100

    add the optionresolver for calendartype symfony2.2

commit 7b80e8e4d1a6e7265ae0a0b21431a133260c9856
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 25 10:28:23 2013 +0100

    add the optionresolver for calendartype symfony2.2

commit d10e48a75f52703abc925c0eb8804c825183d468
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 25 09:41:42 2013 +0100

    Submodule update

commit 273be01ba08ae915f7c4baa99af0d8e96dc24cce
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Mar 22 14:56:37 2013 +0100

    update translation for message layout

commit 5ef5559f8f9d3100bbae74400fde022ce032ff14
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Mar 22 14:56:37 2013 +0100

    update translation for message layout

commit b050952c1639c44d7d0ecd8f519cb434a1bdd030
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Mar 22 14:37:00 2013 +0100

    Fix tools duplicate bug in tool parameters

commit d9ce4bfe252921f33a4a357d83ee4c9f1fb97e14
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Mar 22 14:37:00 2013 +0100

    Fix tools duplicate bug in tool parameters

commit cc5d31365165162e0bf0074cfb89a45e2195c64d
Merge: cdb7d8c 86a86cc
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Mar 22 14:06:53 2013 +0100

    routing update

commit 4eb9c187a6b8589e9329f1671bed146b43343ea0
Merge: bb4d8f1 8bd4271
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Mar 22 14:06:53 2013 +0100

    routing update

commit cdb7d8c48c012554dac8fca209ec9440a7b2b96f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Mar 22 13:57:19 2013 +0100

    Added tests for WorkspaceOrderTool translationKey rename

commit bb4d8f1ae7fe58109fe8226ddddd543ece3ed1ca
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Mar 22 13:57:19 2013 +0100

    Added tests for WorkspaceOrderTool translationKey rename

commit 86a86cc1c61779e7791ffdda66aa0aa903ff0236
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 22 13:30:38 2013 +0100

    Lowercased plugin name

commit 8bd4271a814af9b4ac0e564635766ea07747b65d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 22 13:30:38 2013 +0100

    Lowercased plugin name

commit 7c593bc00c213353f26fc3537ff9233a776fac04
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 22 12:25:59 2013 +0100

    Submodule update

commit c123e6c7afd9625e374853ed8ebd062ced191171
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 22 12:24:13 2013 +0100

    Fixed syntax error

commit 4307eb69ce538f6821ef6bb231d0cc9fe1509c90
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 22 12:24:13 2013 +0100

    Fixed syntax error

commit a27445db1ef4c7d0252d8ae646407c4db3314019
Merge: f808c2d a12c846
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 22 12:18:21 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 78b33b7a5fb5d00c526ec6b6245c316489c43816
Merge: 3399b10 7bd9649
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 22 12:18:21 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a12c846ac57400edb08c0157132413d975f16767
Merge: dc075bf 8988cc1
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Mar 22 11:50:46 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 7bd96496c3e89d4e9338a603744b1807341143b4
Merge: 79b3344 34690ec
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Mar 22 11:50:46 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit dc075bf81fb7fbc92c43bf61ac580fd0408d687c
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Mar 22 11:49:17 2013 +0100

    change getdefaultoption to setdefaultoption part 1

commit 79b33446ed680f28ebe6d1b7d425025dd40a1251
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Mar 22 11:49:17 2013 +0100

    change getdefaultoption to setdefaultoption part 1

commit 3fbefb7433166ac8f2325932b367cd3d51f9d397
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Mar 22 11:44:03 2013 +0100

    applied jshint on calendar.js

commit 7c0c3207e8abaf896a141ea80f769cd9973f0ea1
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Mar 22 11:44:03 2013 +0100

    applied jshint on calendar.js

commit aa854a7176b7eeb47daf0282109d3ff3665202a9
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Mar 22 11:10:28 2013 +0100

    Added unicity for WorkspaceOrderTool translationKey

commit ba2649152344d906d580cf22156bf81f8cb5365d
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Fri Mar 22 11:10:28 2013 +0100

    Added unicity for WorkspaceOrderTool translationKey

commit 878b8b471193ff32c21f9c17bd2a8ce79d1e8a0a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 22 11:06:15 2013 +0100

    Checkstyle.

commit 972a35da90fd1c8589b6ca8f79f3cab6ae909bfc
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 22 11:06:15 2013 +0100

    Checkstyle.

commit f808c2d163244e096c5028f02c3cdbacf97e11eb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 22 11:03:07 2013 +0100

    Changed error reporting in resource manager

commit 3399b10d19bb1bd2b860e7f109f371cea2f6ef9c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 22 11:03:07 2013 +0100

    Changed error reporting in resource manager

commit 8988cc14e5b2143f438aac8f20b854cbb0b34de3
Merge: 246ae9a 4ad450e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 22 10:50:56 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 34690ec35c8c15234cc8afd7637f5260fd475e96
Merge: d72aa7c 060179a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 22 10:50:56 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 246ae9a0bcbd2e138d53734bb47488186f486a19
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 22 10:49:58 2013 +0100

    Updating plugin event's name and exception thrown.

commit d72aa7c9b03f84811a5692c859461c165eefa021
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 22 10:49:58 2013 +0100

    Updating plugin event's name and exception thrown.

commit 060179a05b6646a9d6bc8171e934bf3a99253005
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 22 10:00:03 2013 +0100

    Submodule update

commit 86dbe5c9720b92cf3670db51026006b3345e6c95
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 22 09:59:44 2013 +0100

    Downgrade forum version

commit 4ad450e2d3917f8f6c34967f837bbd5bd89cfb07
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 22 09:19:09 2013 +0100

    Fixed wrong repo urls

commit cdb46ba789beb442e232f2f555b478ebbe4044d3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 22 09:19:09 2013 +0100

    Fixed wrong repo urls

commit 07cea456bbf45d5412729ac7dae90e0741080809
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 22 08:55:53 2013 +0100

    Restored default platform options

commit e7a27ac2767ccb9749da930477696638c677617c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 21 17:32:48 2013 +0100

    Submodule downgrade

commit a07abd412b414946ac82212645f33d0b45641cac
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 21 17:01:36 2013 +0100

    Added tool name edition

commit 162166fc895a32aff22ba043e2fc34dc3487d7ab
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Thu Mar 21 17:01:36 2013 +0100

    Added tool name edition

commit 992de3990cdb3a4a1ea0ef4fb4be9769f8133028
Merge: 8f510c9 65a5d76
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 21 16:46:44 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c38de464b663b569145e60ef62c8a7259568d854
Merge: e259864 c7c76d8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 21 16:46:44 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e259864bc8146c1c3fedf538271a0c9fdcbf2b37
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 21 16:46:23 2013 +0100

    Submodule update

commit a5883e855d72634135d01d1b10fad0034b66f9c9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 21 16:44:48 2013 +0100

    Removed gitignore duplicate

commit eae04a0bec09f6cf5c117866810fade5ed7efff9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 21 16:42:13 2013 +0100

    Removed unused exclude rule

commit 8f510c977ddd4abfb9cc5c32d80360d4c5de497a
Merge: 108f777 f3a7d80
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 21 16:40:00 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	templates/default.zip

commit 54bb8f23804a6dd8708b30bb9466e944f5c30381
Merge: 2ceac96 75e0361
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 21 16:40:00 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	templates/default.zip

commit 65a5d764c1bcc256406138cbac79527788d527ff
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Mar 21 16:37:24 2013 +0100

    traduction for the dialog box in message

commit c7c76d83bf783c93554108662af626cd7dfd5daa
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Mar 21 16:37:24 2013 +0100

    traduction for the dialog box in message

commit 108f7771e39f4ff8fe4c167898c75566eb6df272
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 21 16:35:56 2013 +0100

    Added doc about dev tools

commit 2ceac96c9b1e82a44044dabc47023a6d97f8c9dc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 21 16:35:56 2013 +0100

    Added doc about dev tools

commit 326eccaf5592f0c6750997582b0880453bdc39f5
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 15:46:14 2013 +0100

    Adding is_exportable field to the ResourceType entity.

commit 7fc2b19e1fd1aa48ab0ff42705b000ac69669337
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 15:46:14 2013 +0100

    Adding is_exportable field to the ResourceType entity.

commit 75e0361c15e90928ea9ce2a62d49809abed173cb
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Mar 21 15:12:33 2013 +0100

    delete install.yml it will not be tracked anymore

commit f3a7d8044cded93575d2922e801fa1050d098f04
Merge: 25a039d ab1291b
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Mar 21 15:09:44 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 64df2e73864b03275f96103741e95a006176c4a3
Merge: 69f4e6d f77a456
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Mar 21 15:09:44 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 25a039d5c4e0e7233b00c1d694d44d3e672bcf44
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Mar 21 15:08:01 2013 +0100

    translation and event aggregation for calendar

commit 69f4e6dcf23271a9e1cfdd3d1ca6530e401d4858
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Mar 21 15:08:01 2013 +0100

    translation and event aggregation for calendar

commit ab1291bc902998765a711cbbaa785b870c4d5780
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 13:41:50 2013 +0100

    Adding flush at the end resourcemanager create method.

commit f77a4565cf504ebaac33627277879a160042bfdb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 13:41:50 2013 +0100

    Adding flush at the end resourcemanager create method.

commit 2f8984d043bcfd861bd7db0a6834c317e0eb1ac1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 13:08:43 2013 +0100

    Removing a todo.

commit bce322842f97c267f406572b1798bbe97ad9642b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 13:08:43 2013 +0100

    Removing a todo.

commit 5645256e4759fd476a8736117e3c87aafa8b24e6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 12:55:35 2013 +0100

    Submodule update.

commit df4d1fc1019f0c11546225c12735b71672e239df
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 12:03:50 2013 +0100

    Fixing a textRepository method + redirection.

commit 2e76a61c07dbf00ea9f87fbf8fe46f544dec1e58
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 12:03:50 2013 +0100

    Fixing a textRepository method + redirection.

commit 7580ee1585af6da37630bc00c69c6cafadd970cb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 11:55:10 2013 +0100

    Administrator can access every workspace.

commit 433ccda309fb4371d0c0f26195b35c76c1072fc1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 11:55:10 2013 +0100

    Administrator can access every workspace.

commit b51bf3120c8e4a53ef8255abffeb780ef5482444
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 11:32:44 2013 +0100

    Fixing the tool bar for the admin (wrong name were displayed).

commit b287548420bb7873a2c76fdfa00f38e9b2575489
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 11:32:44 2013 +0100

    Fixing the tool bar for the admin (wrong name were displayed).

commit cafecd2734f9d7a83b1a3d7b479277a5b6ee9381
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 10:53:09 2013 +0100

    Adding missing parenthesis to function call.

commit 01d4497d0a5df0d3085a567bb0e5b0709ea634ad
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 10:53:09 2013 +0100

    Adding missing parenthesis to function call.

commit aa5a7f6f4c442ec860f90ed14bfac32ba0b7ec98
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 10:33:59 2013 +0100

    The user is passed throught the events of the workspace creation.

commit 08899b495c39960c9d515475c77c5a999399cf0b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 10:33:59 2013 +0100

    The user is passed throught the events of the workspace creation.

commit 7c94e2c87a57e22303c88222f46c58521a60760f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 21 09:53:06 2013 +0100

    Updated default template

commit 49802ceff1b26c8fb629f6b73f3e253b89d1fd4e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 21 09:49:20 2013 +0100

    Submodule update

commit 232c4fbbac3e47c348d3908f6bda4d89014b93fc
Merge: 7168636 0d5dc8d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 09:32:42 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d284264eff3ad09864508a93ba2291d1f3dc742b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 09:31:58 2013 +0100

    Fixing resource rights creation in the Manager.

commit 716863643a233f83e7c16f00d6a15fb1280eff36
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 21 09:31:58 2013 +0100

    Fixing resource rights creation in the Manager.

commit 0d5dc8de3b025532c13c69d8fade441408ae0837
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 21 08:33:59 2013 +0100

    Submodule update

commit 02a8771306464a8e3453005d96cce771ed6cfd5f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 20 17:35:07 2013 +0100

    Removing the last revision from the text.

commit ddf744b22931eff81885d25bd96bc5704e7b1d17
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 20 17:35:07 2013 +0100

    Removing the last revision from the text.

commit 27522628bd5bcb7dd8c4d5aa35cd84a6523aa524
Merge: 04186e5 eb82fd5
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 20 16:33:33 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit fb59a292b0ece3feca5e8f0cd192f9d8d320f2fe
Merge: 4a9f002 5da6a45
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 20 16:33:33 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 04186e5e04a547b65c378d05fc0a115540b443c8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 20 16:32:28 2013 +0100

    Uppgrading the workspace export system.

commit 4a9f0024967fb2c30448a3849ee06ea29fd805cb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 20 16:32:28 2013 +0100

    Uppgrading the workspace export system.

commit 5da6a45a2d9f9c699cf174eccc2e1edc4c468b51
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 20 14:57:27 2013 +0100

    Submodule update

commit 5570efcf8b06bd2edce01fe9670f7cc1a46fe839
Merge: 070a79f fa94d5f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 20 14:42:37 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 070a79fa68833d01fec6dc3e37a06e341a017e51
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 20 14:42:26 2013 +0100

    Submodule update

commit fa94d5f9a29b84903078cdd7a720e64403973ce1
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Mar 20 14:25:11 2013 +0100

    submodule update

commit eb82fd58189c443b30a3480019d5e9cee32d945c
Merge: 8978ebd c345cd3
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Mar 20 14:20:40 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 08ad4e90c6cf164d32e8ecbcf60848539207317a
Merge: bbd8adc 3875451
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Mar 20 14:20:40 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 8978ebda8d7771ccefa0e1bdf6e09254ec0771e2
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Mar 20 14:20:23 2013 +0100

    added foreign key for Text resource

commit bbd8adc39d1e5123fb21571a69bed6a06fcf4d78
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Mar 20 14:20:23 2013 +0100

    added foreign key for Text resource

commit 637ba9b733b98cd50a9dbfac2097b2b6116a637f
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Mar 20 14:19:35 2013 +0100

    submodule update

commit c345cd30aa8647e90463bc4e3614dc37cbba7e41
Merge: 4e928a5 d404b5f
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 20 14:12:38 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 387545182af2da8232465375476fef0d9fb0021f
Merge: 1c66687 8aa5e6d
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 20 14:12:38 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 4e928a53945e49e7907a94161deaeec16cc443e7
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 20 14:12:26 2013 +0100

    Home traduction files no longer used

commit 1c666870a6acea7087a21f2bee775020ad04323d
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 20 14:12:26 2013 +0100

    Home traduction files no longer used

commit a5e5e1236338272895fa419f3ef6f22db722f491
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 20 14:11:59 2013 +0100

    Home page update

commit 1d13d27feebc5f078dcdbdd48b281105bf745fcd
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 20 14:11:59 2013 +0100

    Home page update

commit 8aa5e6df7b0b47126427eb89246a737743944f89
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 20 12:51:56 2013 +0100

    Submodule update

commit d70145d04e1b419d89641f19c8f16f5c871fd453
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 20 12:07:44 2013 +0100

    Submodule update

commit eb86218928b062de6263a7a14fde4a957bf74ce9
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Mar 20 11:01:59 2013 +0100

    throw an exception when a plugin doesn't respond to a resource creation form event

commit c24f4a0a839802e479de6ec0002bf385f6fd74cb
Author: kitan1982 <anhthao.pham@claroline.net>
Date:   Wed Mar 20 11:01:59 2013 +0100

    throw an exception when a plugin doesn't respond to a resource creation form event

commit 3d45e71109788e7960bcdb3288f2ca5c797f3b06
Merge: d573b3e f3ada0c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 20 10:37:35 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d573b3e3a923262a0d69aded1f7e810c42e32029
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 20 10:35:19 2013 +0100

    Submodule update

commit d404b5f4e9ff5970eaa639557896f9b9ff293a00
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Wed Mar 20 09:43:58 2013 +0100

    Fix integer-to-boolean cast in MessageRepository

commit f3ada0cb9c84f00eff2fd1c8324bfc57427c1a01
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Wed Mar 20 09:43:58 2013 +0100

    Fix integer-to-boolean cast in MessageRepository

commit fdcfce3df8e370e3684433c365a52fb4b5918263
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 19 17:18:29 2013 +0100

    Updated composer lock

commit 7308f90504b6941d10809e6132d2c8e84810dbfb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 19 17:15:19 2013 +0100

    Submodule update

commit 4cd410fee7e8e274bdc2ef1b68597453c77cc93f
Merge: 215ca7a 826d78d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 19 17:12:58 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 215ca7a23b1809c11139a7ad3cfbeb2b2476b408
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 19 17:12:33 2013 +0100

    Added ICAP ReferenceBundle

commit d4d4f290db79bc54c0b6c224c416c12537a03ab6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 19 17:10:56 2013 +0100

    Added PagerFantaBundle

commit ae7376b371b87d3cec7f9913978a44d10930d7a3
Merge: ebe4211 0c026a9
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Tue Mar 19 16:29:43 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 826d78dfd900025d7b6e9b017b38bfe54a78bca2
Merge: b5ff9bf 1bee19c
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Tue Mar 19 16:29:43 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit ebe4211be2022c93571902c06f612a8cbbfb50ac
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Tue Mar 19 16:29:16 2013 +0100

    Fix integer-to-boolean cast issue in Message table

commit b5ff9bf694869d10313b07617ff31706184566af
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Tue Mar 19 16:29:16 2013 +0100

    Fix integer-to-boolean cast issue in Message table

commit 0c026a906a28f7694d5b145358bb87ecad439595
Merge: 3023d46 4e05d50
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Tue Mar 19 16:07:39 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1bee19cf6c1ee515ba9ca706c768fc420bcc0f61
Merge: 816721c 0edb3ba
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Tue Mar 19 16:07:39 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 3023d46c6931f99ab0c80feafc145274a72db804
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Tue Mar 19 16:07:11 2013 +0100

    Fix bug in ParametersController

commit 816721cc90dc48960bc43af9388bf6481619f28a
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Tue Mar 19 16:07:11 2013 +0100

    Fix bug in ParametersController

commit 4e05d507f7db9433657eaa526898e9d587f09b32
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Tue Mar 19 15:26:00 2013 +0100

    CheckStyle

commit 0edb3ba2318de3dd3ddb095481fc12d854e10621
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Tue Mar 19 15:26:00 2013 +0100

    CheckStyle

commit 56accf95800b6603324c075745ff039470d81d19
Merge: e0c22e5 fad4654
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Tue Mar 19 14:50:39 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 8e8217c4b5830160757ac770bbf0303055239d81
Merge: 82eea9c e1a9010
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Tue Mar 19 14:50:39 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 82eea9c99c9e9ae883cda838740e2c6cf8f18a22
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Tue Mar 19 14:50:22 2013 +0100

    Update submodule

commit e0c22e51b60882f3c3fb5576388efad6d5439f2f
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Tue Mar 19 14:49:27 2013 +0100

    Update Icons

commit 0a1114dbb6d00dd2e9ea103f9c106cb760b518f1
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Tue Mar 19 14:49:27 2013 +0100

    Update Icons

commit e1a90101d1f5c8e426b7d0d4a77b9ca72f7b2550
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 18 16:34:15 2013 +0100

    Submodule update

commit fad465473f7063a19d06eeaf2ebc12c072c52c36
Merge: dee49cd 1124d15
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 18 16:21:28 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0d8fc4bfe1cd3b151a5d74a662d6359224f8378e
Merge: ccfaac3 630c8d8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 18 16:21:28 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit dee49cde4414f192c076f0b0078dc4fdcf170032
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 18 16:12:21 2013 +0100

    Skipped test broken due to Symfony upgrade

commit ccfaac39e3086203d767b738844d80e8309829d4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 18 16:12:21 2013 +0100

    Skipped test broken due to Symfony upgrade

commit db64173412a63be654dee2cf5dd756c194e765a4
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Mon Mar 18 15:47:02 2013 +0100

    throw an Exception when a tool doesn't respond to its open-tool event

commit a04c6b2c7719eb3635c8c0b215a68f60d3f86802
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Mon Mar 18 15:47:02 2013 +0100

    throw an Exception when a tool doesn't respond to its open-tool event

commit 078c250c669802ddc9c1b572b0263f8614b0fdd0
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 18 15:09:52 2013 +0100

    Fixing an uninitialized variable.

commit f62aef4566cf20bc588f9f7884419258867f49f9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 18 15:09:52 2013 +0100

    Fixing an uninitialized variable.

commit 1124d15a63df39869bec8a9e79c4f3223d2a980e
Merge: da58b7d ca96c2a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 18 13:59:36 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/plugin/Claroline/ForumBundle

commit 630c8d805b83fdd370b00f6679e2dbd659976dab
Merge: 19063cb 61d36ce
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 18 13:59:36 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/plugin/Claroline/ForumBundle

commit da58b7d5ecd25934ffdd4add1fbfa239873e10b9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 18 13:53:09 2013 +0100

    Updating plugins dependencies + checkstyle.

commit 19063cb9f1a5c8a33d2b1e460710a3c14667c81f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 18 13:53:09 2013 +0100

    Updating plugins dependencies + checkstyle.

commit ca96c2abbd9a412dedf07f0ee675f90dda865703
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Mon Mar 18 13:20:48 2013 +0100

    DQL request update

commit 61d36ce9edade685761487dfae612cca20d0f0d4
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Mon Mar 18 13:20:48 2013 +0100

    DQL request update

commit ce74ba0f9c614daff653eb9074bb1104c3380d66
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Mon Mar 18 11:00:48 2013 +0100

    remove anonymous role from group settings form

commit 63200510506727c5244b02be21df9be7105c546b
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Mon Mar 18 11:00:48 2013 +0100

    remove anonymous role from group settings form

commit d41be6cc909206faf3a5fbf0060ca54d71b1251c
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Mon Mar 18 10:53:51 2013 +0100

    remove anonymous role from user creation form

commit 8f1e29a83136966936ffc3a40b485524ebaa5f09
Author: Anh Thao PHAM <anhthao.pham@claroline.net>
Date:   Mon Mar 18 10:53:51 2013 +0100

    remove anonymous role from user creation form

commit 79df057fb24e85f202b0f0dea704f9a40ed1466a
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Sat Mar 16 19:33:42 2013 +0100

    Fix zoom error in resource manager

commit 2ddcc02fd765a9613df2f1e19d0c3359dd2b3377
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Sat Mar 16 19:33:42 2013 +0100

    Fix zoom error in resource manager

commit be8d147717f87821f86d82c58075c06f7d3b92db
Merge: 2848ec6 31e15bb
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Sat Mar 16 17:47:26 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 5a42e256a111a67706b3a84c2237a070c21a4a5f
Merge: f8333c7 7d3ba52
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Sat Mar 16 17:47:26 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2848ec682d8ac15d0f9860828f33bd50d141b57a
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Sat Mar 16 17:46:52 2013 +0100

    Zoom content in the resource manager

commit f8333c76d128ed16c40a3fbda76f47eac498492b
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Sat Mar 16 17:46:52 2013 +0100

    Zoom content in the resource manager

commit 7d3ba52287351290e655ab5730bed552aa42bdb7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 15 16:00:41 2013 +0100

    Added reference to Imavia profile bundle

commit 31e15bbd8969e6e04cf3b9b67b04ba3b0c460ee3
Merge: 5264040 c964584
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 15 14:22:10 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6a7a11e9104f5ec2b0ca83c3c62c0a304bd94aaf
Merge: 079ac8f a53b521
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 15 14:22:10 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 5264040c6e6bafec0353b55403c5ec8734549328
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 15 14:21:57 2013 +0100

    Upgrade to Symfony 2.2 (+ dependencies update)

commit 079ac8fd38cc5d605355426cf169452483e26bd1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 15 14:21:57 2013 +0100

    Upgrade to Symfony 2.2 (+ dependencies update)

commit 734c0f9b73568fce489514960f129827bb76faa0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 15 13:35:12 2013 +0100

    Fixed twigjs location bug

commit d550e155e0e84afa761755041030a5cf292048e4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 15 13:35:12 2013 +0100

    Fixed twigjs location bug

commit c9645849cc1e1f945656c59a1475bb58314ee59d
Merge: 8d267aa 12ef36e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 15 11:52:28 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a53b52174d66be0cd6e74f0219a6225996ddf6d4
Merge: f4314d0 212ab74
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 15 11:52:28 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 8d267aa3bffb79ef35deb0688c89c64e6c4831e9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 15 11:50:27 2013 +0100

    Some small refactoring of the template export (name changed).

commit f4314d032f690ffde82332a1b0771d14d53d0a42
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 15 11:50:27 2013 +0100

    Some small refactoring of the template export (name changed).

commit f1596aad729bc48aa16a9b1a6571e298b2070638
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 15 09:31:11 2013 +0100

    Removing the big buck bunny video.

commit 3099cd7be4b0f8128e368cfe472831bcd2f37c00
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 15 09:31:11 2013 +0100

    Removing the big buck bunny video.

commit 212ab74bb213e8f01c8d107ec92985dafbba61ee
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 17:11:58 2013 +0100

    Submodule update

commit 12ef36ed92117ddedb33deb595a21026a51bbb73
Merge: cd8e4d3 d1aae76
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 17:09:44 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a5fe5ef8ee8cc018ca58c1dee43d39982c87a935
Merge: a360f3d 7f59b2c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 17:09:44 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit cd8e4d39a0fdfd062e23bb677ea002b16977caac
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 17:09:01 2013 +0100

    Make a hard copy of twigjs in web dir

commit a360f3dec3ed03497f43c45589b995b32d7fa6d7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 17:09:01 2013 +0100

    Make a hard copy of twigjs in web dir

commit 64944a7cfe7f0932ec87dc1634e52cec104f7ade
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 14 16:15:18 2013 +0100

    Removing duplicatas javascript imports.

commit 503cbe6678511d6b27588c8abf50b34c3665e4cb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 14 16:15:18 2013 +0100

    Removing duplicatas javascript imports.

commit 70633bf53e45a7f8f4f2efd0ef39c3c0a4900b3f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 16:12:35 2013 +0100

    Removed duplicate reference to twig

commit 619d1720ba1e22ace858e6f26647bcf9d999f2cf
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 16:12:35 2013 +0100

    Removed duplicate reference to twig

commit 7f59b2c3e31b835f23b4db41466e03cbe128bf0b
Merge: b80bace 18c80ff
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 14 15:47:19 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 18c80ffba7306bd473209d06140d74bb0db7f857
Merge: 76bbb33 0363b4e
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Mar 14 15:28:11 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 76bbb33fc91e6039b79373c5e4415a8c1e970355
Author: easy-es <esdras005@hotmail.com>
Date:   Thu Mar 14 15:24:44 2013 +0100

    change the wrong url in the install environement

commit d1aae7606e3302b1779a82d4602c3b162b411779
Merge: bcb4681 67053b2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 14 15:18:06 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b80bacebfe08dde1a46b2a0203a91e196056871d
Merge: bbce4c4 0363b4e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 14 15:18:06 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 67053b208ba38cef440500145590bb28d51a05a4
Merge: 39073c8 2b1a5a9
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Mar 14 15:11:17 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0363b4e9c89646ce744765566eb04202c59d15f2
Merge: a0a0f80 84eb3e8
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Mar 14 15:11:17 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 39073c835508978b5562e71e19558c89bd3fe445
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Mar 14 15:11:07 2013 +0100

    GUI Update

commit a0a0f80b6922869fa8e1154a677c8b48d8b32ec6
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Mar 14 15:11:07 2013 +0100

    GUI Update

commit bcb4681824f034aa8c206de54fdcd702c4b268a2
Merge: d6cbc4c 2b1a5a9
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 14 15:04:35 2013 +0100

    Merge remote-tracking branch 'origin/master'

    Conflicts:
    	src/plugin/Claroline/SiteBundle

commit bbce4c4390a67386eaa966ca9d21284535d84520
Merge: a3b250d 84eb3e8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 14 15:04:35 2013 +0100

    Merge remote-tracking branch 'origin/master'

    Conflicts:
    	src/plugin/Claroline/SiteBundle

commit d6cbc4c7f4a14aee1d25eaf4faf7d7d030185a28
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 14 14:38:44 2013 +0100

    Merge.

commit a3b250d757402060ad6a0b40ca11e7843dcf3afb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 14 14:38:44 2013 +0100

    Merge.

commit cdea027398b44b1087ea28a6154874409eab2aa7
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 14 14:22:26 2013 +0100

    Workspace templates written in a zip file.

commit 4f3a38f4b1ca6b85b193d800ea5a9df1717577e3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 14 14:22:26 2013 +0100

    Workspace templates written in a zip file.

commit 84eb3e8edbd2aadf7df6a8e5f154541fe40288e3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 13:44:23 2013 +0100

    Fixed fixture documentation

commit 2b1a5a9aadb359441ccc2dcc2c4066d0a74ea259
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 13:44:23 2013 +0100

    Fixed fixture documentation

commit 3dda343471af48e656327920ca07e0ba1a07118f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 13:34:06 2013 +0100

    Use internal counter for workspace fixture codes

commit 041d452e7f592a041ec4eeb26f59b7e88630bb41
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 13:34:06 2013 +0100

    Use internal counter for workspace fixture codes

commit 306f16bb9d6a54c28dae21e227ae0a531dc76cc3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 12:06:31 2013 +0100

    Removed call to rand()

commit 21b637fb7ea497e7abb6f43e2fc1ed8101df978e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 12:06:31 2013 +0100

    Removed call to rand()

commit d90d7206e9ae5e3a0a08213aba5483f894c2c5ff
Merge: e9281d4 dab5614
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 11:47:28 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 68455da8acde84207645beb1612e006a11923d2f
Merge: d734c46 5f619e4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 11:47:28 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e9281d439bd29a807d78799b7dc41f69f79e3705
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 11:45:47 2013 +0100

    Updated readme

commit d734c46770b6ad85c5d559189690bf1405747243
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 11:45:14 2013 +0100

    Added missing translations

commit c76471604f7035865b3a1548162a14aa6435ed74
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 11:45:14 2013 +0100

    Added missing translations

commit dab5614b378f927e83825f72fca2ecd64334d511
Merge: 4a549a1 9721fd1
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Thu Mar 14 11:19:07 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 5f619e411e5690fa5b7f6970734edc44f9ded927
Merge: 997f2ac 00b0d60
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Thu Mar 14 11:19:07 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 4a549a1bb52450a9d5846c2bd52e084d8df65e59
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Thu Mar 14 11:18:43 2013 +0100

    Add tests for workspace unique code

commit 997f2ac0b7c216919cd76b5ece84e860f0b98da8
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Thu Mar 14 11:18:43 2013 +0100

    Add tests for workspace unique code

commit 9721fd18d5bcc78e199825732ab56e9917fe3fd5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 10:41:23 2013 +0100

    Updated readme

commit f066b21044bb40fab4aa4f3f93a9a7dfffa886be
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 10:36:44 2013 +0100

    Submodule update

commit fdf5f3c3ca60f7b25d2b546933d2d3cc3b7cf6ab
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 10:21:41 2013 +0100

    Added devel option

commit 00b0d600304b76f11b362b052c7968ad1d4c527c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 10:21:17 2013 +0100

    Moved reporter to dev dir

commit 5583e5a8842909fcf50a63a2b330d37e667e26b9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 10:21:17 2013 +0100

    Moved reporter to dev dir

commit 64b84d1b4045a928edf3a7038bb8a4d7a74c1d6a
Merge: 806c182 e86ff80
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 09:35:21 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 22f058a8ca9c01f9f61cc7f2d2ddca2f12364b66
Merge: 5e6e065 76293c5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 09:35:21 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 806c182854884475d89d3f260c4c2a8353dcd91f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 09:35:09 2013 +0100

    Added error-only checkstyle reporter

commit 5e6e0659ec9e5d6164279da0df3b1846fb4676df
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 14 09:35:09 2013 +0100

    Added error-only checkstyle reporter

commit e86ff80843bafda0e3c91e8484f9f6ce2b0119e0
Merge: 748c601 1691b39
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 13 18:02:44 2013 +0100

    Merge

commit 76293c5c6bc5e2f50dbba4882e44c7d836c04180
Merge: c4209cf 784132d
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 13 18:02:44 2013 +0100

    Merge

commit 748c6013bc71becb7b0d57b1090126239f0406c5
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 13 18:00:02 2013 +0100

    GUI update

commit c4209cff762b913e0a82c1ea0478d84077568ae9
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 13 18:00:02 2013 +0100

    GUI update

commit 784132d5de60089bcb5ca93ea604d9ddd5512271
Merge: 0334802 ffd48f7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 13 17:34:29 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0334802f71f4a34f6e573f4e18cb3f5bbdd55932
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 13 17:34:07 2013 +0100

    Submodule update

commit 9f0b26a0d40a87fda32202f690e13306c021759d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 13 16:54:58 2013 +0100

    Tools can be renamed (only in the workspace template file for now.

commit 091b62eb5719f0e8b29a5386381ddc11a1142bc7
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 13 16:54:58 2013 +0100

    Tools can be renamed (only in the workspace template file for now.

commit 1691b3918ead7ed080d8d3c67f5148751c36a974
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 13 14:01:48 2013 +0100

    Removing getFixturesReferences(...).

commit ffd48f73bf56fd86383c64cec62e43df9bf7e0b3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 13 14:01:48 2013 +0100

    Removing getFixturesReferences(...).

commit 81083e917ae3daf9ad5803c98bed56a4d1f12065
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Wed Mar 13 13:55:17 2013 +0100

    Set unicity for workspace code

commit 24a9fe893525bd467b3efa173d20f906110a4299
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Wed Mar 13 13:55:17 2013 +0100

    Set unicity for workspace code

commit cc05a09b93f57ac2ce262c2ea02f39bfbc24c256
Author: vostro <vostro@vostro-1520.(none)>
Date:   Wed Mar 13 11:41:08 2013 +0100

    Updating requirements.

commit bf2b7d252352966a6659050884e451973cd621d7
Author: vostro <vostro@vostro-1520.(none)>
Date:   Wed Mar 13 11:41:08 2013 +0100

    Updating requirements.

commit b7639acc500ddc13765eba2c6a397a0d9f194756
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 13 10:36:30 2013 +0100

    Submodule update

commit 9d6de16eb440b431e61fd85b8498319eb025e5ad
Merge: 04f1566 0538fd0
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 17:30:11 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0b497f1ff0a74c577777aa9a4d115ebe0da3a8fc
Merge: 3180cd1 4a0deae
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 17:30:11 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 04f156661b83b8e4969c79a604ab409d83e0cc42
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 17:29:31 2013 +0100

    Fixing ResourceLogRepository.

commit 3180cd136fe964b41fe00940b41e80fd6ab209e6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 17:29:31 2013 +0100

    Fixing ResourceLogRepository.

commit 8424647977874fc4defe33799b8541bb463baad7
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 17:08:05 2013 +0100

    Moving some tests.

commit 0bb873e409101af958d1b4f67b856567716fb2fc
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 17:08:05 2013 +0100

    Moving some tests.

commit 7f74a306cf1f4c15e57994daced01d94d5176fec
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 16:56:52 2013 +0100

    Testing workspace export listners.

commit a362c1b035abc8e65fdd683c6dd6d04b103d6dfa
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 16:56:52 2013 +0100

    Testing workspace export listners.

commit 0538fd006ab84550510f604a21469d6aaf8e20c6
Merge: e572eed 500d5da
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 12 15:07:52 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 4a0deae35a66eccd625d85ff11c840733bd22e4a
Merge: 89affd8 6b13d6a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 12 15:07:52 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 89affd8d2958cb462f16571b4cf1ca3184c1f518
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 12 15:07:38 2013 +0100

    Submodule update

commit e572eed8e5b890702b7d8625670c4acfd30943ba
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 12 15:05:45 2013 +0100

    Removed reference to _instanceId

commit 9c606d372202edd6726b70458bfa6b90f7a5ffde
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 12 15:05:45 2013 +0100

    Removed reference to _instanceId

commit 6b13d6ae358e727f1bec3e0cb5c8eb8d6069d60e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 14:55:57 2013 +0100

    Submodule update.

commit 500d5da1475aaee7151ab20d1c9d2449cc5d1ce1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 14:47:57 2013 +0100

    Fixing Workspace\Configuration + broken test + checkstyle

commit d796a13d549b94fba2def5e703698ba59986f38a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 14:47:57 2013 +0100

    Fixing Workspace\Configuration + broken test + checkstyle

commit a35d43a3d906a0956cd9fb9f346c9effa24f245e
Merge: 4d4f713 c2700fc
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 13:22:44 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/public/js/tool/workspace/workspace_group_management.js
    	src/core/Claroline/CoreBundle/Resources/public/js/tool/workspace/workspace_user_management.js

commit 450542ea2bcb24179a0f9f7ad3ed3dc40706727e
Merge: 0738a5b 8a2e7e0
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 13:22:44 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/public/js/tool/workspace/workspace_group_management.js
    	src/core/Claroline/CoreBundle/Resources/public/js/tool/workspace/workspace_user_management.js

commit 4d4f7137119faf36eae5484dad2865e74309d7b4
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 13:21:11 2013 +0100

    Workspace template export/import (draft: widgets & moving the template folder).

commit 0738a5bb042a001180beab7c6909c13d46de7712
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 13:21:11 2013 +0100

    Workspace template export/import (draft: widgets & moving the template folder).

commit 8a2e7e053d80b5550b51f6811fc7bfc05e306f33
Merge: bcbc529 38189b0
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Tue Mar 12 12:06:29 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c2700fc8f6f14fb91f285d5a7746dabcc5000c77
Merge: 2d27995 9ff72a6
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Tue Mar 12 12:06:29 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit bcbc529ff67238fc7d5ede5a04f48b567dd7eb99
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Tue Mar 12 12:06:07 2013 +0100

    rename workspace edit methods

commit 2d2799548fc09096b8c8aefcb104da92170bdd11
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Tue Mar 12 12:06:07 2013 +0100

    rename workspace edit methods

commit 38189b0e6187807b070e445a5a96b409bc2598c2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 12 11:54:52 2013 +0100

    Submodule update

commit 9ff72a6f0a5dd840f437224bc51a391495b379e3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 12 11:54:30 2013 +0100

    Removed ajax utility calls

commit 42456af2c50069d535ccb250bb5719b73dbd1cc3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 12 11:54:30 2013 +0100

    Removed ajax utility calls

commit 7316f49661fbf766ee5832db927f87b1a62eedd2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 09:44:44 2013 +0100

    checkstyle

commit ff986365701d854bc1144d230728c388b01629a8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 12 09:44:44 2013 +0100

    checkstyle

commit cddffbdc04eda0f57affe92548631a37875f5469
Merge: 1eb6094 3df424f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 11 18:04:34 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 93d76b493fbd682bd401c07bc284b0f01eb6dcda
Merge: 5f9f7e5 866c5e7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 11 18:04:34 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1eb609474ead96e4536d50a7537826f3111b546e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 11 18:04:19 2013 +0100

    Removed fake js errors

commit 5f9f7e5fb00a6b07d164545f3cb1255876df0093
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 11 18:04:19 2013 +0100

    Removed fake js errors

commit 3df424f16006fa49716122da7a233db828c22b37
Merge: 227988f c43bbbd
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 11 17:56:08 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/Tool/ParametersController.php
    	src/core/Claroline/CoreBundle/Resources/config/routing/workspace_tool_parameters.yml
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/parameters/workspace_edit.html.twig

commit 866c5e7a37d682dfa78e9ce4fafb8df6e1bfae84
Merge: 284407b c78c687
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 11 17:56:08 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/Tool/ParametersController.php
    	src/core/Claroline/CoreBundle/Resources/config/routing/workspace_tool_parameters.yml
    	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/parameters/workspace_edit.html.twig

commit 227988f39fb20673ec61d4ae0335fe0b17efbd50
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 11 17:51:00 2013 +0100

    Workspace template export/import (tools & widgets: draft)

commit 284407b1db70f4c11923af0486fb1fb802583a02
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 11 17:51:00 2013 +0100

    Workspace template export/import (tools & widgets: draft)

commit c43bbbddd3381d53fe54f4bc6274e8b82e32ef82
Merge: 90446a7 9a88cdb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 11 17:17:24 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c78c687a4363aebf638b6201fbc9689b760ffc59
Merge: 7411755 7035210
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 11 17:17:24 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 90446a79cc2b365c2d2c94777b9eb19c072bddab
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 11 17:17:14 2013 +0100

    Added jshint tasks to ant file

commit 7411755ed12bf4378d0aeaa548f3424c49e04193
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 11 17:17:14 2013 +0100

    Added jshint tasks to ant file

commit 9a88cdb28b992cf005e6c255ac4ac7ac607cc2f7
Merge: 9b674ef e8ea576
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 11 17:10:02 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 70352103ee69cc823fdf787f706492846e04bb29
Merge: cde2f32 aba6037
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 11 17:10:02 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit cde2f32f6c7efda34b0a70b6719509870144f101
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 11 17:09:50 2013 +0100

    Update submodule

commit 9b674efae63ee173a91c6878a89596a4ac9254b0
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 11 17:06:15 2013 +0100

    GUI Update

commit 53709159738e52f945e575717fe73cf68a0f76d6
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 11 17:06:15 2013 +0100

    GUI Update

commit e8ea5764901db6f66293476cbb7765e65f9012a9
Merge: 0cd5c6e 51bbd73
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Mon Mar 11 16:35:25 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit aba6037b978e8dfeb0db77fa5f23c810e15d0667
Merge: 10f2249 3a7b070
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Mon Mar 11 16:35:25 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0cd5c6e558ba732910f5ced256110b50bb198923
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Mon Mar 11 16:35:10 2013 +0100

    Add test for workspace general parameters edition

commit 10f224963eeaf147c5f3b39c06717952bd9876a7
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Mon Mar 11 16:35:10 2013 +0100

    Add test for workspace general parameters edition

commit e10504d0cc66950068ceb575f975910e9e1a5dec
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 11 16:31:26 2013 +0100

    Fixing javascript routes for lists.

commit 9e4dcb7b8f3836af0d3d3395ba988ae8e53a6c7e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 11 16:31:26 2013 +0100

    Fixing javascript routes for lists.

commit 51bbd739ec8b5a0bf81f38730d60aa2e80834f80
Merge: ffc653b 6da7b84
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 11 16:08:19 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Resource/actions.html.twigjs

commit 3a7b070eaabce460d86f6e802e517f408ee32a2f
Merge: 9660a74 e3b84f6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 11 16:08:19 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Resource/actions.html.twigjs

commit ffc653b8937100f91a99137a36428ed3c446df24
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 11 16:05:13 2013 +0100

    Fixed last jshint errors

commit 9660a740e487a357ca25c9f10cd4a1dfda4661fd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 11 16:05:13 2013 +0100

    Fixed last jshint errors

commit b02b4a281ee20e5f25904b7b8771b2e756581162
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 11 16:04:39 2013 +0100

    Changed jshint config

commit 6da7b842cf85d66a7ce948c2c451fe6d719aa34e
Merge: c9ff6c3 925f33a
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 11 14:47:25 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e3b84f69417de1546e26f20d6c845e0bcef0c21a
Merge: ff1b77b 78fb834
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 11 14:47:25 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c9ff6c37bfa2cdcd129aa7956feb5407e4e5cc02
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 11 14:45:57 2013 +0100

     fixed mistake in installer controller

commit ff1b77bb41844ec6fd2530feb9675ab951e5f4fd
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 11 14:45:57 2013 +0100

     fixed mistake in installer controller

commit 971ecfdb653f385c73d3f35a692a9c84a4697167
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 11 14:43:57 2013 +0100

    fixed some translation , fixed calendar.js

commit 90c83b9d46ac75355a075ecfd07b697d67534d8d
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 11 14:43:57 2013 +0100

    fixed some translation , fixed calendar.js

commit 78fb8345994389f846f60d4c8adf063c34dede14
Merge: dc972c6 5d8b07c
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Mon Mar 11 14:18:11 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 925f33a8d7a4379eb3c2ed54ef9e282394806403
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Mon Mar 11 14:17:57 2013 +0100

    Fix workspace deletion confirmation bug

commit dc972c6f93c7cce2e4f623ac40241f335204615b
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Mon Mar 11 14:17:57 2013 +0100

    Fix workspace deletion confirmation bug

commit 5d8b07ca236305aadc7c09e7eb0f114882424a80
Merge: eab7541 61f9872
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 11 11:39:44 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit eab7541772a56e7eb0bb5aef8f7df67fd2e73e96
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 11 11:39:12 2013 +0100

    Bootstrap Update

commit 113ff8bd07bd7441ed24e30374fc0a7de773cd35
Merge: 8a14e41 ce01bd0
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Mon Mar 11 11:13:04 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 61f9872c62bc7c9b06d330c358463147fe29cbce
Merge: 7adb995 21eaafc
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Mon Mar 11 11:13:04 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 8a14e41ceb05bdcd49a780e56f5fa086be736e03
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Mon Mar 11 11:12:22 2013 +0100

    Redirect to Home page after deleting a workspace from its parameters

commit 7adb995573cd689f2585daf12ac2434c99764666
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Mon Mar 11 11:12:22 2013 +0100

    Redirect to Home page after deleting a workspace from its parameters

commit 21eaafcbc8b95cf014b535eb6c4c8db7894f3468
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 11 10:46:40 2013 +0100

    Update Plugins icons

commit ce01bd058efac06c34dbfb8ccbea91177ed4ef77
Merge: 0b9f217 271e06b
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 11 10:33:43 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 06da6ae6599057bc3cb89ab0b3d9f6e6de018726
Merge: 3c338ce a672208
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 11 10:33:43 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0b9f2173ab22a938a5df5318d27bc525dfe7f8b5
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 11 10:33:28 2013 +0100

    GUI Update

commit 3c338cea6b7b51fcd271a1e2239d00477b8e9354
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 11 10:33:28 2013 +0100

    GUI Update

commit 271e06b39a97b6165d29c217069b6757018ad7fe
Merge: c033448 944b9f9
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 11 09:37:54 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a6722087fa2af6c48d6a0c49e85f8f3367f8ce57
Merge: 638eb42 665afb5
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 11 09:37:54 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c033448f2ea277c8daa287c1ec249e8889510a29
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 11 09:29:17 2013 +0100

    english translation for the installer

commit 638eb42e0cdcdb34af651244fef05afb1c817fb3
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 11 09:29:17 2013 +0100

    english translation for the installer

commit 944b9f9deb01944f089d938905a79f8cd2f6d4e1
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Fri Mar 8 14:41:55 2013 +0100

    cleaning code for workspace parameters edition

commit 665afb583eb4ce3688b2ffa164ba51408237a497
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Fri Mar 8 14:41:55 2013 +0100

    cleaning code for workspace parameters edition

commit 063799e0d44aaa0df60c45276005810eb971a6fd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 8 14:21:40 2013 +0100

    Fixing javascript routes for lists.

commit 7bf42262176fa70bef315f01b98be63a8272200e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 8 14:21:40 2013 +0100

    Fixing javascript routes for lists.

commit 40aa1e7fe224a1b3c14c96866d1e92c97ba46386
Merge: ef7d00e 0a62a98
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Fri Mar 8 09:18:56 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 617d1873216109e60e81cac9d8ed7e38b071b3a6
Merge: c2f02a2 a79330b
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Fri Mar 8 09:18:56 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 5db87c86fd0ce99dedd6f13d04f3a9a65bb4e800
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 16:15:28 2013 +0100

    Removed funcunit test

commit 22f9af63db8a8efef5dda3a3395b5182409c9b41
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 16:15:28 2013 +0100

    Removed funcunit test

commit 69572e82fc6a49b694b952c38013c7e5814a896e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 16:12:28 2013 +0100

    Fixed jshint errors

commit 0442852af44bb77301f54c0a9aaaa2aacb04e4ee
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 16:12:28 2013 +0100

    Fixed jshint errors

commit 6b4cf25f1445aa9bfee515fa0f32e7daa49d6638
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 15:25:55 2013 +0100

    Removed obsolete readme

commit ff4c1f0a3b9bdcf168dbe5d3a80dff0622a3bc74
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 15:25:55 2013 +0100

    Removed obsolete readme

commit 3a1bba7c21e107e88279b1eeb41699519cf9165c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 15:25:25 2013 +0100

    Fixed jshint errors

commit 460ed3ff170625ad456fe287a8ddaf13e74d837f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 15:25:25 2013 +0100

    Fixed jshint errors

commit 0a62a98294d1d8134ed70bcddb1f6adf2b90dffa
Merge: de48c3d 2672cb8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 15:11:47 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a79330badb3bf66cc18de622075495ff3d85bf8c
Merge: 59a683b b8b51ca
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 15:11:47 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit de48c3d973ce41092a24533725d3509ff3656552
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 15:09:26 2013 +0100

    Added date filter test

commit 59a683b7603e172eb798369d0d948dc42ba53e3b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 15:09:26 2013 +0100

    Added date filter test

commit 2672cb81f8c396b59484fd46e7d1ba021b342472
Merge: b59daf4 6201755
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 7 14:56:54 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b8b51ca49472567fe63d1c152e021c2fdc23e053
Merge: 4b86f43 bc203c6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 7 14:56:54 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 4b86f43c8ae910bac888d63090747685e7a0fc29
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 7 14:56:25 2013 +0100

    updating submodules

commit b59daf42e4ec1606dc767c21398b39c8789135ed
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 7 14:51:22 2013 +0100

    javascript checkstyle

commit 6dd9e4e33a5c0e35c0768f0eae894cb03923b70d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 7 14:51:22 2013 +0100

    javascript checkstyle

commit ef7d00eb222572f20785053e0bde5d7800895239
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Thu Mar 7 14:43:07 2013 +0100

    workspace_edit new template

commit c2f02a217c98864a487c6d053ab4c0dda1fe23b2
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Thu Mar 7 14:43:07 2013 +0100

    workspace_edit new template

commit e3aa31208d735164b109cdd053df89ca75982857
Merge: e836549 6201755
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 09:32:10 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e9d84ec531dc3b21978730125f79cfe047508e4d
Merge: ac9a483 bc203c6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 09:32:10 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6201755e3ec94a830180443ae7edec0244b22066
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Mar 7 09:27:20 2013 +0100

    Topbar colors

commit bc203c6560e1619c2ce8c188f035aef9c9cd875f
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Mar 7 09:27:20 2013 +0100

    Topbar colors

commit e836549d301dd7382302060fc8f182cbbfd9daea
Merge: e1799b8 273dc3f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 09:20:30 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit ac9a483bef2596e61d24542a369351ccf50d352d
Merge: 07fbe82 753bb7f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 09:20:30 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e1799b8e68aee1f2d4763e22fe7f310f8771369b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 09:20:22 2013 +0100

    Removed unused script

commit 07fbe82f008f45186d0b7210be8cce2adfb13e84
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 09:20:22 2013 +0100

    Removed unused script

commit 273dc3f5498a76efce879211c6a6b8d27294434b
Merge: aed5eb4 6dca101
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Mar 7 09:19:25 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 753bb7fc1230b71871364c6653aeeebe84649641
Merge: 040f0b7 8f8b0f1
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Mar 7 09:19:25 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit aed5eb44a99810d05897faab4b06e940189cdefb
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Mar 7 09:19:13 2013 +0100

    GUI update in resource manager

commit 040f0b7840019549041360b1f842c9a2acef6f7c
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Thu Mar 7 09:19:13 2013 +0100

    GUI update in resource manager

commit 8f8b0f148108f7affd6253c41af650c9e00bae9b
Merge: 31316f0 bbbfb91
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 09:12:53 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 31316f064e5ad5d01962a83fd0751846ab28236e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Mar 7 09:12:47 2013 +0100

    Modified jshint configuration

commit 6dca101eb7cd0f29138664e654ad2c1058576e51
Merge: 1a32f8a 3756d7a
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Thu Mar 7 08:58:50 2013 +0100

    Merge branch 'master' of git://github.com/claroline/Claroline

commit bbbfb9193c71f993ddf18db9de2382bc6cce35c0
Merge: 08fe969 149b9ca
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Thu Mar 7 08:58:50 2013 +0100

    Merge branch 'master' of git://github.com/claroline/Claroline

commit 1a32f8aaeba8c3cc33f5aac73f73a3ce45416486
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Thu Mar 7 08:57:15 2013 +0100

    Add edition of workspace general parameters

commit 08fe969d5ed358ef89c663bf472b8b665823ef9f
Author: Anh Thao PHAM <anhthao_pham@hotmail.com>
Date:   Thu Mar 7 08:57:15 2013 +0100

    Add edition of workspace general parameters

commit 3756d7a6281a06f5433f2759195831406ed0f1cd
Merge: fc4ba72 522935a
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 6 15:02:53 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/plugin/Claroline/ExampleBundle
    	src/plugin/Claroline/ForumBundle

commit 149b9ca1ed842c9113c692436a23db01e9cab103
Merge: f1b5948 abdfb15
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 6 15:02:53 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/plugin/Claroline/ExampleBundle
    	src/plugin/Claroline/ForumBundle

commit fc4ba7209bc2df29fc607e37df066e7f0b829ec8
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 6 14:56:54 2013 +0100

    Resource manager update

commit f1b594885bf39ee3ab04bb477ca7edab84a2ed16
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 6 14:56:54 2013 +0100

    Resource manager update

commit da5419b16a58d4435d69c28f5c2c98031c419eb5
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 6 14:10:31 2013 +0100

    Refactoring javascript (jshint: message folder).

commit ad5b3510e87432bda6541805bed1d08ec8fd9813
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 6 14:10:31 2013 +0100

    Refactoring javascript (jshint: message folder).

commit 522935a4ee7923f805a78420704ffaf3ae423658
Merge: 6c209d1 a791d5c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 6 12:54:55 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	app/build/tools/jshint.json

commit abdfb1572f133ba03c2a06f8a9757b87970d4c86
Merge: eaea114 faa235a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 6 12:54:55 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	app/build/tools/jshint.json

commit 6c209d12b27d45680f471771d8b940c56b333874
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 6 12:53:01 2013 +0100

    prepull commit (js checkstyle)

commit eaea11407f2fb4dc04bf7da170018fa28704ae91
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 6 12:53:01 2013 +0100

    prepull commit (js checkstyle)

commit e5778736c61f4790f98b3180a35143407d49d8eb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 6 12:49:09 2013 +0100

    Changing the icon relativepath ('/' instead of '\').

commit d4f5d16a5f40bddeffdf3e0de131ea026ba5f58a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 6 12:49:09 2013 +0100

    Changing the icon relativepath ('/' instead of '\').

commit faa235a06fdfaa6cb5a4d8b9b51006e3d39bfa56
Merge: a4ded90 923048f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 6 12:01:54 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a4ded900238232fdc73d984fadf8e4df0a3b7acf
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 6 12:01:31 2013 +0100

    Updated jshint config

commit a791d5c97033492e55c22e186fa1aed0502b4d7e
Merge: f2c5e29 90de3f0
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 6 11:35:25 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/less/layout.less

commit 923048f89e9c92965e9cf596111fc03ccbce6f88
Merge: 4c304e1 4e34b5e
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 6 11:35:25 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/less/layout.less

commit f2c5e29b405550f98c1de93d06fa9f19465d0a98
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 6 11:32:15 2013 +0100

    GUI update

commit 4c304e1fa92a3ad50a135d6f52853431e7137dc1
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 6 11:32:15 2013 +0100

    GUI update

commit ef605b2e0d5639daf5f054c4517e9c59b82d2fa0
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Mar 6 11:31:32 2013 +0100

    Submodule update

commit baec4a92584a0a143d4782550088f96f0b3f28b5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 6 11:28:05 2013 +0100

    Fixing the symfony.pdf fixture.

commit 277c5fae044437dd84979c30148ff43a830e3a87
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 6 11:28:05 2013 +0100

    Fixing the symfony.pdf fixture.

commit 4e34b5e63e126a71d293b3bcdf1a42a74f175545
Merge: d4f5f1c 4dccf89
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 6 10:03:50 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 90de3f0a45085e10ed923ff3e2e45db8cf6ed8d3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 6 10:03:06 2013 +0100

    Javascript checkstyle (beginning)

commit d4f5f1cda464d5ded9261b00a3e39ec5b3f0599f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 6 10:03:06 2013 +0100

    Javascript checkstyle (beginning)

commit 4dccf895784d5d91d4d473ad255c7cbca08560a3
Merge: 6e9c1bc 8ca2ce0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 6 09:55:55 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6e9c1bc970322e313d61e9ca52332cb3d0876e4e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 6 09:55:28 2013 +0100

    Prepared JSHint integration

commit 3863f22b9d5ca85d9a75c7e612305ddbd585a414
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 5 16:30:13 2013 +0100

    Ajax alert for messages.

commit 8ca2ce051ca88b6049d8838739a2ecd908616ad6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 5 16:30:13 2013 +0100

    Ajax alert for messages.

commit 8d871fc08e5e4a5f09ee82a1d4f004742d704dff
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 5 16:12:16 2013 +0100

    Fixing the ResourceQueryBuilder WhereRoots method.

commit a6e4460b1a7350b09fe16d003970586f37f4a7fb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 5 16:12:16 2013 +0100

    Fixing the ResourceQueryBuilder WhereRoots method.

commit afb7c533324ff2d0d96f31cd3111516f340129fa
Merge: fa81f70 e63941b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 5 15:43:21 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a5b65e8f86de00fd3208c2631729d851f13a74cd
Merge: a2aafa2 2f4a6df
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 5 15:43:21 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit fa81f70a08b74e6b207e034d8967f41e0629ccdb
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 5 15:42:20 2013 +0100

    Alert on ajax requests ("please_wait label or gif are displayed).

commit a2aafa26b80e7bdb277398d1054873c4939f315c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 5 15:42:20 2013 +0100

    Alert on ajax requests ("please_wait label or gif are displayed).

commit 2f4a6dfd7f81e411d9ef657947b216aac600eb87
Merge: 360e141 028b8ea
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 5 15:07:58 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e63941b199166d48b712162250d3bad4ed6aaebc
Merge: 4ada34e 2fa9265
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 5 15:07:58 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 360e141768ec8127c87503865ea48a45e4373775
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 5 15:05:42 2013 +0100

    Quick layout fixes

commit 4ada34e10e6e6de2bea5c12543907dd0beb00eb0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 5 15:05:42 2013 +0100

    Quick layout fixes

commit 2fa92650c79a6b72b9ed27300915f0a5ed6d8c4f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 16:07:07 2013 +0100

    The ffmpeg error should be fixed.

commit 028b8eae495179785e8eefbb56dca85be7ad668c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 16:07:07 2013 +0100

    The ffmpeg error should be fixed.

commit a21d3d3c1b5b1e18a5a9d6f7d43bd6fc96a49d29
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 15:43:38 2013 +0100

    Fixing raw install

commit a3402d049cabb58ad13bfc15588b3bb2a04d6832
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 15:43:38 2013 +0100

    Fixing raw install

commit 4b95033fa6b6b8804631fdcd8cb2a99bc7d0a213
Merge: 2e39cb9 a00e71b
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 4 15:39:53 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit ccd99fa354c0d1c5a2ad2aa3ba0d729af99ad5d2
Merge: 9534cca 3fc6850
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 4 15:39:53 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2e39cb9849cadc3f70b1e76bc37562f6cdac8924
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 4 15:39:42 2013 +0100

    GUI update

commit 9534ccafa9f66442e22fd4a03998f206df39e448
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 4 15:39:42 2013 +0100

    GUI update

commit e79e692b9ec401dc581b21f8cdd36915d2c333e8
Merge: 6b4c90b a00e71b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 15:32:56 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 525d0afc002017cab7064f401bdace844814604b
Merge: fa66b8a 3fc6850
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 15:32:56 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6b4c90bda07ac961a85e589a306a194ba97bba86
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 15:32:43 2013 +0100

    RequirementsCheckerCommand

commit fa66b8a8d3b3434e86d3e55cfa4b02c631163676
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 15:32:43 2013 +0100

    RequirementsCheckerCommand

commit 3fc6850e3feedfebc51f224b74eb43d77c3d2770
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 4 15:31:53 2013 +0100

    Updated readme

commit a00e71bab69542e21e8526422a8c1cbd536a71e9
Merge: 726cd3a 2ec1ece
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 4 15:28:21 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 52f59a23d98e96f836f6169347c35f519b8e927a
Merge: eac6956 b9c77fc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 4 15:28:21 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit eac69566ef789d71278081eadc04b5a27c3d74eb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 4 15:28:12 2013 +0100

    ExoBundle plugin update

commit 24699a7dc20e2d89e5ed4da23acd67a3e74d3c3d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 4 15:24:28 2013 +0100

    Added tinymce bundle

commit f573f96e2b2d3f5d596f8a148ee6a975f4bf3cb8
Merge: 600130d 2ec1ece
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 4 14:41:14 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f98bf408d25f1bf500fc72357f69bc07dcce9c51
Merge: 8cd734f b9c77fc
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 4 14:41:14 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 600130d3776729415bf9edaf9c1b24f5f3bd9a45
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 4 14:40:27 2013 +0100

    add translation for calendar + fixed ignisificant bugss

commit 8cd734f13fd0be0476f7b9ddc5d86dafc66fd646
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 4 14:40:27 2013 +0100

    add translation for calendar + fixed ignisificant bugss

commit 2ec1eceaf654e4e26356eaf82f69f92d7ec93596
Merge: e03d7be 0dda56b
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 4 14:35:30 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b9c77fcf2a76f6b63b2bb0cb87458a27ac38ff6d
Merge: 9fc603b 30724b9
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 4 14:35:30 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e03d7bedb2e12078e27f63139ee4084f242a998d
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 4 14:35:10 2013 +0100

    GUI update

commit 9fc603b8e1615c919eb95c1592cd95ec7f5cc77a
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 4 14:35:10 2013 +0100

    GUI update

commit 0dda56bb3618b1a2c3b17e68682d17ff88e80728
Merge: f901025 a783d97
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 14:16:49 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 30724b9b4ecd481d7f896c11756852e2da36c6ed
Merge: ab1a6ca 02cafbf
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 14:16:49 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f901025e619c115bba8b4a420974841ecfcbf4c6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 14:16:22 2013 +0100

    checkstyle

commit ab1a6ca44f62e62d87f86a7ab72f82b41f1abc49
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 14:16:22 2013 +0100

    checkstyle

commit 3d8276b054021ed54cfc6ea8d542b73ff6657ce3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 13:51:36 2013 +0100

    Updating SiteBundle.

commit 0773abb75ccde4d9a821852eb792f2c517c9f67e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 13:46:25 2013 +0100

    Removing many todo's.

commit 421ed4cfdc26e65b42e7d86b0c6df64a68e87c32
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 13:46:25 2013 +0100

    Removing many todo's.

commit a783d9785ead9b3dc11ae757720f74a80f70c63f
Merge: ca7b754 87c11ff
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 4 13:42:57 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 02cafbf220bda4176e3749ad90b47cfe11dffb43
Merge: 23b331e d7cc05d
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 4 13:42:57 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit ca7b7548ec49b950c71119e19392d2ee2e061f38
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 4 13:42:22 2013 +0100

    GUI update

commit 23b331ebdecf5562450d974386475bd4c02811b7
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Mon Mar 4 13:42:22 2013 +0100

    GUI update

commit d7cc05d2258a0c09a564484f7ea80f74f7e1e761
Merge: b0d2795 1153d46
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 4 10:11:39 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 87c11ff7641b957500ef6479a7f7664956267291
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 4 10:10:14 2013 +0100

    translation for delete all messages function

commit b0d27954982482824894834b13d43c962679e525
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Mar 4 10:10:14 2013 +0100

    translation for delete all messages function

commit 726cd3a46692d97ca95ef1ee16fecab22d25e628
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 4 09:53:20 2013 +0100

    Removed unused method

commit a02a96f830c4b1b7525d8b0d7662171a60761122
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Mar 4 09:53:20 2013 +0100

    Removed unused method

commit e83eccb29854fbab37dc97926f01c60cf86f5a4e
Merge: d455522 40236ac
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 09:31:13 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d6a723c6225cb7317dd6283630bcdde21a5e1ff6
Merge: 7ccdc57 1153d46
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 09:31:13 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d45552209e01e70ba12f1e8947f2351d901a5344
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 09:30:35 2013 +0100

    Moving the image manipulation out of the IconCreator

commit 7ccdc57e3c4253c9ab686d0908dc2f1444a58695
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 4 09:30:35 2013 +0100

    Moving the image manipulation out of the IconCreator

commit 1153d466cea76544f49fe72144f04de13442e480
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 1 15:43:45 2013 +0100

    Submodule update

commit 7cbb0dda92aeca40bd6a4bff2eac5d8849f8e484
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 1 14:25:08 2013 +0100

    Added UJM/ExoBundle as submodule

commit 40236ac67255bea65ace8c704adc3f2f7a10cdaa
Merge: 8f8c274 3c21ad9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 1 14:20:17 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/manager.js

commit 1e23f32d87cb30bf578b6c65de65f3eaa65681b9
Merge: 92f0372 bd916a2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Mar 1 14:20:17 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/manager.js

commit 3c21ad92c04637c284b77f327a35608612d79753
Merge: ad8f687 94a7858
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Mar 1 14:13:53 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit bd916a24f3a5ba6fcd6789843ef5f2883b6149b8
Merge: 930fa67 8f740af
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Mar 1 14:13:53 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit ad8f687bcb2e91de60f384b344d2418e2d9bffac
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Mar 1 14:11:34 2013 +0100

    added delelete all function for message

commit 930fa67beab323e06678be64482cca5cd2260028
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Mar 1 14:11:34 2013 +0100

    added delelete all function for message

commit c6f76b52f8cece182d1104baed113fe3c8b892f6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 1 11:30:12 2013 +0100

    Removing unmapped properties from entities.

commit dabe7487a85625471b741c98832626d0c5cab371
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 1 11:30:12 2013 +0100

    Removing unmapped properties from entities.

commit 8f8c274ecb6397b492b163db5339c03fd99c053c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 28 17:23:12 2013 +0100

    Fixed resource manager form error handling

commit 92f037279658ad156a0ae3d60d47620d231312da
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 28 17:23:12 2013 +0100

    Fixed resource manager form error handling

commit 94a7858144aef7022eaedf19e5752efc74ae4698
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 28 14:33:47 2013 +0100

    A template can be chose at the workspace creation form + using workspaces templates.

commit 8f740af929e160539c1e766589087752d1637fc4
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 28 14:33:47 2013 +0100

    A template can be chose at the workspace creation form + using workspaces templates.

commit f38b803cd527a014ca1b74c0c429d72989d07652
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 28 11:04:55 2013 +0100

    Adding breadcrumb to Calendar and parameters/resources tools.

commit a70fb0e811fd572f597d64e498ea6c92d0edd950
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 28 11:04:55 2013 +0100

    Adding breadcrumb to Calendar and parameters/resources tools.

commit 42b19901af2208e5abaef379bda7248e846685c1
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 28 10:54:25 2013 +0100

    Updating submodules.

commit 383756cbc45bc8a03e4653cd2f9114ec8c6f045c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 28 10:47:43 2013 +0100

    Moving all Events to the Library/Event folder.

commit 57d0d6a0aca1402b24ad921d4dd61118a4be3678
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 28 10:47:43 2013 +0100

    Moving all Events to the Library/Event folder.

commit 8a81b2d50074ea14e37358d1a831e01daf0d7460
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 28 10:18:23 2013 +0100

    Updating submodules.

commit 967039daa3c11ee5345b09f24b24b7dda902ad1a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 28 10:10:33 2013 +0100

    Removing some ajax errors alerts.

commit b4091bb7db0f2a3058184c2df99fbdf82d68a971
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 28 10:10:33 2013 +0100

    Removing some ajax errors alerts.

commit 68d32e0ca5bd614d68068413b309c25f7a97cd4e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 28 09:01:59 2013 +0100

    updating submodules

commit f106e79d5ff84eff1f09018171674ed39acb7b6d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 27 17:52:33 2013 +0100

    Removing the "DataFixtures/Alt" directory.

commit d5619f3f7456ca991ceab109fa6bda08f2a1bf84
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 27 17:52:33 2013 +0100

    Removing the "DataFixtures/Alt" directory.

commit 067eef38ee3d00cf5111c70db4ac74549d28a68d
Merge: 802290f eb9c00f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 27 17:29:44 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 4e50201e7e12037697e2a0167ea8b0f754101dc8
Merge: b1669c7 07e402d
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 27 17:29:44 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 802290faa5c439d62bf48d789ea5b5b7bb8e2a22
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 27 17:29:06 2013 +0100

    Refactoring LoadDemoFixture

commit b1669c7e8091c08acfdc068bd1c68b60d8253947
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 27 17:29:06 2013 +0100

    Refactoring LoadDemoFixture

commit eb9c00fa74a5c482d5897a03fbdea36be17ecd64
Merge: 0a72332 14c8666
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Feb 27 15:58:26 2013 +0100

    Merge remote-tracking branch 'origin/master'

commit 07e402d1e64c96e0102c2c864eae4408f0e14701
Merge: 2e81317 3c845b6
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Feb 27 15:58:26 2013 +0100

    Merge remote-tracking branch 'origin/master'

commit 14c8666540b44eeff688231b4b19e1d97aaf4d4a
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Feb 27 14:44:01 2013 +0100

    Tooltip selector fix

commit 3c845b6ecad7171e044b2301ac9a5c57af405793
Author: Jorge Solis Pauwels <jorgeluissolis@gmail.com>
Date:   Wed Feb 27 14:44:01 2013 +0100

    Tooltip selector fix

commit 0a72332da988f3f148fab7aaa9e8c0395cfa6ab3
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Feb 27 14:02:02 2013 +0100

    calendar fixed bug

commit 2e81317a507485a72d5ff4ef53b838a67f6e4466
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Feb 27 14:02:02 2013 +0100

    calendar fixed bug

commit 89a4685cc09c51ce831f35bd554114a0044fd870
Merge: dcb21bd 063eb57
Author: root <root@claroline-Vostro-3560.(none)>
Date:   Wed Feb 27 13:38:49 2013 +0100

    Merge branch 'master' of git://github.com/claroline/Claroline

commit 47a492ce306a8c2ebc5e1b0fadd3ba8cc4fd4e13
Merge: b60441f 5dff154
Author: root <root@claroline-Vostro-3560.(none)>
Date:   Wed Feb 27 13:38:49 2013 +0100

    Merge branch 'master' of git://github.com/claroline/Claroline

commit dcb21bda36b1f5f6851ae50d824e3888e159bd84
Author: Claroline <claroline@claroline-Vostro-3560.(none)>
Date:   Wed Feb 27 13:38:21 2013 +0100

    Icons update

commit b60441f4cba8357989f97ea939cf2353de3a7d88
Author: Claroline <claroline@claroline-Vostro-3560.(none)>
Date:   Wed Feb 27 13:38:21 2013 +0100

    Icons update

commit a67d82e2c9a56e01e70dcc90692662c2f0f4131c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 27 10:32:33 2013 +0100

    Updated documentation

commit 102ece7e8a2bfad5b59fe3a85597bd0163c047af
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 27 10:32:33 2013 +0100

    Updated documentation

commit 063eb5730aa5340cffa747dd849176ca015bf522
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 26 11:41:16 2013 +0100

    Putting LoadFileData back (fixing LoadDemoData)

commit 5dff1544c2d8035e04d8e51be3aaf5d97516be9b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 26 11:41:16 2013 +0100

    Putting LoadFileData back (fixing LoadDemoData)

commit bd96f755bfa0ce2ef926832014e9937b87f90049
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 26 11:11:59 2013 +0100

    Removing old datafixtures and updating forumbundle.

commit 12449b8310f5cbb93a55cd79097e80a205a6d45f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 26 11:11:59 2013 +0100

    Removing old datafixtures and updating forumbundle.

commit 36c08540444a007bc77d2b8c72d0f63180443257
Merge: 3a9bf36 ecd7b62
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 26 10:46:40 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b0f6b3808eeee790b3344621991640a255f63dbb
Merge: 4ff14e9 3ffe94b
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 26 10:46:40 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 3a9bf362085a6d354e10dd9db57ae30d9e0de1fe
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 26 10:46:02 2013 +0100

    Fixing a role management bug in the workspace.

commit 4ff14e962d9d060548d49f5c2767524d900e3ff3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 26 10:46:02 2013 +0100

    Fixing a role management bug in the workspace.

commit 4206b05ee37f8b99ada951ce8d33372d32fa9178
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 26 10:15:14 2013 +0100

    Rights on the workspace roots can be changed

commit e4ff272b7c6bd72460c9bbe75fda0af54d6e54a6
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 26 10:15:14 2013 +0100

    Rights on the workspace roots can be changed

commit 2fb3f1762c7e35a29835b2253331d690e78b6d7b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 26 09:36:25 2013 +0100

    Changed command output msg

commit 648a6db04fdc4b7150cfb1d95117f1fbfce71040
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 26 09:36:25 2013 +0100

    Changed command output msg

commit dc013929351afeb64e0ebecd06fb8b7a27037301
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 25 16:42:54 2013 +0100

    Updated readme

commit ecd7b620135d9618974e0108d406b9e32b5f07c2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 25 16:16:34 2013 +0100

    Added cascade delete on resource table

commit 3ffe94bc30cbcb138a9145cbffd8a878d9d9dcaf
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 25 16:16:34 2013 +0100

    Added cascade delete on resource table

commit 39c5fdc5492e48ce8987625d2696276e35a1d431
Merge: 256a518 4b9a1b3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 25 10:41:35 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit ce9b15384243ab2672aa5b2de711bd15336bfdd9
Merge: 4b4dfc4 42aab30
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 25 10:41:35 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 256a518d87aecdea1d87e9eed900145b7ae9f7f8
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 25 10:41:01 2013 +0100

    Updating data fixtures.

commit 4b4dfc4c87495f4b7f79da764cb9531977adeb7c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 25 10:41:01 2013 +0100

    Updating data fixtures.

commit 4b9a1b3af2e3a0cb4980417f77127e15919d5c16
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 25 10:15:21 2013 +0100

    Added a default shortcut icon in case gd is not available

commit 42aab30e9dd750635a4601a26108d9b886628a56
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 25 10:15:21 2013 +0100

    Added a default shortcut icon in case gd is not available

commit 486ec9c55baf7229940e8a45db6b3baee48d03bf
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 25 10:03:50 2013 +0100

    Plugins update.

commit d3e8515c6a64740089db8d9512e586c2b8188b3b
Merge: a009583 dd29433
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 22 13:40:37 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 9fc80a2154a52065d67f13b769118d83c2787df6
Merge: 9479e72 8a7e835
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 22 13:40:37 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a009583645cf19fa58bc36c065308a0d41c61a8a
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 22 13:40:22 2013 +0100

    More tests fixtures refactored.

commit 9479e7257fe8decb1867a1b5e8026a6471c8eead
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 22 13:40:22 2013 +0100

    More tests fixtures refactored.

commit aaf84508910417b69191061033b9b2bdf1e82c85
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 22 13:39:20 2013 +0100

    Cleaning AbstractResourceRepository

commit 4b302d755ece33c06010747697f75a25950c49b0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 22 13:39:20 2013 +0100

    Cleaning AbstractResourceRepository

commit f16bcea8ccb43ea43ba8273a7b86826c5e5e6528
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 22 13:37:42 2013 +0100

    Update ExampleBundle

commit dd29433a27b47da4b1d384aad6573d1e7fe89f93
Merge: adda95c 0fb19a4
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Feb 22 13:16:11 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 8a7e8351db176f8cc3c5808dddc368971f092187
Merge: 789e9d4 46b07f8
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Feb 22 13:16:11 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0fb19a4633134e13b283a6c9615eaabe5894af9e
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 22 11:06:47 2013 +0100

    checkstyle

commit 46b07f8b99322005654fa4a54d26787b666ad3f7
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 22 11:06:47 2013 +0100

    checkstyle

commit 90d8261b32aafaf4f04ef940c1c76f2ad3d5a3ea
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 22 10:40:00 2013 +0100

    Rafactoring controller's fixtures

commit 389f2705f565b602281d634115fb99a858cd010c
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 22 10:40:00 2013 +0100

    Rafactoring controller's fixtures

commit adda95cc9a289c3c6c4630d42c22a6515bb930eb
Merge: 87e91a6 d735508
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Feb 21 14:21:25 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 789e9d4e9a013db8c59d96d187e623db87f347dc
Merge: dda3dc2 eac197f
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Feb 21 14:21:25 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit dda3dc2c76ab9ca2f10180f5b7aab4ba7fe15f24
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Feb 21 14:21:12 2013 +0100

    pre pull commit

commit 87e91a69f0a84e0e286e59895a6ecb5d73a82b20
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Feb 21 14:17:46 2013 +0100

    Font awesome and resource manager GUI Update

commit 68273ac8a1c71ba277ca4a6d796a46211c26cd95
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Thu Feb 21 14:17:46 2013 +0100

    Font awesome and resource manager GUI Update

commit 2dd8d704b520573293c998ce321d4c0be8768ef3
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 20 16:00:11 2013 +0100

    checkstyle

commit 8aff254d64a35300a115b0d8e0317f3bc7c43ce2
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 20 16:00:11 2013 +0100

    checkstyle

commit 176485deea5977bb1cf97de96e1450bb1d4a5d94
Merge: e0d8d1b eac197f
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 20 15:42:33 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e0d8d1b8a5bc84a24f5897d5e237df5585c6b675
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 20 15:42:06 2013 +0100

    Removing plugins from the plugin/Claroline folder (pre pull)

commit f41661be9d6dda12f7767e786266abb51664a907
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 20 13:27:40 2013 +0100

    Refactoring AbstractResourceRepository

commit 06576fae6c409b664c87d25536f52a25768b59df
Author: ngodfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 20 13:27:40 2013 +0100

    Refactoring AbstractResourceRepository

commit eac197fb2b7d5cb9546d1bcde9af390c102b5cf0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 19 23:47:51 2013 +0100

    Updated readme

commit 6e146a72ee7d7fdda0bbe8ac8612102b36ea9599
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 19 22:35:56 2013 +0100

    Updated ant file for global composer installation

commit 29ed76dec27d115cff43459949a36f6d1d207df8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 19 22:14:17 2013 +0100

    Use global installation of composer

commit ca46ec3ee34ba5bb1c59fa54ca195108aeb87f70
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 19 22:03:42 2013 +0100

    Updated forum dependency

commit 3fb2020c5ffecfda9a4537e80d6cbf2fe2096dd7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 19 19:05:03 2013 +0100

    Updated forum bundle revision

commit 2c0deb66c7aefeb366e5416212028be14752b6e0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 19 18:45:28 2013 +0100

    Changed modules urls to https

commit 2bdc7a87cc8ca1a8344f6d9176436fa777464049
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 19 10:36:39 2013 +0100

    workspace templatings (draft)

commit e70a1a6b0314699349d0e9365f3e779dc54cac53
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 19 10:36:39 2013 +0100

    workspace templatings (draft)

commit eef192717d16057f560951590118db4ff000ec9f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 18 23:13:02 2013 +0100

    Updated readme

commit efc354c34df716b154d0f738c93ccb0114800fab
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 18 23:08:34 2013 +0100

    Updated readme

commit ad5ef7bd0f0db390d9dd0a72ed0d6c4078296c78
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 18 20:13:37 2013 +0100

    Added plugins as submodules

commit e1b53a5d3668974549d6012043dc28d5c70ccad5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 18 20:00:32 2013 +0100

    Removed plugins from core repository

commit cb5ec09fc2406584ea3724e34290090b1256e193
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 18 14:03:37 2013 +0100

    removing double errors from forms

commit dd28a3eee04701bc9bb9c875a5612a3e64063ae7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 18 14:03:37 2013 +0100

    removing double errors from forms

commit d73550886afd3e22d5f2169d2e74f83a9c6f2745
Merge: a165285 db24652
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 18 11:40:08 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit bd24abbab5ad71cb2fff4a30da107622c6230ebd
Merge: 32f39c5 48e9ec3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 18 11:40:08 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a165285085dcb0f1c5e292a772c541abedc4f8be
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 18 11:39:07 2013 +0100

    Fixing bad method call in FilterAction + Some tests about the resource filter.

commit 32f39c591bf50ea2106f603e117c3e6e1d009d67
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 18 11:39:07 2013 +0100

    Fixing bad method call in FilterAction + Some tests about the resource filter.

commit db246528091ec6638669c1b48bcf0a55e6faecd2
Merge: 987f1dd bf6f8b9
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Feb 18 10:13:09 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 48e9ec335e005140f18bdb612930b68970c1c786
Merge: 0ff8ab6 b7d524f
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Feb 18 10:13:09 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 987f1dd9b199156c6f632fd50ba401689b757a98
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Feb 18 10:12:43 2013 +0100

    GUI update

commit 0ff8ab684cc7bb2be85627099eae0a4984cf7270
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Feb 18 10:12:43 2013 +0100

    GUI update

commit bf6f8b91cb38e87f5f9337cde03bed28e41b223d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Feb 17 23:38:09 2013 +0100

    Unskipped tests + checkstyle

commit b7d524f6247d7b99086d11e77a0d6f8a191e1bf0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Feb 17 23:38:09 2013 +0100

    Unskipped tests + checkstyle

commit 2b87054f97c14fa34403ec07e6c65c2ad272f49d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Feb 17 22:52:42 2013 +0100

    Force authentication when anonymous has insufficient permissions

commit a40d63502cf6a539ed120d8402ad2d536f947a6e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Feb 17 22:52:42 2013 +0100

    Force authentication when anonymous has insufficient permissions

commit 81d6e2f85f89981c3fe195ed31413c7c383bd8e8
Merge: 7607577 384a6f1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 15 16:15:19 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 5d48da75033636f63253b48fccb6a198cce6685b
Merge: c35cd24 fb6023d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 15 16:15:19 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 7607577dc6e3f51602e77b181010cb791dfb17ae
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 15 16:06:41 2013 +0100

    Fixed resource creation rights bug

commit c35cd2467488b16e98eca9391c3365dc7f80c92c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 15 16:06:41 2013 +0100

    Fixed resource creation rights bug

commit fb6023dba70e598d7cc67445a4fb961ef8833ae3
Merge: 13a1ce3 244bed2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 15 15:13:58 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 384a6f12e46ac81a5d70242895127f8850664cda
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 15 15:06:46 2013 +0100

    Fixing some skipped tests

commit 13a1ce3e410b25fa623c49a1ba0f332719e7f61f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 15 15:06:46 2013 +0100

    Fixing some skipped tests

commit 945a77dc99fee1f86b8fdda6b00cdad171ae1077
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 15 14:56:46 2013 +0100

    Changed tol translations

commit 619d2f9754c74e3fc493ae9fda51553afc300189
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 15 14:56:46 2013 +0100

    Changed tol translations

commit 725ae6806201550a8ac16bd67b77c21f7ca6be26
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 15 13:55:26 2013 +0100

    Forced class loading in plugin configuration checking

commit 9f405519f9e7f2a6950ef604b70445fbe64cb487
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 15 13:55:26 2013 +0100

    Forced class loading in plugin configuration checking

commit 244bed2324b426760e443747a237dd78dffed0c9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 15 13:00:38 2013 +0100

    Fixed broken test

commit def1a778e8d36fdd6878ca0c9756d1f4712769e0
Merge: 37d3ba1 8fb1d23
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Feb 15 12:01:03 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 3fedc8c81467080323617e665a2c765abba4d597
Merge: 1eb9f93 580ccf4
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Feb 15 12:01:03 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 37d3ba1e2e7682d20ab64f20472c887789c33ac5
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Feb 15 12:00:36 2013 +0100

    calendar

commit 1eb9f93fe9dcc38d731f690dc61549ffc83f4f28
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Feb 15 12:00:36 2013 +0100

    calendar

commit 5af61b535e3568e5874afa73f64454b6a06dfb67
Merge: 132930b 8fb1d23
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 15 11:47:58 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 376fc5df4391073845d6374bf3c1406e1e1ae249
Merge: 81d0e75 580ccf4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 15 11:47:58 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 132930b392bb661c0b0f6a1cc46d01dd39b831a3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 15 11:45:50 2013 +0100

    platform configuration form shows if the file configuration file isn't writable

commit 81d0e750c50db348ce45fe083d4517c76e7047fc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 15 11:45:50 2013 +0100

    platform configuration form shows if the file configuration file isn't writable

commit 8fb1d23c1f136dc24c0782efa1fd323d8dd2a792
Merge: 4202182 011cbe9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 15 11:12:45 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 580ccf4fb46e9524e65d89fb0d94edec7589551d
Merge: 027682f ab0efc8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 15 11:12:45 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 4202182bdf93beed28a9871fb6f2d94f7d369260
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 15 11:12:30 2013 +0100

    Fixed calendar js path

commit 027682f6913a844a44a8ac08d5e198e649e03e50
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 15 11:12:30 2013 +0100

    Fixed calendar js path

commit 5c00ce0d18badc743b29509adad1dcad04bc3fdd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 15 10:54:40 2013 +0100

    Fixed forum options translations

commit 011cbe93cb4ce62832de137cc827ed2593f60746
Merge: a2f5e54 7671158
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Feb 15 10:56:29 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit ab0efc8dad96749edbc63d54dfbbacf697aac564
Merge: d28d710 77ef1a4
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Feb 15 10:56:29 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a2f5e54f5289b11a8540638016954860c3a35711
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Feb 15 10:55:59 2013 +0100

    GUI update

commit d28d7103d0a2494ea8ce84762123248244ac1f14
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Feb 15 10:55:59 2013 +0100

    GUI update

commit 76711584c1bf6197cb292643b5ca7dba78d4a9f0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 15 10:38:16 2013 +0100

    claroline:template:checker command done and removing useless templates

commit 77ef1a4af93bfd2c30f18adbb5ff1af2a83ee48b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 15 10:38:16 2013 +0100

    claroline:template:checker command done and removing useless templates

commit 4dc07381c8e0efa9af799933bc64f270c2548a4c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 15 10:30:05 2013 +0100

    Adding some doc

commit f409158fb3b91c4ddf7dc68ca90e68d746da98f5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 15 10:30:05 2013 +0100

    Adding some doc

commit c012f8944123477ab7e34e3fb9a8ae2eef83f3b9
Merge: 894039c f9f54e5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 18:07:47 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 84869eff0b09b016108cc1b2bf1318a907ab8db2
Merge: 96be074 8968a8b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 18:07:47 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 894039ca520f2d6fb5c5caad6c5ec4725c1ef5e3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 18:07:31 2013 +0100

    TemplateCheckerCommand (incomplete)

commit 96be074b2028e2b3ffea41794874b99cb890da44
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 18:07:31 2013 +0100

    TemplateCheckerCommand (incomplete)

commit f9f54e5d2ba526dbb36b7c697783b0825f641ef8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 14 17:08:29 2013 +0100

    Restored players doc

commit 8968a8be0128abf3d185156cf2f478b41a59dddd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 14 17:08:29 2013 +0100

    Restored players doc

commit 8e2e71a7ba59b81872c371fe5a52e0b741111863
Merge: be0a71a 1f34853
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 14 16:57:50 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 514b725d4e1db60b956971f6c8cd04932b7e6e1c
Merge: d8efa87 22e0ce4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 14 16:57:50 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit be0a71ab58d93317dd6c95b1742c99d2e632762c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 14 16:57:37 2013 +0100

    Reorganized documentation

commit d8efa870523ec6497fe78d049b7f4b3a1ccfdc07
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 14 16:57:37 2013 +0100

    Reorganized documentation

commit 8691ea9503e38420afd0c1628ea490fa7199d10e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 16:18:59 2013 +0100

    claroline:translation:checker command (used for the 1st time)

commit c9c019dd557468818926ade8e74b58f1895a1dfc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 16:18:59 2013 +0100

    claroline:translation:checker command (used for the 1st time)

commit 1f34853d30686c446cc1e255d1d4bfc4c7795f47
Merge: 060ea66 a80a845
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 15:45:54 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 22e0ce404317205ebee64a60a4666ecf1ac92954
Merge: 222afe6 9fa8115
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 15:45:54 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 060ea66c981d353d58b1a8fed7904999a03e19f8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 15:45:26 2013 +0100

    checkstyle

commit 222afe6729e2f676186799bdcde81485ee292964
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 15:45:26 2013 +0100

    checkstyle

commit 9fa81156b19052a088338060227552ed26a570a5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 14 15:38:29 2013 +0100

    Updated readme

commit acea7305ea826caa074354fc907bc60f946d04ca
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 15:32:46 2013 +0100

    Replacing sectionContent by section_content in twig files

commit 32c4398e10b424954eed03fe4fe6eb7a55eb76a4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 15:32:46 2013 +0100

    Replacing sectionContent by section_content in twig files

commit cac1e417e0537ab6fb9021b6aebf6fc6cf5bdae9
Merge: 22ec1f1 f1ee749
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 14 15:32:20 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit a80a8452dccd18cb8216ede7d47fa77e8a083fc6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 14 15:32:14 2013 +0100

    Updated readme

commit 22ec1f109478c594fabb39a21c117d8abc199289
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 14 15:32:14 2013 +0100

    Updated readme

commit f1ee74943aa743f80e6a5f52e11b4df2ddbd67b0
Merge: 995d921 679b7b5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 15:23:03 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/plugin/Claroline/RssReaderBundle/Resources/vendor/syndexport.php

commit 995d92152b9f136bbd4cf3b602dcede5b0facf95
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 15:20:06 2013 +0100

    RssReaderBundle form is considered invalid if the url is invalid

commit 679b7b5e47c5ecfc65a1e4e03b6236e95ffe5a8f
Merge: da11653 359d503
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 14 14:24:44 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit da11653c3c86d7cb5876cf3fb0d0ac9078d19978
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 14 14:24:30 2013 +0100

    Removed syndexport.php

commit ff3af945e68504b37e10d8943e3172c6b2b3b4ab
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 13:30:11 2013 +0100

    A message must be written when a subject in a forum is created.

commit 68f996e4c38ce89dfc99bdb696e2d4e002023aa3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 11:43:52 2013 +0100

    Document update (partially done)

commit 359d503d84bab23c42f889ff630c79fcbc5d4d6e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 11:43:52 2013 +0100

    Document update (partially done)

commit 62dfc4c4d73e2a947063a3bd2fe8217444b389d1
Merge: 6800115 ba94110
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 10:23:01 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 68bafc0ebdcdc049c4f4ec3066d1e9e314f5498c
Merge: b61942d 0a814a2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 10:23:01 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 68001150609d56e23e328a55f12bd6677a03e5b8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 10:22:21 2013 +0100

    claroline:route:checker command created and used for the 1st time

commit b61942d2df714b1121f561d49cae1df58d3762cd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 14 10:22:21 2013 +0100

    claroline:route:checker command created and used for the 1st time

commit 0a814a2308271d2c96213076c2f50c5fd0c9277d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 17:46:43 2013 +0100

    Fixed broken tests

commit ba941109942af2ddbd494c989c2698a2d83a3791
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 17:03:28 2013 +0100

    Fixed bad method call

commit ec8b10637983d070f2ad5ac3ed5b2505b500221d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 17:03:28 2013 +0100

    Fixed bad method call

commit 97331bd38ad2a8c3c9fb1fe6a0de78d5003cd75f
Merge: c657359 f9d9521
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Feb 13 16:17:00 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/Tool/CalendarController.php

commit 58479feb6e9d41b1b429cab6f591a6fc24c80d8e
Merge: 0631435 2de1185
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Feb 13 16:17:00 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/Tool/CalendarController.php

commit 20b810630cd8e47d6247b446f8f301bbdbc9e331
Merge: 901046c 5403ce8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 16:13:20 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 0a436a94fcc50a298677d9f992df1c2e66791217
Merge: 14486bd 07c4f8b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 16:13:20 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 901046c18736fa00b5927f0f31a3627b4c712ba1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 16:08:56 2013 +0100

    Fixed missing form translations (domain must be set explicitely in form types)

commit 14486bde1ce420a2d3deffe982c2304c1125a086
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 16:08:56 2013 +0100

    Fixed missing form translations (domain must be set explicitely in form types)

commit 5403ce819d088d29c26bfdfd0df287270cc278d1
Merge: 58f0bf1 f9d9521
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 13 15:17:39 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/Tool/CalendarController.php

commit 07c4f8b1a1aff2dd6959fbbdd9b828d7f864b36f
Merge: a85747a 2de1185
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 13 15:17:39 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/Tool/CalendarController.php

commit 58f0bf144dc8891c6259f3211e42a6e439c3325e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 13 15:16:25 2013 +0100

    Removing useless templates

commit a85747a3af1677fc8c2f3e83930c075cce8e9d51
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 13 15:16:25 2013 +0100

    Removing useless templates

commit d7fb33fd7fb0d82aa00258136394f511f4aa07a7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 15:10:26 2013 +0100

    Fixed rss widget configuration bug

commit c31f47d88f349b6b860984a4616b22a1cec0c1f7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 15:10:26 2013 +0100

    Fixed rss widget configuration bug

commit c657359189483404c6736b90a15502c4f8e4d593
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Feb 13 14:59:39 2013 +0100

    fixed calendar.js

commit 063143558a31f1a4e081d6125fc496a8204ec842
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Feb 13 14:59:39 2013 +0100

    fixed calendar.js

commit f9d9521ff892bc8ddaca92862ba077694b2f887e
Merge: 0e3e660 c937be2
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Feb 13 14:57:16 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2de118537bb46d28ae20ffc7146bd4f4ed5d5a45
Merge: 38d1a7f 7a628c3
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Feb 13 14:57:16 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0e3e660bff30b5c4e042ddef89ba86e1f62885ac
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Feb 13 14:55:50 2013 +0100

    fix Font Awesome Problem in IE

commit 38d1a7fbda1e417a0f8f8bc76ee1b2ae261cf116
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Feb 13 14:55:50 2013 +0100

    fix Font Awesome Problem in IE

commit c937be298dcd74a47b7ee406be6f99c60f760248
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 14:01:05 2013 +0100

    Fixed broken test

commit 7a628c3f112b607f5f49dcf0c391f0a9e6d49ab3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 14:01:05 2013 +0100

    Fixed broken test

commit b9ea909e5e155a14640a1aa3b21b849a24b124d4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 14:00:45 2013 +0100

    Fixed bad method call

commit 5fdb04efb40202a0ed2b9fd93182e91c3e7ccda8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 14:00:45 2013 +0100

    Fixed bad method call

commit 5d59ebbaee17877173f33cec78983abfbefbee56
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 13:55:46 2013 +0100

    Moved message outputing to command

commit a3cee25e1f8ddbd559a82e5fae943e9e4ce2fcdc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 13:55:46 2013 +0100

    Moved message outputing to command

commit 59b0189a02d2aa0440c389011dedc9b069bba200
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 13 13:47:24 2013 +0100

    Fixing repository infinite loop and some other errors

commit 3685284d8cca2034c21242c279168e01cf3ae012
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 13 13:47:24 2013 +0100

    Fixing repository infinite loop and some other errors

commit 6526311f5947eb46605499d8ac53b8124701d1f6
Merge: af0dd35 a95a434
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 11:50:22 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 52147cef722c0297d9b61b5e5c2bc6b34d47af1e
Merge: 1e45fdc 10ff128
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 11:50:22 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit af0dd35df947145b836f3a7103f9fe57ac45a29a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 11:50:04 2013 +0100

    Fixed wrong namespace

commit 1e45fdcaf08418ea83f8cc78c3dc16d7bda948b1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 11:50:04 2013 +0100

    Fixed wrong namespace

commit 6229a1a0299f599976d9c8ba8d84761addd6efd4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 11:41:48 2013 +0100

    Added resource manager in desktop by default

commit 4658be00e9be38b91c44920a067f6a770739a5f6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 11:41:48 2013 +0100

    Added resource manager in desktop by default

commit 82596a40d38aa71c3b32068408903e0e46a2806d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 13 11:41:28 2013 +0100

    Merge

commit 0e5c777d5c8a5fdabcb44ef050bc5839ea67b86a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 13 11:41:28 2013 +0100

    Merge

commit 4eaf59035c3c8704a74893662d5e10d5edb6bc0b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 13 11:36:55 2013 +0100

    Sf2 notation when calling a doctrine repository

commit 066f582a968c71a7fb60a0bd58def86c4774ed38
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 13 11:36:55 2013 +0100

    Sf2 notation when calling a doctrine repository

commit a95a434e38e1a47f6dda3f50c41cba5fb8d7be45
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Feb 13 11:25:57 2013 +0100

    fixed path bug for calendarcontrollertest:wq

commit 10ff12868e3fd11cd867bf32f73ea79fa8ae66ac
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Feb 13 11:25:57 2013 +0100

    fixed path bug for calendarcontrollertest:wq

commit e33bb5a8e6f9cc6f0453ee2eeea3de0755b68fed
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 11:22:49 2013 +0100

    Restored symfony exception template in dev environment

commit 84e1797ad827d921d968ac8f215fca155fb3f272
Merge: e2c7fa7 d5dc427
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Feb 13 11:02:28 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 584f8fde522b8f8351dfc493b6fcef1bec466057
Merge: 736c018 88b8d13
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Feb 13 11:02:28 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e2c7fa7231766277dc2df6a4d94f57e657c2cac7
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Feb 13 11:02:14 2013 +0100

    Upadate views and tool list icons

commit 736c018b034404853465ac97e98d3d79099c3f1d
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Wed Feb 13 11:02:14 2013 +0100

    Upadate views and tool list icons

commit fc6af6e42ba472eac8e1cd7b230ec816aace0f33
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 13 10:51:08 2013 +0100

    renaming the last methods of the repositories

commit 00485c8552c7fa305246b2cc4b11332cc114c172
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 13 10:51:08 2013 +0100

    renaming the last methods of the repositories

commit 0e07da1d8484e716e07455db74f02f378947bc4a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 13 09:58:23 2013 +0100

    tool_properties javascript fixing

commit 8b0cd5de4d69460f4e8ffdd61112b50410e7cfd1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 13 09:58:23 2013 +0100

    tool_properties javascript fixing

commit daf377e4c7d50e20dc50aa5ca4b38d6b7b651e33
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 09:53:43 2013 +0100

    Removed unused entity

commit ec1e795e77ef725a7b0a9d40bcf709bcf5dc2635
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 09:53:43 2013 +0100

    Removed unused entity

commit 181cb72ceef21eec4050650dc99e89793cfa85e6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 09:53:01 2013 +0100

    Fixed checkstyle violations

commit b3dae00d246b349fbd9307da20ad416b3e029cce
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 09:53:01 2013 +0100

    Fixed checkstyle violations

commit d5dc427b1bb34b60e2c8c84f13c04d9978e44e7c
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Feb 13 09:38:02 2013 +0100

    Fixed broken test calendarcontrollertest.php

commit 88b8d1305fd6b94ab7167d75606ec7c065283330
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Feb 13 09:38:02 2013 +0100

    Fixed broken test calendarcontrollertest.php

commit 7c6f9e6d60e6c5c71f99ec0b1e3bcf0c5d40f3ba
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 09:21:49 2013 +0100

    Restored missing translations

commit a696251b6e116f4c6796baf7a7d244c2fb13391d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 13 09:21:49 2013 +0100

    Restored missing translations

commit 2049ab6ad3f1605d35fc7ba21fd710e95066cbd9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 12 09:11:33 2013 +0100

    Removing a doublon method

commit 9fa8e63d17bd0de7d7fc057d2948b13d29c42516
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 12 09:11:33 2013 +0100

    Removing a doublon method

commit 59070b976e06618546785bc297f3c55f4175dc05
Merge: 94501ac d963dbb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 12 09:10:19 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Entity/Workspace/AbstractWorkspace.php

commit d9d1066c6d5cbf4af53756777b513e556be619b6
Merge: 44d6f10 b9b874d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 12 09:09:39 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Library/Resource/Manager.php
    	src/core/Claroline/CoreBundle/Library/Workspace/Creator.php
    	src/core/Claroline/CoreBundle/Repository/RoleRepository.php

commit 94501acbdc21f062a9d4763d34d16071a2eadee4
Merge: c41949e 029f77e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 12 09:09:39 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Library/Resource/Manager.php
    	src/core/Claroline/CoreBundle/Library/Workspace/Creator.php
    	src/core/Claroline/CoreBundle/Repository/RoleRepository.php

commit d963dbbf31441a125a66f843f58850ca23f22bd5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 12 09:07:43 2013 +0100

    Fixed merge error

commit 44d6f10a048d5c25067ca686afe56fc80bf2e79d
Merge: 492bc39 8a5d4f6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 12 09:07:25 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Entity/Workspace/AbstractWorkspace.php
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php

commit c41949ece813c7de39aeb8982ce8951ae71366cc
Merge: 65e8adf 3cc0993
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 12 09:07:25 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Entity/Workspace/AbstractWorkspace.php
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php

commit b9b874dd598e55a7157043fb0d181f10c9dd9018
Merge: c0cbbc7 8a5d4f6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 12 09:04:02 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 029f77eb5b59f3bd28195443094e03e7adf81f99
Merge: 352f559 3cc0993
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 12 09:04:02 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit c0cbbc743d2850f6c0e181613c183e4ed7477a2d
Merge: 1233726 361f505
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 12 09:03:42 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceRightsController.php
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php
    	src/core/Claroline/CoreBundle/Entity/Role.php
    	src/core/Claroline/CoreBundle/Library/Workspace/Creator.php
    	src/core/Claroline/CoreBundle/Repository/AbstractResourceRepository.php
    	src/core/Claroline/CoreBundle/Repository/RoleRepository.php
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceController/ResourceRightsControllerTest.php
    	src/core/Claroline/CoreBundle/Tests/DataFixtures/LoadDirectoryData.php

commit 352f559d6c8db0e5cb583323a147ad9df28aed89
Merge: 3514980 88b6b16
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 12 09:03:42 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceRightsController.php
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php
    	src/core/Claroline/CoreBundle/Entity/Role.php
    	src/core/Claroline/CoreBundle/Library/Workspace/Creator.php
    	src/core/Claroline/CoreBundle/Repository/AbstractResourceRepository.php
    	src/core/Claroline/CoreBundle/Repository/RoleRepository.php
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceController/ResourceRightsControllerTest.php
    	src/core/Claroline/CoreBundle/Tests/DataFixtures/LoadDirectoryData.php

commit 492bc398925c3447039408aa372cded69797ef1b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 12 08:52:30 2013 +0100

    Workspace tool management refactoring (same order for every role)

commit 65e8adf81d8f6c49f53ca3a1e6f2ddb57c7b40d2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 12 08:52:30 2013 +0100

    Workspace tool management refactoring (same order for every role)

commit 8a5d4f60eaf37d68825932ed52eca0451644b2e6
Merge: 0315b52 361f505
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Feb 11 17:23:37 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Entity/Workspace/AbstractWorkspace.php
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php

commit 3cc09930da0d6344c7ec63e164b638d5834008c7
Merge: 1a04c03 88b6b16
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Feb 11 17:23:37 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Entity/Workspace/AbstractWorkspace.php
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php

commit 0315b529cf1149d0d4f40f8cd4613cb67dbf396b
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Feb 11 17:16:38 2013 +0100

    more features : aggreation for the workspaces

commit 1a04c03e3f0a9c04f1ae291aae26a3111e392c01
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Feb 11 17:16:38 2013 +0100

    more features : aggreation for the workspaces

commit 123372659bc4888b1dbb298e12071aa25e531f54
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 11 15:53:21 2013 +0100

    Refactored resource rights management + new fixture system

commit 35149801cf52b8d7953a597fafb962ed604bb266
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 11 15:53:21 2013 +0100

    Refactored resource rights management + new fixture system

commit 361f5055cc04bb6b065f2b23d3ec99c77536429b
Merge: 3316f6b 09d2b66
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Feb 11 09:30:24 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Layout/top_bar.html.twig

commit 88b6b16784f39380ffcab09b8756434d5d16f1d8
Merge: ee4f616 a95fe96
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Feb 11 09:30:24 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Layout/top_bar.html.twig

commit 3316f6b318768ebc10bbd992a0a8e86b74fb4e4e
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Feb 11 09:27:31 2013 +0100

    Solve a problem that appears in the moment of the last merge

commit ee4f6166a00b2f7cdf0d7c963b6de2c61a413791
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Mon Feb 11 09:27:31 2013 +0100

    Solve a problem that appears in the moment of the last merge

commit 09d2b6664b94711f11109359bf3ccbb3616cc77b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 11 09:24:43 2013 +0100

    fixing the broken test

commit a95fe96f46d0d82db133701c8253c40e1a33a9c7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 11 09:24:43 2013 +0100

    fixing the broken test

commit ed41072da4aa25cccc65cdf98245c6133e1a051d
Merge: 99549ea 135f4ce
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 15:46:40 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f77f5fcd1c4062392a4df39ba433fd6883fa4855
Merge: 788bcc6 eca5c33
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 15:46:40 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 99549ea26d2d4d52c79bee12debb496245c2252b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 15:46:21 2013 +0100

    Refactoring UserRepository methods name

commit 788bcc6520103adce0bed5b865d8f09f3343c7a3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 15:46:21 2013 +0100

    Refactoring UserRepository methods name

commit 135f4ced5a8260ef63977f0e2b9960a7c7bd4363
Merge: b347114 4eb58f3
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Feb 8 15:27:15 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Layout/top_bar.html.twig

commit eca5c3330fc88b1bb4098f9785689cb4f4af41e0
Merge: 1e10465 864f668
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Feb 8 15:27:15 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Layout/top_bar.html.twig

commit b347114983db302f7f438e845824a756c801751d
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Feb 8 15:19:43 2013 +0100

    Update of user interface in the top bar & add a string in language

commit 1e10465989c2589e005bd66c07b4ff9365669fb2
Author: Jorge Solis <jorgeluissolis@gmail.com>
Date:   Fri Feb 8 15:19:43 2013 +0100

    Update of user interface in the top bar & add a string in language

commit 933b1e0595978f98a7964fc45bf54c6ccdd08d4f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 11:50:37 2013 +0100

    Renamming RoleRepository methods

commit e061b83b85c17a7322535b74ab99c67894ca0564
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 11:50:37 2013 +0100

    Renamming RoleRepository methods

commit 3b846ee611869611a85f3d88a882a33a92210c15
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 11:42:28 2013 +0100

    rennaming ResourceActivityRepository method

commit fa1b84c662ff5842ea7595f8f6c4f340318ff0bf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 11:42:28 2013 +0100

    rennaming ResourceActivityRepository method

commit 8d93714e1a5025beaa2b29a800342c23b396b32c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 11:39:57 2013 +0100

    rennaong ResourceLogRepository method

commit 70df20bf5c862935b165f9aee16e67a1736e664e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 11:39:57 2013 +0100

    rennaong ResourceLogRepository method

commit 4eb58f3e3a9ff68f36985c29c66729776396d2d6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 11:34:10 2013 +0100

    renaming ToolRepository methods

commit 864f66852429268985a5f04a97a6c9a69b91df8f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 11:34:10 2013 +0100

    renaming ToolRepository methods

commit 1ed2bfba9dc5cd7e0df823ada5f13c9c729a49e4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 11:03:13 2013 +0100

    removing entity converter

commit 667b3a8bca3f4c030f89aedc628137669624cfab
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 11:03:13 2013 +0100

    removing entity converter

commit b95f681729104d305cc10f777f6df6fa993a24d7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 10:52:48 2013 +0100

    Removing CoreBundle/DataFixtures from the code coverage

commit 168859fb434eb314203f51455de3a4cf7610953b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 10:35:25 2013 +0100

    some fixes + Renaming (and improving) ExampleTextBundle

commit 81a6fdc8f76200807c6d738f75e44bf80417bea4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 8 10:35:25 2013 +0100

    some fixes + Renaming (and improving) ExampleTextBundle

commit 626c33f29760aafdd13f109625ed8b0ac06debad
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 7 17:10:14 2013 +0100

    removing useless fixtures

commit d470f601ade7177a20647f0231f87216e6b1ea8c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 7 17:10:14 2013 +0100

    removing useless fixtures

commit 4afef16cee9f05aab0157b82eac77d7fd7dc718a
Merge: 20722fb f8542f1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 7 16:35:37 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 86eb96c6ca95f2fa25f4e03902f9422ae1abcf72
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 7 16:34:42 2013 +0100

    Plugins can declare tools

commit 20722fb6f5b69ed52fc960093f13d5f097d28927
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 7 16:34:42 2013 +0100

    Plugins can declare tools

commit f8542f1871ecefb6c07ab09ad768f0a01763f402
Merge: 403b62b d21b2e3
Author: esdras <esdras@esdras-RV420-RV520-RV720-E3530-S3530-E3420-E3520.(none)>
Date:   Thu Feb 7 16:12:27 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 403b62b2dd28a7ec7b04e5ee0f20c1579ad962d1
Author: esdras <esdras@esdras-RV420-RV520-RV720-E3530-S3530-E3420-E3520.(none)>
Date:   Thu Feb 7 16:09:55 2013 +0100

    Bootstrapt front end dependency update

commit cd9bba76494c58eef75b788f1be04878dde7d7f3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 7 13:30:33 2013 +0100

    Redirection to the first tool of the list when a ws/desktop is opened

commit 003192420195b056dceb708609565ea60a5e8d4a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 7 13:30:33 2013 +0100

    Redirection to the first tool of the list when a ws/desktop is opened

commit 42c0930fd08dab195e509f49813abdc1ebe08cd9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 7 11:03:04 2013 +0100

    Anonymous tools management in workspace

commit d21b2e3dd5dc6a55b351f1d780e3e8e418c6c6f6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 7 11:03:04 2013 +0100

    Anonymous tools management in workspace

commit 2c9d5ac3ae8e43e6c407e8c418c1fa25e00a0547
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 7 10:13:56 2013 +0100

    workspace tools management

commit 1d599f313b56cb08244737278d7d25dc09f13f88
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 7 10:13:56 2013 +0100

    workspace tools management

commit 7ce02a561b46141aa53938fbe79ef9457aafb02c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 5 16:15:13 2013 +0100

    Reafactoring the workspace configuration class

commit cdb9c8e240a85d6dcbead3a271965ec3f4f4c526
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 5 16:15:13 2013 +0100

    Reafactoring the workspace configuration class

commit 0e2d0ed27447993a33dfd7d4ea6d001b78050915
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 5 13:39:26 2013 +0100

    Basic tool configuration for the desktop

commit edd4e5029e4ee04a4d1cacaec5e685be7539e698
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 5 13:39:26 2013 +0100

    Basic tool configuration for the desktop

commit d00a2c4a471e1d1a8f6bb58a815729cdfd93f25e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 1 15:27:23 2013 +0100

    Removing WorkspaceRight entity

commit a2a8f077d1473335754508b232d090992e22efc3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 1 15:27:23 2013 +0100

    Removing WorkspaceRight entity

commit 427cd2079519f7242b9ecbb937e1c9dd696bf3ce
Merge: 88fb252 5eb5ee9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 1 11:53:39 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 70342db6fd9411b3c45f54c35dbf07302313fe60
Merge: bb795a9 83a3bee
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 1 11:53:39 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 88fb252f75d748edf5f5db34d1f54f1b028ccc45
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 1 11:53:21 2013 +0100

    prepull commit

commit bb795a9cd92e76637b1243acb0ed4ae0e36f1858
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 1 11:53:21 2013 +0100

    prepull commit

commit 83a3bee67964baf8bce39a8c65741369dd036816
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Feb 1 11:49:59 2013 +0100

    Calendar is now a tool (a broken one)

commit 5eb5ee90f08f9fef77d27f33ed31ab8cbe8f8f43
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Feb 1 11:49:59 2013 +0100

    Calendar is now a tool (a broken one)

commit 3288c21869a36499f7a613bf6eba70ea2a19c12c
Merge: 99ff85e a4a1baa
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Feb 1 10:49:35 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceRightsController.php
    	src/core/Claroline/CoreBundle/Resources/config/routing/desktop.yml
    	src/core/Claroline/CoreBundle/Resources/views/Desktop/layout.html.twig

commit d6d03f698d2d5b5688ac3d6206294f96e4a47a79
Merge: b2fab3a 1b71f2c
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Feb 1 10:49:35 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceRightsController.php
    	src/core/Claroline/CoreBundle/Resources/config/routing/desktop.yml
    	src/core/Claroline/CoreBundle/Resources/views/Desktop/layout.html.twig

commit 99ff85efd037bdf8ac7809765e81244dd3138c31
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Feb 1 10:46:01 2013 +0100

    calendar for desktop + fixed bug for phpcs:²

commit b2fab3ad349c6c25cb64195c619e6274b37d5cac
Author: easy-es <esdras005@hotmail.com>
Date:   Fri Feb 1 10:46:01 2013 +0100

    calendar for desktop + fixed bug for phpcs:²

commit 1b71f2c5a8e92bd9545f6f1a68b67552c15c0d7e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 1 10:05:25 2013 +0100

    cleaning some code

commit a4a1baa171d783a1557f00f83c044244de8acfa4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 1 10:05:25 2013 +0100

    cleaning some code

commit 571f353cdb83c20daf23f1d8b4ffdd6c2eff16a8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 1 09:31:32 2013 +0100

    workspace and desktop are now composed of tools: second commit (desktop)

commit 33624e11e6be4b562b9c6b8a07ac78f6c850dca6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 1 09:31:32 2013 +0100

    workspace and desktop are now composed of tools: second commit (desktop)

commit cf83416dfd2b8eb14f2bb3eb46050813fa5a8256
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 1 08:48:38 2013 +0100

    Fixed resource search bug

commit b7c1e8237d5c98c598a4c4b368e0b2ffa996092b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 1 08:48:38 2013 +0100

    Fixed resource search bug

commit 3b02102d6ba698bed2f868bf2e078231d86c81b5
Merge: c95cf55 08f4f2f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 31 13:44:47 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/config/routing/workspace.yml

commit e75cdc24eda736a89d2dd5fd363395b8f0aca98a
Merge: b8aed58 8ef0ac2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 31 13:44:47 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/config/routing/workspace.yml

commit c95cf55a2262e315550f066bb4e279973d2106c1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 31 12:04:37 2013 +0100

    Workspace and Desktop are composed of tools: first commit (workspace)

commit b8aed58306dc57837962cae99016fbf7090912e3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 31 12:04:37 2013 +0100

    Workspace and Desktop are composed of tools: first commit (workspace)

commit 08f4f2f961ad4c4a49d1c9cb2217d21da9295551
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jan 29 16:48:54 2013 +0100

    Adapted phpcs ruleset to windows

commit 8ef0ac2519a2461868ec2a479958c55e1183ec7c
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jan 29 13:54:04 2013 +0100

    fix bugs with phpcs

commit 272379c7c55acd18b1e73b952253fefed706fc3c
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jan 29 13:54:04 2013 +0100

    fix bugs with phpcs

commit 209e188a7bd9cbf6d9b919fd9f93da44294f6097
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jan 29 11:00:14 2013 +0100

     fixed partially error from phpcs callendarcontroller

commit e39530bc0fab1ca805e8970e325f32d9b1f51736
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jan 29 11:00:14 2013 +0100

     fixed partially error from phpcs callendarcontroller

commit 0bf07db6e9d4e5721aa60979b4b602f2b64ab11f
Merge: c1e94f0 45b8c10
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jan 28 16:37:53 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 821950a3ecea0a3aead125da0be3d593515202e3
Merge: 1ca7bf8 480e6d5
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jan 28 16:37:53 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c1e94f0765b0febcff521790597df4425a7591ba
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jan 28 16:36:08 2013 +0100

    calendar stable version

commit 1ca7bf8405c0fc3c157bb74930dc87d7a2aa09a5
Author: easy-es <esdras005@hotmail.com>
Date:   Mon Jan 28 16:36:08 2013 +0100

    calendar stable version

commit 480e6d5f3d55fce6eab0e757c4d741e456ab31f0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 28 16:32:18 2013 +0100

    Updated front end bundle dependency

commit 9a5bc807077cc15c5350dbd6c35dc3874d18272c
Merge: 09a1e1b b9d1611
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 24 16:46:00 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 09a1e1bd12881663daa80c38308f2b56097e36c6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 24 16:45:08 2013 +0100

    Overriden exception template in debug environments

commit b9d1611b434bc751226388fe58f27d36145800d1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 24 10:28:37 2013 +0100

    Moving Rights/ResourceRights.php to Resource/ResourceContext.php

commit 45b8c10f5a4c7d4433a32b795e7312f41f6e8123
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 24 10:28:37 2013 +0100

    Moving Rights/ResourceRights.php to Resource/ResourceContext.php

commit e549b4c6dfc16cdc8e259f03172af5f90759346a
Merge: b7eac9c e06c0ea
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 23 17:49:54 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 7007e1842789cfd80148686ccac44570b966601e
Merge: 5604edf d5f1887
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 23 17:49:54 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b7eac9cf52debad5550c568575fb68079abecbf7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 23 17:48:16 2013 +0100

    Rights managements for resources:
    - Removing the 'VIEW' right.
    - Refactoring the properties form.
    - Adding workspace_id to the ResourceRight entity

commit 5604edf7f22e666a372e4a9f500fa62bef62a033
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 23 17:48:16 2013 +0100

    Rights managements for resources:
    - Removing the 'VIEW' right.
    - Refactoring the properties form.
    - Adding workspace_id to the ResourceRight entity

commit ff89a9d53c0166a27a5683735c8db02f79512c7c
Merge: 9ae8b49 d5f1887
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jan 23 15:33:33 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 44fa1e85f8ab257946b45d392660cf8b385d857e
Merge: f1e1582 e06c0ea
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jan 23 15:33:33 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e06c0ea6d68e71f0ae2a8e3ed46f73129ce12acf
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 23 15:32:56 2013 +0100

    Fixed wrong length specification

commit d5f1887111fcb7a755b02561f0f129a1e61ec203
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 23 15:32:56 2013 +0100

    Fixed wrong length specification

commit 9ae8b499a0a1538386992a14ddf8aec9555d11c8
Merge: dab207b fcc6320
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jan 23 15:14:28 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f1e1582fbfb48e7100935b71945ee1b9448c352b
Merge: 70aadea d58f5c4
Author: easy-es <esdras005@hotmail.com>
Date:   Wed Jan 23 15:14:28 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d58f5c4e6ea55f7cda1c7e859123833d14273e4f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 23 15:08:03 2013 +0100

    Increased varchar size

commit fcc632029995d4ce4937f78376976d84b93622d2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 23 15:08:03 2013 +0100

    Increased varchar size

commit dab207bbaf0bd1385f3a67f769099d29940b5c11
Merge: 0505974 2b70a60
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jan 22 17:33:44 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 70aadea03d3ef9f333971b8acd60f853b79f8b59
Merge: 70ab31e 3593cb2
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jan 22 17:33:44 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 3593cb2f9c72c67e199119432c06801d0ad04435
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jan 22 17:33:05 2013 +0100

    Added missing type in mapping

commit 2b70a6001f1c522534e4f626140dc10585494e6e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jan 22 17:33:05 2013 +0100

    Added missing type in mapping

commit 05059749ff0434338b9728f7b78cdcef1c4a8d0c
Merge: e9fb5eb 3ad458c
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jan 22 17:15:43 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/CalendarController.php

commit 70ab31ebd20df6bc61fdb47f2db5fe1f26242f3a
Merge: 88a9e27 61d58f5
Author: easy-es <esdras005@hotmail.com>
Date:   Tue Jan 22 17:15:43 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/CalendarController.php

commit e9fb5eb43349bcbaebaadfa818de9cd981ed7699
Author: unknown <ege@ege-PC.(none)>
Date:   Tue Jan 22 17:08:29 2013 +0100

    calendar v1.2 added: updat,delete events

commit 88a9e2794f55c5831e5aa2ea6f48c820ba7a1254
Author: unknown <ege@ege-PC.(none)>
Date:   Tue Jan 22 17:08:29 2013 +0100

    calendar v1.2 added: updat,delete events

commit 337aa2e167487da065a59367af154a2170ddcccb
Merge: 1af077d 61d58f5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 22 16:13:36 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 33239952249b0d3b687492d3ecacb2db9834f6aa
Merge: 62226d0 3ad458c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 22 16:13:36 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1af077df0d1dcd66e0b829fbb9e05639c63763ed
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 22 16:12:48 2013 +0100

    Removing 'VIEW' right and adding the owner righrs on a resource.

commit 62226d090b37fa45ef8c2997ed031cab69cf568b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 22 16:12:48 2013 +0100

    Removing 'VIEW' right and adding the owner righrs on a resource.

commit 61d58f50f8556a2b5b29bb175652537135472a76
Merge: 073a944 10d1f9e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jan 22 11:10:21 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	todo.txt

commit 3ad458c7d001a835317333a5f896f98e3e39c3a4
Merge: 90cffc8 7200638
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jan 22 11:10:21 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	todo.txt

commit 073a9441cae26327fac2ab545cb71be6a04e0784
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jan 22 11:08:59 2013 +0100

    Moved doc files

commit 90cffc82f81b9fa8f0813990f2f452f3c584376b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jan 22 11:08:59 2013 +0100

    Moved doc files

commit 10d1f9e0b6153308f1ba8f371593e9a863d151ea
Merge: 99b6b01 9027b40
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 22 10:26:42 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/Library/Security/Voter/ResourceVoter.php
    	src/core/Claroline/CoreBundle/Tests/Controller/ActivityControllerTest.php
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceController/ResourceControllerTest.php

commit 720063880480f3c00a7efea1de017695c20f61a6
Merge: 4266b2d a5939db
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 22 10:26:42 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/Library/Security/Voter/ResourceVoter.php
    	src/core/Claroline/CoreBundle/Tests/Controller/ActivityControllerTest.php
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceController/ResourceControllerTest.php

commit 99b6b012e142b8b4d28c3ca3942b587d851df9a4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 22 09:51:05 2013 +0100

    Making PHPMD happy

commit 4266b2dc3476b7f8b64b4c9494d37835b35adaff
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 22 09:51:05 2013 +0100

    Making PHPMD happy

commit 5c142be6b96e08499e9dd1f07c02c2d90572689f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jan 21 13:04:08 2013 +0100

    Refactoring the resource voter

commit 00a00571704cdbb19afd438e676e336a49a31725
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jan 21 13:04:08 2013 +0100

    Refactoring the resource voter

commit ed4b4c88e6cd5fa637a3f0638981b66385ecbea5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jan 21 09:17:32 2013 +0100

    Replacing <video> tag by <object> tag in VideoPlayerBundle

commit 9027b40690eaf2871f26546db7d6db8082a09c1e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 21 08:53:46 2013 +0100

    Fixed wrong configuration

commit a5939db74c95ccbf8103dbe791164d078a44123d
Merge: cc49afb eaa07b5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 18 17:58:06 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	app/dev/code_analysis

commit e2f365bfdbee5138f4a76208cdb8816f680a5d35
Merge: e52c3f1 9a8c612
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 18 17:58:06 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	app/dev/code_analysis

commit cc49afbbc541a249621f2869896c8358549f44ce
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 18 17:55:11 2013 +0100

    Enforced coding standard

commit e52c3f103fc4c0e956f1ed7e7034d48c9fb57f57
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 18 17:55:11 2013 +0100

    Enforced coding standard

commit eaa07b55ab92634c06ca1c8db3253dc2a6ea2db2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 18 14:46:04 2013 +0100

    checkstyle

commit 9a8c612ab90bfc3996ece98a4e1c278b8ab8271a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 18 14:46:04 2013 +0100

    checkstyle

commit 52f243389aa0aac957972e44ddb3379823b172ed
Merge: ecb1148 97dc90e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 18 14:44:33 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 70beb63e01c6dc2d097b9937053048659ca33a46
Merge: e8dd7e5 4c440df
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 18 14:44:33 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e8dd7e5df59e2283b5d4a7f678b66d690a93e135
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 18 14:44:16 2013 +0100

    fixing code_analysis

commit ecb1148a661b79da90a991e7a3307bbc356abe02
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 18 14:40:14 2013 +0100

    Some resource stories (draft)

commit c128d07e798b53f5d3061c9d2297988d554e3e95
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 18 14:40:14 2013 +0100

    Some resource stories (draft)

commit 97dc90ed22b6575d801ca7813c81073c12fcdbb4
Merge: 8fc9362 2dd33f0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 18 13:05:19 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Repository/UserRepository.php

commit 4c440dfd34b7df1482cb8b2281fbbc029bcc46dc
Merge: 05ca4f1 2d6b1f4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 18 13:05:19 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Repository/UserRepository.php

commit 8fc93624ef15a5d72ffe771f939f5a38f3c22cd2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 18 13:03:42 2013 +0100

    Enforced coding standard

commit 05ca4f173ef3901fc7eb4b8843e6a7bf01cc116a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 18 13:03:42 2013 +0100

    Enforced coding standard

commit 2dd33f04f4cf9776757d3e37a4c2bd182c0cdad4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 18 11:10:52 2013 +0100

    Documentation

commit 2d6b1f42e9d9bca4fead47e12b438ee9e46ed5ed
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 18 11:10:52 2013 +0100

    Documentation

commit d89cfe8913e46f6367aa9ee6de8e5d0c5ad3eb16
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 17 18:17:01 2013 +0100

    Fixing last errors + some checkstyle

commit 5e41a1432e1d24c07572ad800bb83288545571ea
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 17 18:17:01 2013 +0100

    Fixing last errors + some checkstyle

commit a816fca7592cf93db7752b43397536ce80de9d39
Merge: f4a5e30 03234b0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 17 17:47:25 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit de5b909ca00d7ea359db6c0440d29800dfe9d709
Merge: 2fad00c 75a1bcc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 17 17:47:25 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f4a5e30a23dca8c59fd752fe0764cc25cf73c8e7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 17 17:46:56 2013 +0100

    checkstyle

commit 2fad00cb62331c8a9f6ca50ac7c41ac7cdb4765f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 17 17:46:56 2013 +0100

    checkstyle

commit 03234b0caf64e4eeb042be7bb98f09a101737696
Merge: 2db2f29 5c89ff1
Author: Stéphane Klein <me@here.com>
Date:   Thu Jan 17 17:42:31 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/WorkspaceGroupController.php
    	src/core/Claroline/CoreBundle/Controller/WorkspaceUserController.php
    	src/core/Claroline/CoreBundle/Entity/Resource/AbstractResource.php

commit 75a1bcc53cd5578099972d9ed3e1d0c9566e9d4f
Merge: 54aed18 80aa93b
Author: Stéphane Klein <me@here.com>
Date:   Thu Jan 17 17:42:31 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/WorkspaceGroupController.php
    	src/core/Claroline/CoreBundle/Controller/WorkspaceUserController.php
    	src/core/Claroline/CoreBundle/Entity/Resource/AbstractResource.php

commit 2db2f298c6443f334f0bbcb975b0749b96c7db53
Author: Stéphane Klein <me@here.com>
Date:   Thu Jan 17 17:33:05 2013 +0100

    Fixed style violations

commit 54aed18c7759c203e62d279064975cd1f32a0924
Author: Stéphane Klein <me@here.com>
Date:   Thu Jan 17 17:33:05 2013 +0100

    Fixed style violations

commit 812c17f6fc2ae0799dc4c3e6dc2f8107c99f0421
Author: Stéphane Klein <me@here.com>
Date:   Thu Jan 17 17:32:40 2013 +0100

    Added alternative coding standard

commit 5c89ff190f077307ccb77129df85d3bdbd63d038
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 16:12:06 2013 +0100

    tootip on the new messages icon

commit 80aa93bdcee7c476d7620face6c6581d1cbeecbd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 16:12:06 2013 +0100

    tootip on the new messages icon

commit 2e332f23b034c836a7b58485d132ab1d9cbbde71
Merge: b5782e1 32924d8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 15:13:12 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 053ddf913b8da631dcf31a1549f16ca1e4f68a75
Merge: cad7296 cb8c47b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 15:13:12 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b5782e19aca47b73d0efc62c4b862d2c98a844fe
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 15:11:11 2013 +0100

    Small refactoring of the icon creator

commit cad7296bfb9942810a03293c367a8bed22c0bc3a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 15:11:11 2013 +0100

    Small refactoring of the icon creator

commit fd5197f9989ef559e59f63fc107885fb5b58d38c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 14:12:13 2013 +0100

    Documentation For Library/Resource Converter, Exporter and IconCreator classes

commit ce6ddd78438130d626f38a0aa47d1109a449e209
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 14:12:13 2013 +0100

    Documentation For Library/Resource Converter, Exporter and IconCreator classes

commit 32924d8ffa8db7810efb35b00311c1b6c89ffec8
Merge: 481e5bc 9936b88
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 16 13:57:06 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit cb8c47b461994911e21e6bcdbf411fcbc19b163b
Merge: 162c109 2949307
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 16 13:57:06 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 481e5bcab0d7845f7c5c6fe8b030034c80f9836d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 16 13:56:50 2013 +0100

    Removed canManage permissions

commit 162c1096025d22f0e5132ee64098a8db52c6166f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 16 13:56:50 2013 +0100

    Removed canManage permissions

commit e982948d0fa617ad5bac61deaa51dd4a9d8a0a85
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 13:25:55 2013 +0100

    Renaming a class

commit caf3ca0261c4a6ec7a250cebfd3befa3be171fc4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 13:25:55 2013 +0100

    Renaming a class

commit be469b53e935905510e5c64adcef0671c2250eda
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 11:56:17 2013 +0100

    Small refactoring of the checkRemoveManagerRoleIsValid method

commit 80bfbc70e1670ba472dafdabe92f3212a86c5df1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 11:56:17 2013 +0100

    Small refactoring of the checkRemoveManagerRoleIsValid method

commit c52e435a81690ae8fee3d8b0529a95043c7d27c1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 16 11:53:46 2013 +0100

    Refactored resource rights repository

commit c1c6aa1c117a177d233dfaa538aba73a83f97eba
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 16 11:53:46 2013 +0100

    Refactored resource rights repository

commit 9936b8863f714eb2c4120d6d9445bd10f6155f44
Merge: a135318 b03f699
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 11:40:13 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 29493073334c604531ae349e3f06ca221def406f
Merge: cb6b427 a96cf67
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 11:40:13 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a135318d682ab8865e5477d976d0562d5e69ab4f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 11:38:45 2013 +0100

    Messages are ordered by date

commit cb6b42744e8c506414b7f108a52516a4c1fc1d7e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 11:38:45 2013 +0100

    Messages are ordered by date

commit 6566276dd3ca9bf6e878977083e27c65ee355d91
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 16 11:34:42 2013 +0100

    Added missing translation

commit beadf46e820039bfe1fb2382fd5b8c7a99319b60
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 16 11:34:42 2013 +0100

    Added missing translation

commit c9f2b7d228e090d8a2b2c91acd917326f5ea0428
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 16 11:17:17 2013 +0100

    Refactored top bar

commit 35c7d25e9114d60ce8b1f93ec4fdcbcdf2a1478e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 16 11:17:17 2013 +0100

    Refactored top bar

commit 7e973d6c701be3088ceee43b5f65396c819ebe17
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 11:06:46 2013 +0100

    Controllers documentation

commit d6f0cd969a0d3870bcb06ba3185ee2e6ccad17b7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 16 11:06:46 2013 +0100

    Controllers documentation

commit b03f699f4f9302fad692f7fcccef9d34f6800061
Merge: 51b01b9 ecb8c93
Author: Esdras Ngongo <emmanuel.gervy@claroline.net>
Date:   Wed Jan 16 10:30:46 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Entity/Workspace/AbstractWorkspace.php

commit a96cf67f2ba08dcf7dc9cc81c5eff4d8997f1a14
Merge: 4d97ae3 998bfb0
Author: Esdras Ngongo <emmanuel.gervy@claroline.net>
Date:   Wed Jan 16 10:30:46 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Entity/Workspace/AbstractWorkspace.php

commit 51b01b9ed72c6c7b30f6c4489e0fbc490f308acf
Author: Esdras Ngongo <emmanuel.gervy@claroline.net>
Date:   Wed Jan 16 09:55:56 2013 +0100

    calendar event  v1.0

commit 4d97ae35064a4bb2bc3709b35edafd3882d04ef5
Author: Esdras Ngongo <emmanuel.gervy@claroline.net>
Date:   Wed Jan 16 09:55:56 2013 +0100

    calendar event  v1.0

commit ecb8c93b71bb20b338eb2cc8d5271e277684cb04
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 15 16:22:13 2013 +0100

    Moving ResourceRights and WorkspaceRights classes in the Entity\Rights folder

commit 998bfb028434b3a6b9f156a54cc9388a61507347
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 15 16:22:13 2013 +0100

    Moving ResourceRights and WorkspaceRights classes in the Entity\Rights folder

commit 8ead76a5753287962a3fdbf41cd0d5114af932bb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 15 16:08:23 2013 +0100

    ResourceLogger renamed ResourceLog

commit e62f88f1392c55cc11b0876669d2713b012df3d8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 15 16:08:23 2013 +0100

    ResourceLogger renamed ResourceLog

commit 6e99bf234a4ca7a03c6b34edc769a621a9c944b2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 15 15:42:41 2013 +0100

    Fixing the IconCreator (CreateShortcutIcon only worked with png)

commit 420f9d872640ebaffad3fa170d7d62d46a68e273
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 15 15:42:41 2013 +0100

    Fixing the IconCreator (CreateShortcutIcon only worked with png)

commit 961bdd095a316cd2092a6ab38908ce48d324e901
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 15 15:00:23 2013 +0100

    Anonymous user can't see  widgets

commit ebc9b16b4e5e38071d93b3c9030b69ff9f0f2aab
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 15 15:00:23 2013 +0100

    Anonymous user can't see  widgets

commit ff6847a67ef024e75c5c1f2bd18585c52a044d12
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 15 14:51:36 2013 +0100

    Widget aren't locked by default anymore

commit 73a0acda07f4b9af6f5f7413eb20b14a45a76c8f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 15 14:51:36 2013 +0100

    Widget aren't locked by default anymore

commit 727479d0cd9343a03dbb8cbc5437d610c950077f
Merge: abcd581 0e7a146
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jan 14 16:53:52 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php

commit 0bc9cf28b3994d4333cd33612e730676933c3105
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jan 14 16:45:32 2013 +0100

    merge

commit abcd581326a676d32b31d2618f2d9702660235e0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jan 14 16:45:32 2013 +0100

    merge

commit f75c0711b35bccdc0cc207609d63c8410eebd2ae
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jan 14 16:33:22 2013 +0100

    Anonymous management for resources + workspace permissions management

commit 5823dbf675eeb9245355b29af315bc96dfca3b1b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jan 14 16:33:22 2013 +0100

    Anonymous management for resources + workspace permissions management

commit 1e1b25bbbb37793b770f3938583af1a90c9728c1
Merge: 7141bcd 9b50db3
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Mon Jan 14 14:32:18 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0e7a14651543ba1c5753b73116d496c4151143d0
Merge: 8f391a8 dd7d99a
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Mon Jan 14 14:32:18 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 7141bcdde8c9673f59d7348086ae45ba7351db58
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Mon Jan 14 14:29:50 2013 +0100

    calendar tools

commit 8f391a839b29302233be376ea8e406a5f04c8e34
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Mon Jan 14 14:29:50 2013 +0100

    calendar tools

commit 9b50db36d4669bbaa1350713c63853e9dd1172f7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 14 14:03:01 2013 +0100

    Removed wrong array offset

commit dd7d99a4d8008759c7ed1808e0199339ad02de31
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 14 14:03:01 2013 +0100

    Removed wrong array offset

commit 5069ded340a79e4889469bda1e6b3408a71fb573
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 14 14:00:50 2013 +0100

    removed mp4 file reference

commit 907d51f6ee3cd2f70ff3e44091b6fecc91526f98
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 14 14:00:50 2013 +0100

    removed mp4 file reference

commit 3c19bb21b90b75b678c9244709d67290b01fd3d8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 14 13:57:44 2013 +0100

    Added admin resources in demo fixtures

commit 6b811146618185405d9abbf37e9c1409b98e7663
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 14 13:57:44 2013 +0100

    Added admin resources in demo fixtures

commit 05f0de36f49188db362d279b425428e66e5968e3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 14 13:42:10 2013 +0100

    Added on delete set null on resource log user reference

commit 9f904b211a99fd7d02f0b169c50566f60006361b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 14 13:42:10 2013 +0100

    Added on delete set null on resource log user reference

commit d03de9c3ddf077a7075b94410220142bee4a674e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 14 13:37:16 2013 +0100

    Quick fix for user workspace roles display (force doctrine to reload)

commit 2bf24c8cf2f70aaa5bfa8f47047b7575a8aa7f4b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 14 13:37:16 2013 +0100

    Quick fix for user workspace roles display (force doctrine to reload)

commit 3236849ab26300bd6aaf60c3ce60e285e59c59f1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 14 11:50:43 2013 +0100

    Fixed activity progression counter

commit 3ca4203f57e18a94cadeea5ba9ca7afb0a9beea8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 14 11:50:43 2013 +0100

    Fixed activity progression counter

commit a1644b58609a9284710b23fed4ed848a746b3b87
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 14 10:50:36 2013 +0100

    Added missing translation

commit 657d58ec827e02a76f4eb01ded2a5671f0dfca56
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 14 10:50:36 2013 +0100

    Added missing translation

commit 5a568c14119edaec6d0d14ae80beb1e47fa66b34
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 14 10:18:21 2013 +0100

    Disabled autocomplete in user creation form

commit 2049b173f0cbf76b68b100cadf4498f9a7181ec7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 14 10:18:21 2013 +0100

    Disabled autocomplete in user creation form

commit e9ead0661be4748bf70c05e2f0ad81b32df97ab4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 11 17:04:48 2013 +0100

    Fixed resource manager search

commit a9a72bb705296a061cf0ace1323675e38017b00c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 11 17:04:48 2013 +0100

    Fixed resource manager search

commit 167fd3afcb7a3619c88a9b9fe988dbeda5145366
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 11 13:17:03 2013 +0100

    Added missing translations

commit d6a18c6eeb267423cf4ed2b2177f078b54cb5ed9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 11 13:17:03 2013 +0100

    Added missing translations

commit 35f42dd889f0550e59af10e632dbba1e997f32a8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 11 09:25:47 2013 +0100

    anonymous can see public workspaces

commit a78b87c632a4c4d62f26735ae8968301a11f8d60
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 11 09:25:47 2013 +0100

    anonymous can see public workspaces

commit ec7a56b7bea8c873933f64d40befb33b6cb2a713
Merge: 3f0442c 2c56709
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 10 17:28:10 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 956ebdd5c442c043232f844e11ff2883ad5f1564
Merge: 6481f9a d3e1fa3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 10 17:28:10 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 3f0442c8d88ec9ad439ae96cfa033726d89d6c48
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 10 17:26:34 2013 +0100

    Refactoring the role system for workspaces (new Voter, table, ROLE_ANONYMOUS)

commit 6481f9a40ab6d1fda9634d6e28d680a6ecae6997
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 10 17:26:34 2013 +0100

    Refactoring the role system for workspaces (new Voter, table, ROLE_ANONYMOUS)

commit 2c56709a3a46b56a1ce627eb3d22adb81e9f46fb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 9 13:09:01 2013 +0100

    Fixed checkstyle violations

commit d3e1fa363efc7b6dd9d79f53200ce0302fa0d0a2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 9 13:09:01 2013 +0100

    Fixed checkstyle violations

commit 0073402778bbc0e73bff6ef66d386d1418442235
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 9 12:11:43 2013 +0100

    Removed php 5.4 array notation

commit 715337c8ef64363095a4fdf94e841f16e8243f44
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 9 12:11:43 2013 +0100

    Removed php 5.4 array notation

commit 2ff51dddc71e23c49e3a2a4840d0383b53f1dae9
Merge: f96c641 205e255
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 9 12:05:28 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/Repository/AbstractResourceRepository.php

commit dc40d131d6f3174377db71ec6bef58cf0e1cf341
Merge: a6d76da df08e37
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 9 12:05:28 2013 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/Repository/AbstractResourceRepository.php

commit f96c641fed875259a1843600cfff0be26cc89a03
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 9 11:00:07 2013 +0100

    Made creatable resource types list dynamic

commit a6d76da52bf17b393d81f28ed0e79558f357dd07
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 9 11:00:07 2013 +0100

    Made creatable resource types list dynamic

commit f59dc8b75e886bd36d23d2084d26120095f95308
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 8 15:52:33 2013 +0100

    fixed a todo

commit c12c6e1c30db379fe270c7008c9afe46c151c06a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 8 15:52:33 2013 +0100

    fixed a todo

commit 026ddc775bc86eae06a34a6a52ec7106030fb119
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 8 15:36:52 2013 +0100

    Removing the firewall + anonymous user has ROLE_ANONYMOUS

commit b985700bbe6195ed8823e508ecbeed39655fbc74
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 8 15:36:52 2013 +0100

    Removing the firewall + anonymous user has ROLE_ANONYMOUS

commit 55f5a238f4e631aea3152c06d49fe6d47fae7032
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 8 13:47:21 2013 +0100

    Changing the firewall and the top_bar for anonymous users

commit 956c411526acbf0d985c957a338e062c40a2dfdf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 8 13:47:21 2013 +0100

    Changing the firewall and the top_bar for anonymous users

commit 205e255c13cc237f0d86b73fd71ab9cf9226241c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 8 11:23:08 2013 +0100

    removing the mimetype attribute from the resource manager create method

commit df08e37712698d0fb10e42af60ec26d4ce23ac18
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 8 11:23:08 2013 +0100

    removing the mimetype attribute from the resource manager create method

commit a645e47fe80e66946303f9ed19ad9c566782a479
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 8 10:39:35 2013 +0100

    Resource manager menu has some actions disabled if a user is missing some rights

commit 6aec2875d181a981f7af9ed9866a773863ab4cc4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jan 8 10:39:35 2013 +0100

    Resource manager menu has some actions disabled if a user is missing some rights

commit dce5ab1147cf26510cc22c6554f6e8993b9da94a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jan 7 15:27:05 2013 +0100

    Removing unused datas from the resource json responses

commit b32dbeb9a676e62dfa1ec2d8bc469a500844dc2f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jan 7 15:27:05 2013 +0100

    Removing unused datas from the resource json responses

commit 4e41a352e237e88bd1853701a96984bb5134824e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jan 7 14:21:11 2013 +0100

    some modifications for logger and resources repositories

commit 531eda2e2c17fd1a9201559e965d54a0fc874b17
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jan 7 14:21:11 2013 +0100

    some modifications for logger and resources repositories

commit f8fd8396418cc80399c78101e4e217840ef318c2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 7 13:12:20 2013 +0100

    Added foreign key constraint on user_id

commit 02ac29f73fd5e9ea35a51995f2570bbadd5b75f4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 7 13:12:20 2013 +0100

    Added foreign key constraint on user_id

commit 004c86e368e319d5c31a3631f3f02496e3cde924
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 4 15:23:21 2013 +0100

    mark as read function for claroline messages

commit 026d9dd832d97ba6bb83968f5673bad54ae778df
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 4 15:23:21 2013 +0100

    mark as read function for claroline messages

commit 4c59cdbbe072ee954a853518a0f59131b0ac6afe
Merge: a66cec4 9ff3087
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Fri Jan 4 14:58:14 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f5f86c5fce4ebffabbe775cf8f94fdc4ac52cb41
Merge: 42f7674 8b5c169
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Fri Jan 4 14:58:14 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a66cec4516defbc4554173bba3f93845b99f707e
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Fri Jan 4 14:57:17 2013 +0100

    added first version of calendar

commit 42f767492958295f9ee100b081568c81ce589337
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Fri Jan 4 14:57:17 2013 +0100

    added first version of calendar

commit a48a9e7c5b168eba36fbc0e7ae649413d2184846
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 4 14:48:47 2013 +0100

    Rights management readme (french)

commit 45e3c8ecec5b6c22fab7d344fcfa60ad264b4046
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 4 14:48:47 2013 +0100

    Rights management readme (french)

commit 9ff30876e9356027579cd247b76dd446edc134fd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 4 12:08:59 2013 +0100

    Basic error handler for the manager.js

commit 8b5c169a93fbe5bec5d375f6c269517b69524974
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 4 12:08:59 2013 +0100

    Basic error handler for the manager.js

commit 96ea2538c94802660ea0cde9a6dfd7ef25128c50
Merge: 44463ea 58db3d4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 4 11:35:08 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 3f71ddfab3f6f8c386a4ad1c5d00843900158233
Merge: f0b0b83 6270141
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 4 11:35:08 2013 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 44463ea2504a0575a74139aa895a61208659427d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 4 11:33:57 2013 +0100

    fixing ResourceVoter tests

commit f0b0b837b2f9e1b83d11a928aed5a36ca1364b2c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 4 11:33:57 2013 +0100

    fixing ResourceVoter tests

commit 73da96b2c2e2092dded3f97f853c1f2e37b2fcc8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 4 11:22:20 2013 +0100

    Removing the "canCreate" field

commit 16e05d5e341fea802e58e5248e512b5bbae52f76
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 4 11:22:20 2013 +0100

    Removing the "canCreate" field

commit 58db3d41e2210a9397d6c2d2c7f707e725c2c63d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 4 10:22:04 2013 +0100

    Removed acl listener

commit 62701418d489e8cf1a9d9057fd3658673e03d7e3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 4 10:22:04 2013 +0100

    Removed acl listener

commit 5992ea128f5e8c521ad8786526c828158bfdc787
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 4 10:14:37 2013 +0100

    Resource voter translations messages (and some other fixes)

commit edfec477e17a06d3fac8ba8cdcac540fe485fe05
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jan 4 10:14:37 2013 +0100

    Resource voter translations messages (and some other fixes)

commit 698b061a00addba247f7ccd33fe4fdc10c35f011
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 3 16:30:31 2013 +0100

    making phpcs happy

commit 2426626345756b2ea0e5f278e2a0ec9fca1fb240
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 3 16:30:31 2013 +0100

    making phpcs happy

commit b169d3fc34bc2e6eca0ecfbc404666a4019e8422
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 3 16:24:33 2013 +0100

    ResourceVoter implements COPY/DELETE/OPEN/MOVE/EXPORT/CREATE/EDIT

commit 5c24bec144e89ec4910917094258f131e26f10a9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jan 3 16:24:33 2013 +0100

    ResourceVoter implements COPY/DELETE/OPEN/MOVE/EXPORT/CREATE/EDIT

commit 9b54584d88977b1ab26f4c27f30166be39b80c36
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 2 13:23:30 2013 +0100

    children and filter methods for abstractRepository only returns content wich can be viwed

commit f81a0a0f6de28d0b2a5f9d8f52daea1ec0e7dd96
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jan 2 13:23:30 2013 +0100

    children and filter methods for abstractRepository only returns content wich can be viwed

commit 6bc1cc4b5e176097ef9844284aff63938076fc12
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Dec 21 11:09:41 2012 +0100

    Recusive option for resource manager rights management

commit e051e484605088316062364dc30342702a9f576f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Dec 21 11:09:41 2012 +0100

    Recusive option for resource manager rights management

commit 6a50ec8db0d86751545d11ac65a984bc039e6b9b
Merge: 2d202a4 5757529
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Dec 20 16:21:47 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c2a0f3eadb4c28117af7a3443fffa03df2329b5f
Merge: 9119121 44ab115
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Dec 20 16:21:47 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2d202a4d57c0e3ab781a24d1b659bb237b07c4b3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Dec 20 16:20:59 2012 +0100

    Refactoring resource rights management system: Defaults permissions are the parent permissions

commit 9119121bd0b66edd03ff099cc932091665af55d5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Dec 20 16:20:59 2012 +0100

    Refactoring resource rights management system: Defaults permissions are the parent permissions

commit 575752968e436f20969e8ac302a608673a416910
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Dec 20 11:58:28 2012 +0100

    Use mimetype guesser instead of mime_content_type

commit 44ab1155ef0bef2771b1b9a6547059dc6cf9d16e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Dec 20 11:58:28 2012 +0100

    Use mimetype guesser instead of mime_content_type

commit f836ca165c043cb599d6b1cd917cb1a64c26afb9
Merge: 47f2890 939cce1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Dec 20 11:34:30 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 7240e18a4a8643876bb632851e4f6a1bfa450544
Merge: 47c5281 a9f92a8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Dec 20 11:34:30 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 47c5281120f98979d03684176644fb34c773e849
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Dec 20 11:33:45 2012 +0100

    Uncomment call to composer

commit 47f28909b3a0afac6265ec0e23cd1b80e750d25b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Dec 20 11:31:41 2012 +0100

    Make a tmp hard copy of icons to allow shortcut creation in installation

commit 55e4835abe531d2d708ba2d9bdb88fc5caaa657b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Dec 20 11:31:41 2012 +0100

    Make a tmp hard copy of icons to allow shortcut creation in installation

commit a9f92a87e49aa0be7eb1b67fc7311b19c62951d7
Merge: 9e040b8 d1da03e
Author: Esdras <esdras005@hotmail.com>
Date:   Thu Dec 20 10:47:45 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 9e040b878f48eec5bfbf7ed40ba16d9a0c14f5ec
Author: Esdras <esdras005@hotmail.com>
Date:   Thu Dec 20 10:44:57 2012 +0100

    modified app_install

commit 939cce14df72b643ba76c78a1c68549eecf310ce
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 19 17:42:23 2012 +0100

    ResourceType "Text" has the res_text.png icon.

commit d1da03ee08450f2ffa6508b1dcd1bfaebf6bfd40
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 19 17:42:23 2012 +0100

    ResourceType "Text" has the res_text.png icon.

commit 4f57f35f04c94c9f539ada71ef816f2dc4db3b86
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Dec 19 16:54:56 2012 +0100

    Minor changes for demo

commit facf49a2f38ac9de8cdfa0391bca8c671b4a0b59
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Dec 19 16:54:56 2012 +0100

    Minor changes for demo

commit 010c1c4d7ac36e6f77dd28d8df8d92e6eee3bf41
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 19 16:22:12 2012 +0100

    Fixing raw install

commit 08ecb517598b3ed0f6a8a6854cec186cf471932c
Merge: 422fcbe 8810731
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 19 16:16:21 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit cc97ec661ff7e91c938e8485a5794ef18619d133
Merge: ffeb932 41f21e4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 19 16:16:21 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 422fcbee4053c58ca1187cd0a86ee53b7bfa48ef
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 19 16:15:48 2012 +0100

    DemoFixture

commit ffeb932b4e1b11975213c372e03e2401b5c4455c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 19 16:15:48 2012 +0100

    DemoFixture

commit 1d4bd0c2f5db94f7912f5c7e134c97699c8c6698
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 19 15:12:40 2012 +0100

    Replace the paginator by dql "DISTINCT" for the logger repository

commit 44bf30522fbc6e58874e23314c1f8d9e84741cbf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 19 15:12:40 2012 +0100

    Replace the paginator by dql "DISTINCT" for the logger repository

commit 8810731c33e3e234909f71e6bfd10c14ce015151
Merge: 2d328b5 faca316
Author: unknown <Esdras@Easy-Es.(none)>
Date:   Wed Dec 19 13:33:15 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 41f21e45f44e2c8f6643408951a9a94f13b79f2c
Merge: b6d57a7 2caccc2
Author: unknown <Esdras@Easy-Es.(none)>
Date:   Wed Dec 19 13:33:15 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2d328b5a0f5387efe7526dcd9a19576203827891
Author: unknown <Esdras@Easy-Es.(none)>
Date:   Wed Dec 19 13:31:06 2012 +0100

    added error message to twig template for the installer

commit b6d57a716ae430cd3a92decf9ce6336c0c263df4
Author: unknown <Esdras@Easy-Es.(none)>
Date:   Wed Dec 19 13:31:06 2012 +0100

    added error message to twig template for the installer

commit faca316f251b429849defff39a3cf5cea0e063a5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 18 17:46:59 2012 +0100

    ResourceVoter vote function implementation. Creation right not done yet.

commit 2caccc2a6773039d4501fba94408ca9b5ad14563
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 18 17:46:59 2012 +0100

    ResourceVoter vote function implementation. Creation right not done yet.

commit 00b770eb64e60262b01533572a691e2f8369881a
Merge: 73575f5 ac932bf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 18 10:29:35 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php

commit a70fceb9401456adca6e528eb4afe52295850d2e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 18 10:26:13 2012 +0100

    Tests for the resource creation permissions

commit 73575f536c3189fc6ac74153e82df3352bb3c1e6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 18 10:26:13 2012 +0100

    Tests for the resource creation permissions

commit 74b5748d8c7b10e10c658baf48be4ec3b9a6b8bb
Merge: 11985f7 76ca0a0
Author: Esdras <esdras005@hotmail.com>
Date:   Tue Dec 18 09:02:09 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/InstallController.php
    	src/core/Claroline/CoreBundle/Form/InstallType.php

commit 28b311a93591162ce0e22bb5ca793c21a7c597a7
Merge: db43dd9 ac932bf
Author: Esdras <esdras005@hotmail.com>
Date:   Tue Dec 18 09:02:09 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/InstallController.php
    	src/core/Claroline/CoreBundle/Form/InstallType.php

commit 11985f7858815dd021976ddeb218084c33b21995
Author: Esdras <esdras005@hotmail.com>
Date:   Tue Dec 18 08:55:51 2012 +0100

    added error message in twig views

commit db43dd9344fd890640d126047717c30bebd27399
Author: Esdras <esdras005@hotmail.com>
Date:   Tue Dec 18 08:55:51 2012 +0100

    added error message in twig views

commit ac932bf4d1d1f3630546aa30a0076df2db67a181
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 17 17:26:14 2012 +0100

    checkstyle

commit 76ca0a0f54d37bd652606d0290d96a5e2edf1526
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 17 17:26:14 2012 +0100

    checkstyle

commit f3b1a2fd04bdd48bc809fc99f2a7f871661a597e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 17 17:05:09 2012 +0100

    permissions for the resource creation can be edited (untested)

commit 9c9b6e69ef77eecd501e91f0892e398f1e7ef429
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 17 17:05:09 2012 +0100

    permissions for the resource creation can be edited (untested)

commit 5d8898397bd9aa63b954f545c575828851da35f7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 17 11:43:45 2012 +0100

    Adding canCreate permission boolean

commit 242a79203ce148e5caae9586c2beffe723a81437
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 17 11:43:45 2012 +0100

    Adding canCreate permission boolean

commit 75db6264b9839cb84f5f0f8f4eba002a5510c737
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 17 10:22:08 2012 +0100

    Refactoring default resource rights form

commit 3932edbd1c8395be05854264d0db909b7e7abbed
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 17 10:22:08 2012 +0100

    Refactoring default resource rights form

commit f223a9b50f9796df89b0488d1124f11d3d476b7e
Merge: 2259557 2e584d6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Dec 14 15:47:02 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit cae522643a0378e14c56b778abc2462e44907810
Merge: 7f9ee75 da8770b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Dec 14 15:47:02 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 225955754709927c401bce762ed44ce2f591aa25
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Dec 14 15:46:34 2012 +0100

    Permissions can be edited for a single resource

commit 7f9ee754d1c4348726411919bd06f65c225f5ac1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Dec 14 15:46:34 2012 +0100

    Permissions can be edited for a single resource

commit da8770b156d8d028bc45d1789ee50e4b91738a20
Author: Esdras <esdras005@hotmail.com>
Date:   Fri Dec 14 15:11:15 2012 +0100

    Create parameters.yml if not exists

commit 2e584d6f0d4ab6aab680f2a8a33684afbcbe2b76
Merge: d80cba7 25b8d2d
Author: Esdras <esdras005@hotmail.com>
Date:   Fri Dec 14 14:03:33 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0d2ad6ee8f1f8e75d7132f2ec23a6aa91f753ea7
Merge: fe82db3 dde23f8
Author: Esdras <esdras005@hotmail.com>
Date:   Fri Dec 14 14:03:33 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d80cba7fe29c3d2eed0b57c81c1dea2bef7e2c84
Author: Esdras <esdras005@hotmail.com>
Date:   Fri Dec 14 14:02:32 2012 +0100

    added graphic installer 1.0

commit fe82db3234ea83ff0c32e1eb5d07f29d04b48d35
Author: Esdras <esdras005@hotmail.com>
Date:   Fri Dec 14 14:02:32 2012 +0100

    added graphic installer 1.0

commit dde23f8ac2fe625ce9ca82ba793d86b2f0d0a7d8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Dec 14 11:17:36 2012 +0100

    Updated dependencies

commit 81a45f4db97e79853e7d725645399a346f3a52db
Author: Esdras <esdras005@hotmail.com>
Date:   Thu Dec 13 16:36:33 2012 +0100

    added placeholder in web/thumbnails

commit 25b8d2d46075444c57fd049eeb1f3988f7a95118
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Dec 13 15:54:41 2012 +0100

    removing canShare right option

commit bf565bd36385ca553ae9e2ba19b20ffbd0eb8c37
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Dec 13 15:54:41 2012 +0100

    removing canShare right option

commit 4d7b81d51cd412777abfaa4ca60b10c495722cf5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Dec 13 15:29:31 2012 +0100

    Default resources rights can be edited in a workspace

commit 02a4f325a9fab3c5a9a1e834b19668691adcc9b1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Dec 13 15:29:31 2012 +0100

    Default resources rights can be edited in a workspace

commit e077d08ce7a0a134b021edc3500a6a19272597fa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Dec 13 11:51:57 2012 +0100

    Default properties rights for each roles of a workspace

commit 10870c7dcbdcc04b31780ebd4285d5fc8bb09984
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Dec 13 11:51:57 2012 +0100

    Default properties rights for each roles of a workspace

commit 832b0895b801a40ffc61b186bf18996e2e3b2cff
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Dec 13 09:53:07 2012 +0100

    remving sharetype field from resource + adding a new permission table

commit ef13e369ac1cbbf3d99f1ade4b5f8f2da83d81e9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Dec 13 09:53:07 2012 +0100

    remving sharetype field from resource + adding a new permission table

commit 7dd4585cb7152ace4addd10bbfab59ff3fc7692c
Merge: 92f6950 3f06550
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 12 17:28:58 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 761c3150ea7c59094bf80f8ef95af2ab6592904d
Merge: ef25852 c320c44
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 12 17:28:58 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 92f6950461d932e96be544cf3969f53ce99cc8a6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 12 17:28:32 2012 +0100

    fixing a test

commit ef25852538ffe24488e93bab4a5098512bbc6034
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 12 17:28:32 2012 +0100

    fixing a test

commit e250b57345e3db7dbcda339fdac1f922cf19821f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 12 17:19:10 2012 +0100

    Nested activity left menu steps fixed

commit 6b761ebe728ab438422f4ae9d19b34c61b1279ed
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 12 17:19:10 2012 +0100

    Nested activity left menu steps fixed

commit 3f06550f0a19f9e9f62dad461c998b6dc2c41c10
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Dec 12 10:11:52 2012 +0100

    Added a listener for redirections in path mode

commit c320c449896d5096953d58937d68091dc90c9beb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Dec 12 10:11:52 2012 +0100

    Added a listener for redirections in path mode

commit 71413de926f0309f39d68df43cd5fc686e431c14
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 12 09:52:33 2012 +0100

    activity left menu links working

commit e4647e72d6e2f21210cd62c9cf4f4c42129c0efb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 12 09:52:33 2012 +0100

    activity left menu links working

commit 69b0ff91c94c528383977124e123e07d745dd96d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 12 09:39:20 2012 +0100

    Activity left menu working properly

commit ead262a6a4d4baa30c70a659a6edb56d614fea14
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Dec 12 09:39:20 2012 +0100

    Activity left menu working properly

commit 982322de65c11b1415c0816f0bbce8f60cede396
Merge: bc0a868 3b64e5d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 11 17:31:16 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/public/js/activity/left_menu.js.js
    	src/core/Claroline/CoreBundle/Resources/views/Activity/player/activity.html.twig

commit 3aebdacfe6bf18a33b4cee99f3cc37539364aa61
Merge: bfb0287 dafece4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 11 17:31:16 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/public/js/activity/left_menu.js.js
    	src/core/Claroline/CoreBundle/Resources/views/Activity/player/activity.html.twig

commit bc0a8687402b5f81ebe11937f7bee62b0b5559aa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 11 17:29:24 2012 +0100

    left menu for activities is now a tree

commit bfb0287161bf5c8e24e09a11a3b72c411def6e2f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 11 17:29:24 2012 +0100

    left menu for activities is now a tree

commit 3b64e5d5b9a1d1aa5c02ddcc1abca8c52a4abacd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 11 16:20:17 2012 +0100

    Added a special mode to visualize resource in learning path

commit dafece4243cd738f8e600d4d64f625859035b1f7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 11 16:20:17 2012 +0100

    Added a special mode to visualize resource in learning path

commit 98e77d06c23246349b4ca4e9cfb0085225d2960a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 11 15:25:25 2012 +0100

    left menu with navigation for activities

commit a1c14e0be75bc15d5a02faef21302a126ac27633
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 11 15:25:25 2012 +0100

    left menu with navigation for activities

commit 99c39d8dce0fedfaa1df6f28a373f53ace32aa66
Merge: dc2569d 1b12043
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 11 14:45:42 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 86758a70f807f09231174933f7c7f7aa5fc3b5a1
Merge: 4795bdb 638d7e3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 11 14:45:42 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit dc2569d23cec12a6dba6623448817409f3fa2f9b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 11 14:45:04 2012 +0100

    Added a listener for resource mode selection

commit 4795bdb50ad430aaca44c80bafcbbd286b88e7a2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 11 14:45:04 2012 +0100

    Added a listener for resource mode selection

commit 1b12043e21dd05685e5b330f84148949a1d2b683
Merge: 9050dd3 207a423
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 11 14:21:20 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 638d7e3296bccbda3fbdbed0f72abafe47739286
Merge: 13e1695 a77dbd8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 11 14:21:20 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 9050dd3b567694d631595044dd56b792db231e3d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 11 14:20:34 2012 +0100

    activity improvement + path_resource twig function

commit 13e1695ab3852f216ef2fa4d81b31244b691b031
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 11 14:20:34 2012 +0100

    activity improvement + path_resource twig function

commit 207a42306cc50ac6737e4abd0c1be973fba7e07c
Merge: dceaca4 30acb54
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 11 11:39:13 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit a77dbd862a601e5da189d2037993bc8f835e72b8
Merge: 3746388 60110bc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 11 11:39:13 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit dceaca47525ff84f82efad3e189284d704b24d46
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 11 11:38:08 2012 +0100

    Added not blank constraint on instruction field

commit 3746388c2ca4b3710a34e0afa1a8121750e62315
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 11 11:38:08 2012 +0100

    Added not blank constraint on instruction field

commit c81f1462958096602ed90c2c81a0ea448d7ab259
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 11 11:37:43 2012 +0100

    checkstyle

commit fd32a01112b9b3ea933d72f1cd9d4bd836162671
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 11 11:37:43 2012 +0100

    checkstyle

commit 30acb54a1e79b282bbec6183e8fa4639160d2d03
Merge: 02dc722 ce4c6df
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 11 11:21:05 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 60110bc647746ee9f9b8d87b0f07942251084c37
Merge: 9ae3adf a9bdb00
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 11 11:21:05 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 02dc722a792d2852fd05f7f1585d55f0fafe29c7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 11 11:20:29 2012 +0100

    Messagery: pager & searches

commit 9ae3adf63857441e1d9d3117ef4fc3bd04a90c9e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 11 11:20:29 2012 +0100

    Messagery: pager & searches

commit ce4c6df9c99e26bf8d7199ca8a51c0f6f418c286
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Dec 10 15:50:57 2012 +0100

    Added a voter for resource right management

commit a9bdb009e2214a35dbcf3a4b66195df07419bf11
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Dec 10 15:50:57 2012 +0100

    Added a voter for resource right management

commit 7aaa0e200e384a4756009507eecb2b56c019523c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 10 13:46:55 2012 +0100

    Fixing a bug in the user_list.js

commit a8a1e108fc84468125af161dfe72a19d3380e576
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 10 13:46:55 2012 +0100

    Fixing a bug in the user_list.js

commit a1c55043ac106b4e3d2a7f56187cb35df8cfd9ef
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 10 13:27:35 2012 +0100

    Refactoring MessageType

commit e58d8617a3ebba6daf6f5462689721369f819d0c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 10 13:27:35 2012 +0100

    Refactoring MessageType

commit 7e763742ba9b0d76bf9e23178651c5dd1d5c315f
Merge: 53ef67d d330cdf
Author: Esdras <esdras005@hotmail.com>
Date:   Mon Dec 10 12:03:50 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 7a53114d0f27d055783dc8f310d4bf872cc14fe5
Merge: b9a58af 5dd3f4f
Author: Esdras <esdras005@hotmail.com>
Date:   Mon Dec 10 12:03:50 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d330cdf258dd39d67ac8e425bf82a632ef8f221a
Merge: a8b65f9 3bd6ad2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 10 12:02:52 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 5dd3f4fbb51a088f34e8fdcb61e426f9d9b6ccde
Merge: 4524c2b 28e317a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 10 12:02:52 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 4524c2b9c1dfd9d2cf4cd5e104b2bee6fad0df30
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 10 12:02:25 2012 +0100

    rollback dependencies

commit 53ef67d7d3f7741c8e98f4e59dfb5e8705e9221a
Author: Esdras <esdras005@hotmail.com>
Date:   Mon Dec 10 12:01:52 2012 +0100

    web installer draft

commit b9a58af5b259c73c7bf5867541b8e950bfde0f7e
Author: Esdras <esdras005@hotmail.com>
Date:   Mon Dec 10 12:01:52 2012 +0100

    web installer draft

commit 28e317aa110f6e3f60808e5a86d2bef6d66a08e4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Dec 10 11:48:26 2012 +0100

    Added an 'install' environment

commit a8b65f98ae1375f4a3894df9f6d814d7dcc4c029
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 10 10:37:51 2012 +0100

    search for the messagery (untested)

commit acbcd8be98eade6d6b65dc50c5b773450328cb4d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 10 10:37:51 2012 +0100

    search for the messagery (untested)

commit 3bd6ad2d9005276dcac59be4b2fbe32399612c9b
Merge: e48d92e efdb3de
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Dec 10 09:55:27 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 2f3826e35404caa4f9ff9e89ebe99760510b1994
Merge: 9330d43 e00b204
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Dec 10 09:55:27 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 4461d9c12c47bec901d448d1ec303166f4c03b1e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 10 09:39:45 2012 +0100

    Fixing doctrine mapping errors

commit 36f66e31b27fd8e018fd5d70bda4b4241687294a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 10 09:39:45 2012 +0100

    Fixing doctrine mapping errors

commit efdb3de6aaeb5ce504e74e922924329a8b909f99
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Dec 7 15:25:20 2012 +0100

    Private messages for claronext (no pager/search yet)

commit e00b2049da27e5566173698c00a79dcb0e4a7b78
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Dec 7 15:25:20 2012 +0100

    Private messages for claronext (no pager/search yet)

commit 8f51e6179ec321f280f4e51015382c696324fda8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 4 17:06:50 2012 +0100

    basic navigation for activities

commit 741e25bb0f565ed76df6927b329ea4326acdd266
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 4 17:06:50 2012 +0100

    basic navigation for activities

commit e48d92ea6ae6c06f9b3195592e22a8a8477c6552
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 4 14:28:45 2012 +0100

    Added dashboard translation

commit 9330d430c5f033393587530e0c7809447fc77f67
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 4 14:28:45 2012 +0100

    Added dashboard translation

commit 0f41e7eb22a19b08b73367ac69eca43d34156e93
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 4 14:14:11 2012 +0100

    PdfPlayerBundle

commit 532ac7b2e9d92a57615832cd27da627484c4d252
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Dec 4 14:13:50 2012 +0100

    ImagePlayerBundle

commit 8747d24801dfd7bd3c675fde52463f136e55b1e1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 3 14:01:19 2012 +0100

    tests for activitycontroller

commit d0cf1f483a4a286828a810ee9f9897d81c45aa44
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 3 14:01:19 2012 +0100

    tests for activitycontroller

commit 4c81ce0688cfef196bec0c5e1b5eadfffc830e95
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 3 11:50:15 2012 +0100

    fixing resourceactivity dql

commit 67b5ac97e251fe1657aacea9a4d34cf24eae25b6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 3 11:50:15 2012 +0100

    fixing resourceactivity dql

commit d11de9c261d81801aa73015fed92c15cfa56def9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 3 10:42:49 2012 +0100

    refactoring activity interface

commit 84283990e50e4ca42b2a3db0315d5d696b0e8e88
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 3 10:42:49 2012 +0100

    refactoring activity interface

commit 251d1ea281e386c42f70b2cc88a1a0a858d935a3
Merge: d3bbd3e 9f530d5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 3 09:46:36 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d3bbd3ea38b18f64f647623dee6a7fd1571d481c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Dec 3 09:46:18 2012 +0100

    updating composer.lock

commit 3644bb0f6e6cec37d2346867be8fed26cf27b4e9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Dec 3 09:34:12 2012 +0100

    Made icon field optional in resource properties form

commit 9f530d515bd45bc2f9485204e96f75c67a1a61d6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Dec 3 09:34:12 2012 +0100

    Made icon field optional in resource properties form

commit 5fa18f3b502f1961892c5142d614e12d5873333f
Merge: 0aeff95 5f9bd91
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 30 15:46:38 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 86d0fce58c691ca51101090770546c6c45e09a5a
Merge: 83a9225 e0b1c48
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 30 15:46:38 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0aeff9585699cf94f973b3ca8a3f1c361ab3833b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 30 15:45:49 2012 +0100

    Basic resource sequence for activities

commit 83a922550021dd03d98ae8dfd97fc7fbdea559d6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 30 15:45:49 2012 +0100

    Basic resource sequence for activities

commit df7d2845735434e3fcfc20b1fc5e45178cccd27d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 30 09:58:25 2012 +0100

    OpenAction for DirectoryListener exports the directory

commit 77a1205ab171c9e66dac25c890bb424c0fa97e37
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 30 09:58:25 2012 +0100

    OpenAction for DirectoryListener exports the directory

commit 5f9bd91b96e00b39f2adea84898d9855244d1129
Merge: 052b7c8 0559c32
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 30 09:53:40 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit e0b1c482b9853c132ee4b70dcedd7b035667aa30
Merge: e9d5a63 3b524ce
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 30 09:53:40 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 052b7c86c9e1904c5e12c0567ce163fad1471fbe
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 30 09:51:34 2012 +0100

    Renamed tooltip along with resource

commit e9d5a630835587943f9b9c2ea45f16f50064eef4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 30 09:51:34 2012 +0100

    Renamed tooltip along with resource

commit 4ff940ae21943033f9a571dcc87ab8486bf7704c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 30 09:45:37 2012 +0100

    Moved shortcut method to controller

commit 8bfe748c48fb7f4a484afdf06b391d6dc8e0e45c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 30 09:45:37 2012 +0100

    Moved shortcut method to controller

commit 0559c32d37a202f7a842647c6f2fa07e4ae4f9da
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 30 09:24:09 2012 +0100

    Renaming entities works properly (parent is refreshed)

commit 3b524cef8bea009a3ac26b55d1e91d81abde91ec
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 30 09:24:09 2012 +0100

    Renaming entities works properly (parent is refreshed)

commit 6e0d30d9935c7010d91f4328ac27081ea3848627
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 30 09:11:18 2012 +0100

    Removed diff file

commit 9bf179292643d05d06b97fdf892029bf8c809cf8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 29 16:45:29 2012 +0100

    form role translations

commit feade6a9e130adc0e705e98a988b4afdc1d3c7db
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 29 16:45:29 2012 +0100

    form role translations

commit fb0d2ebbe1d7cb25f638c80d1eef0d8af389fa70
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 29 16:36:40 2012 +0100

    Join between resources & activities

commit 06d5b6bef70d4cf9ea9d392161e55b460f9a3bcf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 29 16:36:40 2012 +0100

    Join between resources & activities

commit ea4bd53d2e2522791a6d75e2f3956098120cc5d0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 29 14:12:23 2012 +0100

    Removed migration diff

commit 8ffee0a99b5b2294a2bc30d08b654f7e1dec57fa
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 29 14:11:40 2012 +0100

    Added mailing configuration parameters

commit 8b84d51f2ce56b928bf4deb3abdcb99824692aaf
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 29 14:11:40 2012 +0100

    Added mailing configuration parameters

commit 83634ec2ea121febed9e03210d729555a4bc2b75
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 29 13:19:14 2012 +0100

    Removed unused template

commit 882e03467a9819901c7a72cc264fc963a89e6323
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 29 13:19:14 2012 +0100

    Removed unused template

commit bc63703605f9677ec8711b43ccd22f5739fb53da
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 29 12:23:52 2012 +0100

    Fixed icon change in resource manager

commit a16873a1ffbf38ee27be5e5f16d72ed8bbba7224
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 29 12:23:52 2012 +0100

    Fixed icon change in resource manager

commit 923beb0b54d9e8f667baf06afeba442038c4dafd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 29 10:10:04 2012 +0100

    keeping the context for texts

commit f61a11da8baa4d4e1e25ae564fa9d7b3376c3d73
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 29 10:10:04 2012 +0100

    keeping the context for texts

commit 28395a0e58c9a1312678d074cd9a03589e7aea00
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 29 09:56:48 2012 +0100

    fixing text resource routing

commit 0e59c756d1bf5f7a823fb3381eaab642e7d7f57e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 29 09:52:39 2012 +0100

    Resource activity with name & instruction field (creation)

commit 1ac0c25efe588e35a6a0361129bfd557a14dc501
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 29 09:52:39 2012 +0100

    Resource activity with name & instruction field (creation)

commit 474ea77ac54f83e415481eb4ef599b332a4c77dd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 28 16:28:21 2012 +0100

    fixing AbstractWorkspaceTest

commit 40e1b443060f900dcfb809aea39402bc0d181372
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 28 16:28:21 2012 +0100

    fixing AbstractWorkspaceTest

commit 93e717742e89407c65b488359b7e6f4f434b4acf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 28 16:10:39 2012 +0100

    checkstyle

commit f634eac3d5c87b4fe2d859493e8694ff4f1ff8a0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 28 16:10:39 2012 +0100

    checkstyle

commit e9e358e6e4c71f0d12d6f1cb518104d0f37d3c7d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 28 16:05:54 2012 +0100

    WorkspaceRepository dql optimization

commit bc3809efaa0a8287ccf1a92516df4c48a09865e8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 28 16:05:54 2012 +0100

    WorkspaceRepository dql optimization

commit cddd1972c543539017b84530b22b854325b340fd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 28 15:46:31 2012 +0100

    mailer (draft)

commit d99ea6a892bc5d41077f91aaa0d9464866764998
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 28 15:46:31 2012 +0100

    mailer (draft)

commit 5efc7d2e365a84491b461b0065c7e13eeda967d5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 28 14:24:17 2012 +0100

    simple select form roles in forms

commit 214a5c1a5dd3663690e8bba39a15958a239a1130
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 28 14:24:17 2012 +0100

    simple select form roles in forms

commit ac59fbb2316587d073a1878d243d4ba4d56a085a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 28 10:59:37 2012 +0100

    removing useless controller method

commit be933eedbddc0a40c4faeca02b386cf2f7197c02
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 28 10:59:37 2012 +0100

    removing useless controller method

commit fa1a28fdf8bce721f0980731602664b42be18c4e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 28 10:57:33 2012 +0100

    Removing WorkspaceRole + new UserProvider

commit d86d372822657f589edbe6514b21ae914b2bf9fb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 28 10:57:33 2012 +0100

    Removing WorkspaceRole + new UserProvider

commit 51eecef74ef10823c9583e108574f15d1a384673
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 27 11:03:11 2012 +0100

    Fixing a test

commit 2d31eaf6a2450d0def864274144ccb15da6a9f06
Merge: 1c3668f 8152d33
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 27 11:01:17 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1c3668f1b7e678e1aea45269cb7f6840a316c1b1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 27 11:00:31 2012 +0100

    Fixing ForumBundle mapping

commit 794a8d02d72c231ba1667adcaf7401dc901eb00a
Merge: 7274bf5 d961ada
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Nov 27 10:49:01 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/DataFixtures/LoadWidgetData.php
    	src/core/Claroline/CoreBundle/Library/Installation/Plugin/DatabaseWriter.php
    	src/plugin/Claroline/ExampleTextBundle/Resources/config/config.yml

commit 8152d33914268acd1de9d4e141291eccad1e1e1e
Merge: 8a37187 889e00f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Nov 27 10:49:01 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/DataFixtures/LoadWidgetData.php
    	src/core/Claroline/CoreBundle/Library/Installation/Plugin/DatabaseWriter.php
    	src/plugin/Claroline/ExampleTextBundle/Resources/config/config.yml

commit 7274bf50eb971193330ac30be33a6abcfe38804c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Nov 27 10:39:20 2012 +0100

    Fixed plugin validation process

commit 8a371875c210f9c445d4117f2f2a9a47ca72b2a7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Nov 27 10:39:20 2012 +0100

    Fixed plugin validation process

commit 889e00fc40cd057d42fdd1746f58de60d65c9758
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 26 14:57:30 2012 +0100

    UserRepository implements UserProviderInterface

commit d961ada27f1da30455cfc3b75256010d1d32fa5f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 26 14:57:30 2012 +0100

    UserRepository implements UserProviderInterface

commit 9a338cbdb1c8bb6cc37f0b617a8b16dc64b3955b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 26 11:35:55 2012 +0100

    Displaying example widget & resource logger widget again

commit e5b5663591a1004b9445340872bdb55e58074cf9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 26 11:35:55 2012 +0100

    Displaying example widget & resource logger widget again

commit bd639c2af8c9ced35acaae4d9864da733f6f11d0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 26 11:19:07 2012 +0100

    fixing mapping errors

commit 691826b6a2326bb0d6d7ef02c0f3d422b6771d38
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 26 11:19:07 2012 +0100

    fixing mapping errors

commit e9f621e4f199535ac3ac1a2ae2805b026362af49
Merge: f15b22f f898674
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 26 10:44:38 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit f15b22f8c25b15840b92a68e9edb2a595f592564
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 26 10:44:11 2012 +0100

    Fixed typo

commit 195982ae6f4a63c112e740eda5919bb016e0d55f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 26 10:16:56 2012 +0100

    Fixing the removal of a shortcut

commit f89867419f052934cdf0f277ceed74800af313ae
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 26 10:16:56 2012 +0100

    Fixing the removal of a shortcut

commit 7ad88eb509542079a589ae8f8e5fa0a296763bf4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 26 10:07:09 2012 +0100

    fixed renaming resource (unique name for each directory) for each copy and shortcuts

commit 7230a70f4cbf0873bef9741926f3cef4e0d1b346
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 26 10:07:09 2012 +0100

    fixed renaming resource (unique name for each directory) for each copy and shortcuts

commit 2e99e8b06d808baa86436fd4ed805eb56df5df3b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 23 14:09:49 2012 +0100

    Workspace tests optimized

commit a70d054dfb11fb21b3028c4c1e0f9be3cbaace17
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 23 14:09:49 2012 +0100

    Workspace tests optimized

commit 8b9aa7a32b9e364bc25dd27e6817493aefa96a32
Merge: 4f48c4a d42b69d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 23 10:11:14 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Controller/WorkspaceController/WorkspaceControllerMainTest.php

commit d40897e2b463ecbccb504b1974583f2472509b35
Merge: 868027f 8ca78af
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 23 10:11:14 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Controller/WorkspaceController/WorkspaceControllerMainTest.php

commit 4f48c4ae451b67b67c570bfea5a9ed37e1de8a45
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 23 10:09:27 2012 +0100

    merge pre pull

commit 868027f58c22991eaeb230145c3517ce18c843dd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 23 10:09:27 2012 +0100

    merge pre pull

commit 8ca78afa45f8d6155d3918b51f96102920109f7e
Merge: 082e38e 3cd464e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 23 09:53:02 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit d42b69d432de842c442d7b1e94735aeefdfdec90
Merge: ab2f34a 3e6af9c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 23 09:53:02 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 082e38ea2ac03ccf071ac356bbca2c8d14afbae8
Merge: b735399 f9b708d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 23 09:52:07 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Controller/AdministrationControllerTest.php
    	src/core/Claroline/CoreBundle/Tests/Controller/WorkspaceController/WorkspaceControllerMainTest.php

commit ab2f34a3fb9ddd0f87c3e10917f79e2012ee198b
Merge: 8b20b6a 8620cf8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 23 09:52:07 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Controller/AdministrationControllerTest.php
    	src/core/Claroline/CoreBundle/Tests/Controller/WorkspaceController/WorkspaceControllerMainTest.php

commit 3e6af9ca4f2116332eaba27df8233812b1bdda1d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 23 09:41:49 2012 +0100

    Improving tests speed

commit 3cd464eeddf5a88ffbef8e3f3e60a694069cc264
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 23 09:41:49 2012 +0100

    Improving tests speed

commit b7353995f35ed1be9aed73f57e2b923375df9ac6
Merge: ba0c98e 754912f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 23 09:40:18 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Library/Installation/Plugin/RoutingChecker.php
    	src/core/Claroline/CoreBundle/Resources/views/Resource/thumbnail.html.twigjs
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceControllerTest.php
    	src/core/Claroline/CoreBundle/Tests/Library/Resource/IconCreatorTest.php

commit 8b20b6a6826eff7776ec09133c63e1f7b85e8bdc
Merge: 38aab1a 9a6ac29
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 23 09:40:18 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Library/Installation/Plugin/RoutingChecker.php
    	src/core/Claroline/CoreBundle/Resources/views/Resource/thumbnail.html.twigjs
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceControllerTest.php
    	src/core/Claroline/CoreBundle/Tests/Library/Resource/IconCreatorTest.php

commit f9b708d6bb5a275ba7cba080a2822687d45e4736
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 23 09:03:19 2012 +0100

    fixing a test

commit 8620cf8f583288171924c9afc70ef5458fbb79e4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 23 09:03:19 2012 +0100

    fixing a test

commit 2f62a1e90296af8a62a28f4b458cf694fb90cd14
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 22 17:38:36 2012 +0100

    Tests fixtures optimization (Administration & Resource)

commit 61d6fd9a63b3bb0ba1d3bdf825bdc815956b8bfc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 22 17:38:36 2012 +0100

    Tests fixtures optimization (Administration & Resource)

commit ba0c98e5b84f91ba43eb932aabd3582e4c79c26b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 22 16:50:13 2012 +0100

    Avoid symbolic links in asset urls (buggy on some configurations when loaded asynchronously )

commit 38aab1ac6df4e2ef62e120b6c1b5834252c4899b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 22 16:50:13 2012 +0100

    Avoid symbolic links in asset urls (buggy on some configurations when loaded asynchronously )

commit e3bc5e27e546f7236e3e0a8d3cf72bad77a40d2f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 22 15:09:01 2012 +0100

    Allowed test suite to run in process isolation

commit f71e9df072b70bfec83086e1b6ff7d04c55f0351
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 22 15:09:01 2012 +0100

    Allowed test suite to run in process isolation

commit 0a2804b308da471bc58b950f3800c55caf06dc70
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 22 15:01:19 2012 +0100

    Removed plugin routing php loader

commit 93c2a7b07321003d0e0cffa54ccb158c240b4c6c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 22 14:58:09 2012 +0100

    fixing forum repository

commit 98e486de489bfefa6507a8b189b28db42dff4729
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 22 14:58:09 2012 +0100

    fixing forum repository

commit 754912f9f35218d8670f101efeb7c3a90edb5566
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 22 14:07:45 2012 +0100

    Skips a test

commit 9a6ac2932b28832da35b9bb787081a5f5ec42fad
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 22 14:07:45 2012 +0100

    Skips a test

commit 98b4d72236c0d38a3f0f7dedd20fd8daade6d7cb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 22 14:02:28 2012 +0100

    improving resource manager properties form (+ bring back the rename form)

commit 6759ef5c726ca77ab3937eb126d2928ef8f7d4a5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 22 14:02:28 2012 +0100

    improving resource manager properties form (+ bring back the rename form)

commit 7452e1f7f62d46381f31b4f2532e11a464b495f7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 22 11:47:26 2012 +0100

    checkstyle

commit f56f54bf31cc4d38f1da3f1648ea0786391aa98f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 22 11:47:26 2012 +0100

    checkstyle

commit 0aa49288501497203c1db2f7d924d5dd5dd2ceda
Merge: 4594efd 762142a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 22 11:36:43 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e0215b704d12409698298f0d5a2bdc64902c6401
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 22 11:36:08 2012 +0100

    Resource manager can create shortcuts

commit 4594efda57e73633f3f551ce5234429a2df1569b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 22 11:36:08 2012 +0100

    Resource manager can create shortcuts

commit 762142a709dbd8a08602a86d6881190ca7882c2b
Merge: 52866ff ae1b10f
Author: unknown <Claroline@Easy-Es.(none)>
Date:   Wed Nov 21 14:21:51 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 52866ffd69d5edd2f32796f62b3d9b188cd24674
Author: unknown <Claroline@Easy-Es.(none)>
Date:   Wed Nov 21 14:15:24 2012 +0100

    added and integretad syndexport library to rss plugini

commit ae1b10f9eb4c81f680dba60ec2a5c34d0707bdc2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 20 09:35:16 2012 +0100

    Removing useless fields from the forum entity

commit e36b8254d63825b543ba142726e9dce046e48d04
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 20 09:06:39 2012 +0100

    Removing unused ResourceController methods

commit fbc9d1f98912515482211d5ce4f1eccb02ddccbb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 20 09:06:39 2012 +0100

    Removing unused ResourceController methods

commit 4263c6ba0a4c3145413f372821d7f6b763f9eb82
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 20 09:02:07 2012 +0100

    Fixing broken tests

commit 24aa36e6620910f7ece115adf15f4a8e42802913
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 20 09:02:07 2012 +0100

    Fixing broken tests

commit 9209d2657fb302e5be279176aff3b2a70faaf937
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 19 17:24:06 2012 +0100

    Resource properties improved: icon can be changed

commit 5c9029c39607ef8da855a4d4ec7dadef17d6447b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 19 17:24:06 2012 +0100

    Resource properties improved: icon can be changed

commit 35d871ccb6dc1be51ee7dfad5f64851595b4678d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 19 09:25:02 2012 +0100

    renaming some controller methods

commit 29560479b7836de132d9cdcaa69fb93691e881e1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 19 09:25:02 2012 +0100

    renaming some controller methods

commit 30d509fa71d64f3a3d565ffcead57c880d3850f4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 19 09:13:48 2012 +0100

    updating dependencies

commit 9b247c314c6c4fcfd10222ed474fd42f92c5d885
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 19 09:02:32 2012 +0100

    fixing 2 broken tests

commit f0a0474db3e21fb39597f52a11a0bb7b1891b450
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 19 09:02:32 2012 +0100

    fixing 2 broken tests

commit d7cd788b2f9d29b9c5258893a7ec730c94e1ce01
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 16 14:56:56 2012 +0100

    refactoring the resource system: resource instances removed

commit 065441bcf41d0bcd412575059ba576ae30950744
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 16 14:56:56 2012 +0100

    refactoring the resource system: resource instances removed

commit 7d6fdd3353a2bb593008c2c224dda324b3704fb6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 15 10:24:57 2012 +0100

    Adding some phpdoc

commit 20a60c184c0faf03e923b534e927e495544111ca
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 15 10:24:57 2012 +0100

    Adding some phpdoc

commit 952d44f855ab89d459e7dcfdf1c5980243472830
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 14 17:12:02 2012 +0100

    rssbundle can be configured for the desktop

commit 3df3a4a292ec5ff2a7d04e9c04ce2518a683b683
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 14 17:12:02 2012 +0100

    rssbundle can be configured for the desktop

commit d8f807887e37fb05868b16c9570e3a93fb567409
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 14 15:40:32 2012 +0100

    updating some of the doc

commit d9076c9d642dae4819948d54c217a7d89f7be361
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 14 14:44:46 2012 +0100

    Adding some tests for the DesktopController

commit d75a4f25375eff0174d8c2b663b102b4cf22acfa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 14 14:44:46 2012 +0100

    Adding some tests for the DesktopController

commit fbf831873da24eda7ec03329838a1455b0326a82
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 13 15:50:43 2012 +0100

    Adding a use

commit 73c45f52161c3986210f7aa4ad3c6c54fd582685
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 13 15:50:43 2012 +0100

    Adding a use

commit 848022242aa5012b774c7055da3c757fcb58661e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 13 15:43:30 2012 +0100

    splitting AdministrationController (AdministrationWidgetController)

commit d88a5f20bf5e35dad516960ddc191d4710fadf64
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 13 15:43:30 2012 +0100

    splitting AdministrationController (AdministrationWidgetController)

commit 7f72725b269089bb04e462528c79c2f045f944bf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 13 15:34:48 2012 +0100

    checkstyle

commit a8f391f7cf13c160896ba506c82d0cd0f530488c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 13 15:17:39 2012 +0100

    Moving claroUtils method to utilities and removing sendRequest

commit 2aeba5be9596d042c37ff3de32663e657e4ff40e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 13 15:17:39 2012 +0100

    Moving claroUtils method to utilities and removing sendRequest

commit 1070c2ab00868f3ab4650b4e6d4e5eb64b8e8e98
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 13 12:05:21 2012 +0100

    Fixing tests

commit 6e690e6fdbd5dc86727f7fbc69776b98e8b9e342
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 13 12:05:21 2012 +0100

    Fixing tests

commit a4e0de0418a4b3886780b1b2468826ee77c069a9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 13 11:03:53 2012 +0100

    refactoring some urls parameters

commit 38b12fd4cbe0ba2b750b8760c4117c1004c7e903
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 13 11:03:53 2012 +0100

    refactoring some urls parameters

commit d4f330638a5d083e262487ff527f7181f2124eec
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 13 10:35:20 2012 +0100

    widget configure desktop event

commit ac06f340046c19461a1cc924022872ef11c21a83
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 13 10:35:20 2012 +0100

    widget configure desktop event

commit c0832b89ecfff92102d460663ec40afbed6fb4c4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 13 09:53:31 2012 +0100

    widget display configuration for desktop

commit 1a3960116b29cdbeae0ba754a4f5703a82263fed
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 13 09:53:31 2012 +0100

    widget display configuration for desktop

commit 1db0a0f8d069a9f96ff6f19bd03114b513c207cc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 14:50:30 2012 +0100

    rss url can be removed

commit 0956e87c86b7f904f54c9c13fb84015a191fe670
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 14:38:10 2012 +0100

    raw_install ends with app/console cache:clear

commit 366e734a7ff96248bc0321e38b1b48d63ddaeb11
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 14:22:24 2012 +0100

    Refactoring widgets display event (+ correct a bug from form_workspace_create)

commit e31e3400ff4325b2c9612979a48b4574a9eb7e71
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 14:22:24 2012 +0100

    Refactoring widgets display event (+ correct a bug from form_workspace_create)

commit 3287b8eff145dd38b82b9ffe46818a50ca60a27c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 12:09:21 2012 +0100

    Adding the claroline.user.creator service

commit 5a1b67e6ec686e8a1d1309bb8e9a5f70dcf9569b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 12:09:21 2012 +0100

    Adding the claroline.user.creator service

commit e91b340945e6bf38876456ed49f43a105cc17f49
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 11:59:02 2012 +0100

    Fixing ResourceExtenderTest

commit d3014a6b1182b09e6bcb6c2ddd8819a5fca6e054
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 11:59:02 2012 +0100

    Fixing ResourceExtenderTest

commit cddc145feeecb9bb04c4b51d6fc098042a8dd6fd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 11:35:16 2012 +0100

    Fixing the remainings broken tests

commit 2bbdecbbeff3143d47a73e22686596cf3ad8c0c3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 11:35:16 2012 +0100

    Fixing the remainings broken tests

commit c066a402190c513fc016b47ae93c6ab7d941197a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 11:05:43 2012 +0100

    Fixing most errors from the previous change

commit 1e5e0b52bca56a9550d6d19af99909c398868dff
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 11:05:43 2012 +0100

    Fixing most errors from the previous change

commit d4d137eb9920524750e638278b7f7e5d8860096f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 10:44:10 2012 +0100

    Renaming ResourceType->getType by ResourceType->getName => [2]: entity field (probably still broken)

commit 9ab9cc0ab24c20a1984fab7c6cd6c4c04857d1b9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 10:44:10 2012 +0100

    Renaming ResourceType->getType by ResourceType->getName => [2]: entity field (probably still broken)

commit 2c6e7536ab92ed8639cf706ad95b6945d361531d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 09:57:17 2012 +0100

    Renaming ResourceType->getType by ResourceType->getName [1] => getter & setter + migration

commit 5ff00b3981f1d45af6cd4be429d5b0794930d085
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 09:57:17 2012 +0100

    Renaming ResourceType->getType by ResourceType->getName [1] => getter & setter + migration

commit c2c79542ea9222c8bfc34ff58ab7bc36d3cfbae8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 09:20:43 2012 +0100

    renaming dashboard by desktop

commit 920f3a43b9e9e008a9f20d4407193d929e80423c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 12 09:20:43 2012 +0100

    renaming dashboard by desktop

commit 24e2855231eb72c1d02fce89d8957f533a54501f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 12 00:45:44 2012 +0100

    Fixed wrong configuration and reduced example widgets to 1

commit a86382a01834f507aa9bfd9c1ec3e05933eed5fc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Nov 11 23:37:59 2012 +0100

    Setting locale manually outside request scope

commit 16e1926e625b084bb6c04d86e1fc2f8faf2c897d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Nov 11 23:37:59 2012 +0100

    Setting locale manually outside request scope

commit 60ec46fbdc41b779e398141ae3cad56af2e76417
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Nov 11 19:40:37 2012 +0100

    Improved forum layout (http header bug fixed)

commit 8a7db0986625c5135e4ef7b20caab598e647a205
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Nov 11 13:24:43 2012 +0100

    Changed toolbar position and orientation on lower resolutions

commit a0ca80eb73f7b7235b33b2b702e91ebd8babfe1d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Nov 11 13:24:43 2012 +0100

    Changed toolbar position and orientation on lower resolutions

commit 784f88880a72eb004048710849f3b2ecd1f8a012
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Nov 11 01:53:18 2012 +0100

    Changed workspace naming and layout

commit 030842ad170815008c8b674055b84022cd1e64f7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Nov 11 01:53:18 2012 +0100

    Changed workspace naming and layout

commit d436aa3ba51d730c97dbdb96fa83e66d6812614d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Nov 11 00:08:06 2012 +0100

    Changed default user name

commit c4e7268f33fdb15103d95ea732443ee3b75ebe66
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Nov 11 00:07:07 2012 +0100

    Added left toolbar to desktop + minor layout changes (draft...)

commit 7fd25e8266c74fb810d2e4530d9aca022bb0dc69
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Nov 11 00:07:07 2012 +0100

    Added left toolbar to desktop + minor layout changes (draft...)

commit a82947d709ad6b641a1f6047db80e6d736a321d7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Nov 10 21:33:27 2012 +0100

    Changed resource notifications widget (temporary)

commit 43bdf0d9b0b7e00d7f38c305570cc889e36b5937
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Nov 10 21:33:27 2012 +0100

    Changed resource notifications widget (temporary)

commit 8511331b4bfcc616e517eb7552886e9a02a19bb2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 9 17:21:57 2012 +0100

    Fixed icon creator

commit 15150f43fb5b58f400071233c4ae5e9fea780c6c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 9 17:21:57 2012 +0100

    Fixed icon creator

commit c203aac7046f478f3223a039e18affd0480c944c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 15:41:23 2012 +0100

    set a variable to null by default

commit d9ea738a832510f5643ee8ea856380e1951f6143
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 15:41:23 2012 +0100

    set a variable to null by default

commit d45acd081ac39f6c31665b8cd5a3034385522d80
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 15:39:09 2012 +0100

    improving IconCreator

commit 84914eeef5cb340fc232d651b3286de3fc1e45f7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 15:39:09 2012 +0100

    improving IconCreator

commit 8bfede14a71128d9169e4ce73843f64585f42407
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 15:28:45 2012 +0100

    refactoring logger message

commit 3b9b8248e20ccd2b3bf1b9f7b51eeedd9e038038
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 15:28:45 2012 +0100

    refactoring logger message

commit 3d8a2f988b73ca8d9bbbcd654cb42c18891f5090
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 14:40:22 2012 +0100

    rssreader displays something in the dashboard

commit ae08a186465896193c58ae179c9086771b32a403
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 14:40:22 2012 +0100

    rssreader displays something in the dashboard

commit 60c22ef4c8562bfe479924d856853364dfbe17ff
Merge: d942d9d ac12b1b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 9 13:52:10 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 400627aa62e5c0a46e9f7c50769d7ad3e35bc826
Merge: febf11f 39da1bc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 9 13:52:10 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit febf11f60cdf95cb5fe8ae8a1beee99922ee40ac
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 9 13:51:18 2012 +0100

    Use boolean values instead of integer 0/1

commit d942d9d1a2146a5c9dd69b90e0ee04f60a6c9eaa
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 9 13:49:55 2012 +0100

    Fixed wrong attribute name

commit b843b0d128b1478246f6c0a9101b5fd820e0baed
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 9 13:49:55 2012 +0100

    Fixed wrong attribute name

commit ac12b1b279c7d1f5b56fbfc0b0774a6758f5b611
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 13:49:34 2012 +0100

    more small fixes

commit 39da1bcf402d151b623ebf9a316c42145c28db82
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 13:49:34 2012 +0100

    more small fixes

commit af8caf36ba09662b4dfaabc4bdc4f145cc2e6bec
Merge: ff3d75e cec8117
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 12:01:26 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 2ac74a4f1fdb821f876af5be05e3ee35c2b99cb0
Merge: b2a9c4e 5b46739
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 12:01:26 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b2a9c4edb43e5f00d4db025a6e83cc3493d26b8c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 12:00:47 2012 +0100

    more form translations

commit ff3d75e0f5db84c132754b7391a97545237c839c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 11:47:32 2012 +0100

    resource forms themes

commit 816bf834678835967e0ac3131147881208169767
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 11:47:32 2012 +0100

    resource forms themes

commit cec8117915c6900b45ecc155240057bd59dfa448
Merge: c49a369 ffa83c9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 9 10:33:12 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 5b4673969fbf7344b78b9b71dc46b14758d1f274
Merge: 218d518 34aee95
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 9 10:33:12 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit ffa83c99a1a650d34ee111626f2a5d041286384b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 10:03:34 2012 +0100

    workspace toolbar: tooltips & smaller

commit 34aee95583cd49e43b2104915995c031a37f1ee9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 10:03:34 2012 +0100

    workspace toolbar: tooltips & smaller

commit c49a36905a56da36e2ae5ff40ddbd637c51c36c1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 9 09:52:06 2012 +0100

    Fixed checkstyle

commit 218d51875a005f2aec3b2bb2ec451f248fb821fc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 9 09:52:06 2012 +0100

    Fixed checkstyle

commit 82b86ee932e263404bc1920fbcb8bdbceebbe80b
Merge: d9430aa 8f2fc0c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 09:46:33 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a992928e78e11829d28cc3d6ac8488974ec43194
Merge: cc4f8bd e08af76
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 09:46:33 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 8f2fc0c3f714b62337f9ab0f070e0b9d211fd958
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 9 09:37:05 2012 +0100

    Fixed broken tests

commit e08af76ae97626d5ef83455f895a09d1a8181d07
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Nov 9 09:37:05 2012 +0100

    Fixed broken tests

commit d9430aa3de8cb8d9d8de90a3ebcd26c625cf51d0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 09:33:14 2012 +0100

    fixing AbstractRoleSubjectTest

commit cc4f8bdb806479674bf4bd4eac5311924a6ba8a4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 09:33:14 2012 +0100

    fixing AbstractRoleSubjectTest

commit e13091030b9ea561957d2a403542186e4bade172
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 09:28:04 2012 +0100

    fixing WorkspaceRepositoryTest

commit b60b3bc7ffe79293da7fb29090f7ce0705f1d5c4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 09:28:04 2012 +0100

    fixing WorkspaceRepositoryTest

commit 2850434f733e5afa78e0ee23780a1389d9713de8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 09:19:02 2012 +0100

    Fixing ProfileControllerTest

commit f562ee43ec7520a0d84fb8defa81a1a431e9f7d7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Nov 9 09:19:02 2012 +0100

    Fixing ProfileControllerTest

commit 11dec06fdb69f8f2be06fd608170a682e497cc7a
Merge: 591ad4d 38800cd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 17:48:37 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/AdministrationController.php

commit d73dc174af42250301608de4a828830fd27d5251
Merge: 66dbe00 f89b655
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 17:48:37 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/AdministrationController.php

commit 591ad4d7a3a5f64551e6d56dfbf970ddd31c0e0f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 17:47:31 2012 +0100

    many little fixes

commit 66dbe005ac45043aeecf452c83f62aec7d3c3048
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 17:47:31 2012 +0100

    many little fixes

commit 38800cdd0e19788d11a286a8cf7390cfbb962328
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 8 17:30:52 2012 +0100

    Fixed pmd violation

commit f89b655a872504ea62ad259ce100d10450d0d696
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 8 17:30:52 2012 +0100

    Fixed pmd violation

commit 55f95f654544227d2745f30c5a9b3335fafae2e6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 8 17:30:24 2012 +0100

    Fixed test

commit b7b06db39c404aac4b781fff615f8603fb95b227
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 8 17:30:24 2012 +0100

    Fixed test

commit 378e994dd5c2412b89eb790e1cdacc46c6e65687
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 8 17:10:38 2012 +0100

    Use entity manager only if necessary

commit fcfc274543cace6d1c42e051e1f75163862cca13
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 8 17:10:38 2012 +0100

    Use entity manager only if necessary

commit c65d3fd3aeeabd7093eafb023738979d8ccd5804
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 8 17:02:08 2012 +0100

    Removed typo

commit bb88f2be78ed4c3ed6b7e437e18b113e8f569cfd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 8 17:02:08 2012 +0100

    Removed typo

commit bac66a0e2c5bb0c5e9ce724e10e31f8cd61253ad
Merge: af758f6 7539501
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 8 16:41:07 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit e9290589c46b219f9c7ae1febc73d7f1eeab539a
Merge: 10a4622 93b563e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 8 16:41:07 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit af758f64884f64857507d164b7030214de0a9731
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 8 16:40:21 2012 +0100

    Fixed some tests broken by new translation keys

commit 10a46224579d0d1ace7dcb2ec22de99a6912bb49
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 8 16:40:21 2012 +0100

    Fixed some tests broken by new translation keys

commit 59c293ffabb80ae1626c0585c50ac3b360404636
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 8 16:21:39 2012 +0100

    Added personal workspace to user's workspace list + fixed/refactored user fixture

commit 258d844bc56bcb623c829c07479ff2e99b3242f4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 8 16:21:39 2012 +0100

    Added personal workspace to user's workspace list + fixed/refactored user fixture

commit 7539501b1d70652ed26f5ff62ee47b94b5783350
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 15:20:24 2012 +0100

    translations for workspace groups parameters

commit 93b563e5da37b097edffd0b6aad89dacb831d1b2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 15:20:24 2012 +0100

    translations for workspace groups parameters

commit 32d675e46833ba66688f3d7e31af40e621128017
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 14:53:26 2012 +0100

    moving confirmation messages in a new folder

commit 7925def02ba8fc6c7a12c8bd601b751c91d5fc88
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 14:53:26 2012 +0100

    moving confirmation messages in a new folder

commit 196e9a5f824f5a2c2a64e1831c6754192aa81879
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 14:40:13 2012 +0100

    administration: user & groups listings translations

commit 64cfc1943f316f19bb8f42be7117b530f0c52d62
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 14:40:13 2012 +0100

    administration: user & groups listings translations

commit 76ae58230b00f9afe725303c410defbd9ea85d72
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 14:04:29 2012 +0100

    role translations for the user creation form

commit 02887c69d9ea853176a5b6a21dbe9bfde828db0e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 14:04:29 2012 +0100

    role translations for the user creation form

commit 3845ec4aa9d2c9b0c7e4833afb3ffb7d85af9558
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 12:07:52 2012 +0100

    fixing user creation form

commit 3943bbf2ccdee89dde933b40b3ed825d8b84f6ca
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 12:07:52 2012 +0100

    fixing user creation form

commit aabb6daa6e44f83448c5908b0a3fd1bc91d2d67b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 12:07:48 2012 +0100

    fixing the broken test

commit 3e3cfe0e7ad83b2a2aef5a04555125b964bf11be
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 12:07:48 2012 +0100

    fixing the broken test

commit eb258018814369b9cbc499dfdfd174c894364e87
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 09:52:08 2012 +0100

    fixing an url

commit 05dfdf839c618dd8c0f0dba3ff29d5c0d232f1cb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 09:52:08 2012 +0100

    fixing an url

commit fc966b321e8effb4387e2a42ce0259a5702524a3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 09:49:21 2012 +0100

    open isn't a custom action anymore

commit 71be83e457fb8015599112e847755791fa91bd15
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Nov 8 09:49:21 2012 +0100

    open isn't a custom action anymore

commit d9720faaf355b2a702624e6299d5c197df498b4c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Nov 7 23:56:48 2012 +0100

    Removed unnecessary capitalize filters in templates

commit 0b759acb2f3244c17efad7662c0f793587e7e4a2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Nov 7 23:56:48 2012 +0100

    Removed unnecessary capitalize filters in templates

commit e0a5e40488db013347ca35eb9f074bc96a7af082
Merge: 66c8853 5e939c4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Nov 7 23:23:47 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml

commit b3322845255f53ccdf16e61df96f90e7b71c56fb
Merge: c087715 43525c6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Nov 7 23:23:47 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml

commit c0877154262cb56c0b85d5215571d036bc20f51d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Nov 7 22:12:15 2012 +0100

    Upgrading twigjs bundle to solve templates translation issues

commit 66c88533fd25c6173e642524ef64d057546d7fca
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Nov 7 22:05:27 2012 +0100

    Organizing translations alphabetically to ease doubles and typos finding

commit b0a4bb7d5b8d49a09f1d6cacf0080d552e824428
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Nov 7 22:05:27 2012 +0100

    Organizing translations alphabetically to ease doubles and typos finding

commit 97375f82cdbd062893dc229981eb80e6746d250a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Nov 7 22:03:17 2012 +0100

    Adding a missing translation

commit 9dd4c5a324de9f1c84c216e421dd98dff9ae599a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Nov 7 22:03:17 2012 +0100

    Adding a missing translation

commit 5e939c423c1c1896745e1a392218ab71427ca363
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 17:41:24 2012 +0100

    commenting $manager->clear un LoadGroupsData

commit 43525c6485546c293c07b18b34bdaf3f939d0633
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 17:41:24 2012 +0100

    commenting $manager->clear un LoadGroupsData

commit ced032d355f26b59ef52bd970924f7f9ee8addd7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 17:30:20 2012 +0100

    user roles translations

commit 22485888b02c9e9a53df7ec50b7c9741ae65d629
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 17:30:20 2012 +0100

    user roles translations

commit 725cecd83c37a1210186dd3e03f6cd2485e04498
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 16:50:51 2012 +0100

    adding a user creation date

commit d1b78990b1dd494ebad6480cd3b9684cc6746d54
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 16:50:51 2012 +0100

    adding a user creation date

commit 3428a236f0f101f62311d5401fc21f11293ce289
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 16:03:21 2012 +0100

    administration plugin management interface updated

commit 3696f154b08b8fb84358b87f9d865a3028b282bc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 16:03:21 2012 +0100

    administration plugin management interface updated

commit 58625c80eef419a5c9d30306f5b8f342fbe9fcc5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 15:38:44 2012 +0100

    cleaning the widget workspace configuration page

commit 6e351298d7ca34c9f7a625b8a414164e4aa4166b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 15:38:44 2012 +0100

    cleaning the widget workspace configuration page

commit 9dcdc037c84fb706a9df24ebb5f4505c7a39833d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 15:25:17 2012 +0100

    workspace users & groups management: translations & some bug fixed

commit aa01f393f70ec501cf212973dbc7d49e7d8aba5d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 15:25:17 2012 +0100

    workspace users & groups management: translations & some bug fixed

commit 9877a91c7225174c8795ed712bd5e180596872e9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 13:30:48 2012 +0100

    prettify workspace's home

commit abcde65ac779ff023e109602d8ec7f073b1005c7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 13:30:48 2012 +0100

    prettify workspace's home

commit 92b3fa93ede914f4cf277e61dee5913011a0399b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 12:50:52 2012 +0100

    widget scrollbar

commit 67971e7cfc32bce60a7e12590e0a3c3aca947e96
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 12:50:52 2012 +0100

    widget scrollbar

commit 8b991a9c425dc987127d000d6232ced3cf25fa33
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 11:14:33 2012 +0100

    Improving the resource logger (+ fixing the multi delete~ the test is still broken)

commit 1bad457dcd3af2b37416b70431f0440b8aa3da48
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 11:14:33 2012 +0100

    Improving the resource logger (+ fixing the multi delete~ the test is still broken)

commit 5f38b1d88156f9720d96abd032c569b157a1a93b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 09:24:15 2012 +0100

    moving dashboard/widget/plugin.html.twig to Widget/widgets.html.twig + reduce button for widgets

commit ce4b75c62e03795be1e10a87352a213fe8c2dad0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 09:24:15 2012 +0100

    moving dashboard/widget/plugin.html.twig to Widget/widgets.html.twig + reduce button for widgets

commit 45338e722f4c88f8c04009a9a8decdcbf82dd460
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 09:14:22 2012 +0100

    resource logger widget for workspaces

commit 54ee5b7c72954b127eabffd660387600279121d0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Nov 7 09:14:22 2012 +0100

    resource logger widget for workspaces

commit 263759ef18735ac9e834bd1fc2475d3a60751b44
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 17:41:25 2012 +0100

    resource logger translations

commit 7ea217ccef1183f8d2d3ab9c8d1c8303cca58f78
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 17:41:25 2012 +0100

    resource logger translations

commit 9788727d7dc4c4dd3009c737a59c2033a9011bd7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 17:30:14 2012 +0100

    moving resource_events.html.twig to views/Widgets

commit 8d94366e1fb18bd81c093c2b69a5ee1dd43c360b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 17:30:14 2012 +0100

    moving resource_events.html.twig to views/Widgets

commit b4f1f4467e6e660ec040c74d0d1734e325d91fce
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 17:13:38 2012 +0100

    moving DisplayWidgetEvent from Plugin/Event to Widget/Event

commit de98ee71162ba8622fd82990f932bddb4c004213
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 17:13:38 2012 +0100

    moving DisplayWidgetEvent from Plugin/Event to Widget/Event

commit c3a0c384904c982f09dc322a67c2e1477fac0911
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 17:11:07 2012 +0100

    checkstyle

commit 6b514af422268f15bd5617a36f31acb2a997b597
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 17:11:07 2012 +0100

    checkstyle

commit f3266d7fcb60041c6b32cafacdc020e150b56df2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 17:04:45 2012 +0100

    resource logger is now a widget

commit 2979da9dadac2b2de926179ac201fbd7c8a06f8e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 17:04:45 2012 +0100

    resource logger is now a widget

commit 59c1fb4600e8463c2d71871efcf597dbc64d962d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 15:56:58 2012 +0100

    removing close and reduce buttons from dashboard/infos

commit 9a986d94a629feae892f10a433e052c22e8db1cd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 15:56:58 2012 +0100

    removing close and reduce buttons from dashboard/infos

commit 1f24636dfa5c041cfaee69d45002b17303f8be40
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 15:50:33 2012 +0100

    fixing testAdminCanCreateGroups

commit 70ee3c15e1af3908a520e5a6187ab5bbf58ec477
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 15:50:33 2012 +0100

    fixing testAdminCanCreateGroups

commit e02561d62f400392d4ec46666361141ab16efef9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 15:24:18 2012 +0100

    translations for resource manager resource type select dropdown

commit 72a285c21ce7096fa2741b8e20047d46dda47bf8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 15:24:18 2012 +0100

    translations for resource manager resource type select dropdown

commit b4a8f334ca5305c0cae7c17da2d88a7d9d3583db
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 15:16:13 2012 +0100

    capital letter for translations

commit e0eaa14a18049499c779061ab21781369375b83f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 14:51:45 2012 +0100

    reduce & close buttons for plugin widgets removed

commit 37dcbb850bad1c8ae32d7f5677cb9ced7d7cc2fc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 14:51:45 2012 +0100

    reduce & close buttons for plugin widgets removed

commit 388c902ecf393c4f8ef5c4e3452cf879f72ef2f9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 14:43:33 2012 +0100

    fixing tests

commit 8da853ddd8d0e0df778217ad73729fbfc8f9dc77
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 14:43:33 2012 +0100

    fixing tests

commit b30ce17eedd6866be50647a6a229d2f46220014a
Merge: 24f613e 32b9773
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 14:08:15 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0d0e5b0b5b17950f4657c5136e7a2e3581820f11
Merge: 9326f48 1ff50e5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 14:08:15 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 24f613e322ccb0b9407f49450d5c2d0d35c5f4fc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 14:07:41 2012 +0100

    workspace widget configuration + rssreader bundle

commit 9326f48f34addde89f699de371ffc667b03116cd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Nov 6 14:07:41 2012 +0100

    workspace widget configuration + rssreader bundle

commit 1ff50e5fc4ec43e7e59e64580b6523435c130f4f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 5 14:48:09 2012 +0100

    Update dependencies

commit 32b9773ab038be6900c25848e7ad8d402795b1e5
Merge: 374e16e 5ba5d91
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 5 14:09:15 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/DashboardController.php
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/DependencyInjection/ClarolineCoreExtension.php
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Dashboard/resources.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Resource/menus.json.twig
    	src/core/Claroline/CoreBundle/Resources/views/Resource/resource_thumbnail.html.twigjs
    	src/core/Claroline/CoreBundle/Resources/views/Resource/resource_types.json.twig
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceControllerTest.php

commit d42a45b7b3d6f0908de7a6a4fbb728587ef9f89e
Merge: ca58a0c aae508f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 5 14:09:15 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/DashboardController.php
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/DependencyInjection/ClarolineCoreExtension.php
    	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
    	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
    	src/core/Claroline/CoreBundle/Resources/views/Dashboard/resources.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Resource/menus.json.twig
    	src/core/Claroline/CoreBundle/Resources/views/Resource/resource_thumbnail.html.twigjs
    	src/core/Claroline/CoreBundle/Resources/views/Resource/resource_types.json.twig
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceControllerTest.php

commit 374e16ee6834e2a85219ec9c882db3c38fb1b1ad
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 5 12:09:26 2012 +0100

    Modify resource names in resource fixture

commit ca58a0c2d56de20f8b47ea6d511bf918cb1e3828
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 5 12:09:26 2012 +0100

    Modify resource names in resource fixture

commit a8ed44af83c92d4f99a2ffd5ea9f367204ffdc0e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 5 12:07:16 2012 +0100

    Resource manager refactoring (backbone, underscore, sinon, ...)

commit 1b474c223a2586c4760e113a8b8256caef2c1932
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 5 12:07:16 2012 +0100

    Resource manager refactoring (backbone, underscore, sinon, ...)

commit 5ba5d915342c551cda9a4138c213083b282cb413
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 5 09:45:12 2012 +0100

    widget onConfigure event

commit aae508f407fc30594f1b7444db8e7e942a0bcf65
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Nov 5 09:45:12 2012 +0100

    widget onConfigure event

commit 56e797e43f1e0b034b04822b81f06a204aaa3338
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 17:39:55 2012 +0100

    updating doc

commit 1d10dac9d0480aa87bb66b213bf2e5f684ee3481
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 17:32:24 2012 +0100

    Icon for widgets

commit 3658a937a119e1795785121dbdba32fca9203352
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 17:32:24 2012 +0100

    Icon for widgets

commit 4b936d934ffbadeda9a6d4ea47aec437e903d607
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 17:04:57 2012 +0100

    moving LoggableFixture to the Library/Fixtures folder

commit cd277c042a79aa4b2a8889bc4baf8130f430ee5a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 17:04:57 2012 +0100

    moving LoggableFixture to the Library/Fixtures folder

commit 3809f329b84d60289975fd2194811fa4826e92a3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 16:59:22 2012 +0100

    Addings the is_configurable field to widgets + list of configurable widgets

commit 3dbd4b943517c54866401cd83dd4257e73077240
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 16:59:22 2012 +0100

    Addings the is_configurable field to widgets + list of configurable widgets

commit 8d46a4cd2dea467659e177e2b40714a1711236cf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 16:21:33 2012 +0100

    workspace settings layout (breadcrumb) + translations

commit d0375131ca320f3c4c02bcc3c46486f71af10a5e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 16:21:33 2012 +0100

    workspace settings layout (breadcrumb) + translations

commit a1b3e258aac451a45cf7b04c15a5b159dcc80c9a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 16:00:16 2012 +0100

    skip a test

commit d0e3e2cb8d71b1c83e897714e019aae04ec74bbb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 16:00:16 2012 +0100

    skip a test

commit ddda1f36a93328e8487d9e2c1d987fe5e01339cf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 15:02:48 2012 +0100

    closing a section tag and removing draft widgets

commit 3ff8dbb470c70769a24cb19b25e571e349fa0f34
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 15:02:48 2012 +0100

    closing a section tag and removing draft widgets

commit 3ec719c2dadd9cb05748e7571fac41e6cf17d468
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 14:21:33 2012 +0100

    checkstyle

commit e5562a9b8ec8c3b1898777c4bb0c7ce3d308c38d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 14:21:33 2012 +0100

    checkstyle

commit b682864b8dc82578e2aedd75be54516e8bbc382e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 14:17:17 2012 +0100

    adding tests for widgets (process-isolation is now completely broken)

commit 82c99aa8c6549fa9c135d2f252f4b0b53c0ff5e8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 14:17:17 2012 +0100

    adding tests for widgets (process-isolation is now completely broken)

commit 899c22609d58f18c064051117d77423af8ce27d2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 09:39:22 2012 +0100

    adding the widget manager service

commit b4191d20e6f88c359db8663ab78589f45334000d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 31 09:39:22 2012 +0100

    adding the widget manager service

commit 13f174330077c84ec6adb1afe911903d9b7f19c9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 30 17:06:34 2012 +0100

    cleaning the widget management

commit 3dd391c5073da8b2760c122754d3e5b1fb67115c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 30 17:06:34 2012 +0100

    cleaning the widget management

commit 40ecbee863372f02e7c23833c05c331324b747d0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 30 17:02:06 2012 +0100

    widget management for workspace (draft)

commit 24aea8e12c690d75673f812a67ecabc26463868d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 30 17:02:06 2012 +0100

    widget management for workspace (draft)

commit 8879aac3dcf8c3c2043023b00d8387d89d48d521
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 30 08:45:38 2012 +0100

    fixing tests

commit 5e57ac3b9fc3d457b8f8d5e577861e528ed5c62c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 30 08:45:38 2012 +0100

    fixing tests

commit 6de97908e60eff8e48139f481f6f30b70e190547
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 29 17:37:29 2012 +0100

    updating the readme

commit 97e3e822c3681a69f52afd13f6c9a9af63ef06fd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 29 17:27:15 2012 +0100

    removing single export and fixing the exporter for complex plugin resources

commit 52c956d70cfebe4f63127854ada70f1dad856e09
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 29 17:27:15 2012 +0100

    removing single export and fixing the exporter for complex plugin resources

commit e01f26ecff15f107cee0eb7772d2fd7ddbcf86ea
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 29 16:34:49 2012 +0100

    removing is_downloadable field and renaming is_visible & is_naviagable

commit d88cf13df8bfbe00d16d672f6fe9c705fb3bf6d8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 29 16:34:49 2012 +0100

    removing is_downloadable field and renaming is_visible & is_naviagable

commit ab26ae783115aa2c4260ec15da2607a8de1de774
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 29 16:24:32 2012 +0100

    addings 2 translations

commit 2ebe3220fddd97cad768800e7d018f8d8980e681
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 29 16:24:32 2012 +0100

    addings 2 translations

commit 94c9acfc837817722798e6f943395a9207b5b4e9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 29 13:39:49 2012 +0100

    fixing a bug in the filelistener

commit 0b74b3ae0e900bbcff35b02bfec0d1956ddcb854
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 29 13:39:49 2012 +0100

    fixing a bug in the filelistener

commit 7ae95652052c335e1f3bab22f8835becb5b3dc93
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Oct 29 13:20:22 2012 +0100

    Using resource id instead of timestamp in resource fixture

commit 8d709520cbcabb5705e9de91490bb88b1e42fe8a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Oct 29 13:20:22 2012 +0100

    Using resource id instead of timestamp in resource fixture

commit 36ecdd95bc5c3f042af657ea7f8dbead04f31fc8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 29 12:27:45 2012 +0100

    checkstyle

commit 8e9df14596afdc59544734bef296c056c8edeae6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 29 12:27:45 2012 +0100

    checkstyle

commit 3e566502b405d2611117dcfe0851930b88d44ff2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 29 12:22:18 2012 +0100

    refactoring plugins translations and names

commit 59234e723b392239db0143da665aaf36b338a9b5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 29 12:22:18 2012 +0100

    refactoring plugins translations and names

commit f62a684dd542c8126db196443859466cbc2f0096
Merge: 3306ce3 555a0d2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Oct 29 11:32:12 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	app/dev/delete_files
    	src/core/Claroline/CoreBundle/Library/Resource/Manager.php

commit 07f00ca42f44fb389f0f99a44780a39c5fcd1c3f
Merge: 84c102b a269f0d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Oct 29 11:32:12 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	app/dev/delete_files
    	src/core/Claroline/CoreBundle/Library/Resource/Manager.php

commit 3306ce37692e658ef296f337dc2a7afee3e31ef5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Oct 29 11:29:15 2012 +0100

    Pre-merge commit

commit 84c102b5938c7ec65a86bd6edd4d923611bb83ee
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Oct 29 11:29:15 2012 +0100

    Pre-merge commit

commit 9dc58c646ce607815bb877fd0d36e501ec9921ee
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 26 13:54:57 2012 +0200

    removing plugin translations

commit 5385ffdd2d6061dc53009aafd8fe239e336e7265
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 26 13:54:57 2012 +0200

    removing plugin translations

commit 1c92f20ff6c44528a79ac2992e82319df840bdfc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 26 11:38:47 2012 +0200

    refactoring widget configuration table

commit 2e022de917bfe287b005e9943069fb172d81c8fd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 26 11:38:47 2012 +0200

    refactoring widget configuration table

commit 555a0d251ad27ffb62a60ad33b4171c847b50e1f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 25 15:21:44 2012 +0200

    widget configuration database table

commit a269f0d5451c86507e6261ac2639a80d10c045c8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 25 15:21:44 2012 +0200

    widget configuration database table

commit e454a16d0c27455c3a479fe27e18694c6b5f4023
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 25 09:31:59 2012 +0200

    widget documentation

commit cd56ec15601ebbc1166b9c9766f5b90e200226a6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 25 09:31:59 2012 +0200

    widget documentation

commit de8ff54eeb61d2ce4f060f5884a545ff119e39d1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 24 17:18:27 2012 +0200

    basic widget plugin implementation

commit 1d326985ba46c21a5f9b6679bf06556d40b51259
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 24 17:18:27 2012 +0200

    basic widget plugin implementation

commit b3f904c8776386651230945a3683c1522036af1e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 24 16:32:25 2012 +0200

    Adding widget table & config for plugins

commit b01743c5969b98fd57ec0ff3253d4580cb0d3cbe
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 24 16:32:25 2012 +0200

    Adding widget table & config for plugins

commit 5fe9aa470ada5e5d849f9465dc6a5e00da3be8f6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 24 14:46:45 2012 +0200

    resource logger tests

commit bd99ab834809eef5274cf01bf8f68c9424f7cc5b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 24 14:46:45 2012 +0200

    resource logger tests

commit a5e12aa79064b496b9a4d9382b2683b1fc4e17b7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 24 13:37:40 2012 +0200

    adding basic resource logger system

commit 17716d2aef36661b3cdaf5f3ed4475415410f486
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 24 13:37:40 2012 +0200

    adding basic resource logger system

commit e2bb31a6aacf0303d5638046f6a14554d02dca20
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 23 11:56:13 2012 +0200

    checkstyle

commit 7948f51d47d86f286028091b03bb9631efbed4b0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 23 11:42:49 2012 +0200

    more doc

commit a30e0a566bd5ef561595c3ce2308c0f74b74e425
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 23 10:27:41 2012 +0200

    set LoadResourceTypeData as required fixtures

commit 875cd0f406094f9b4a6c3124f31bd4a589ddf995
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 23 10:27:41 2012 +0200

    set LoadResourceTypeData as required fixtures

commit e6cbb232410d142094ffa83f2a9d3d893e39d170
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 17:47:44 2012 +0200

    fixing customActions async value

commit 9cc5f70b726b2a1485bd84b045c3ee6ac24a1dc6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 17:47:44 2012 +0200

    fixing customActions async value

commit 12baf348341f10ba9f25b031f5c5fa535bae2ba0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 17:07:53 2012 +0200

    HTMLPageBundle back under the SiteBundle name

commit 84abb31795d19bff75c48459eaab32276675aef4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 17:07:53 2012 +0200

    HTMLPageBundle back under the SiteBundle name

commit 72877e2911f2e6600ffb4a2b1f9b4bf8be0d1c1f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 15:10:23 2012 +0200

    more doc in readme.md

commit d7c629f89ce6d6e2b7b8b19f539d337977301d8d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 15:10:23 2012 +0200

    more doc in readme.md

commit 44d07f3ffad490459735bf9e4d7e7c151dce4fb1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 11:34:02 2012 +0200

    adds a test

commit c1564a9203c0df75d304659d482b01192f9ebdc9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 11:34:02 2012 +0200

    adds a test

commit 61d89531c2a965295ac6ee31c81ab9dad5ce7555
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 11:07:48 2012 +0200

    fixing workspaceUserControllerTest

commit bac8b636d4e50d3552d52b2000bffea383b3f594
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 11:07:48 2012 +0200

    fixing workspaceUserControllerTest

commit d67e37e59c9ee644ac8544a2ca2ae948a7e7f8a3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 10:55:12 2012 +0200

    refactoring urls: 8 => multiAddUserToWorkspace

commit 36a8fc93205c36e16fdeac7655bc427cd6d27d25
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 10:55:12 2012 +0200

    refactoring urls: 8 => multiAddUserToWorkspace

commit fc029ee4ee35fde7dcb9226f32abf8abf4ae4252
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 10:46:12 2012 +0200

    refactoring urls: 7 => multiDeleteFromWorkspace

commit 4ce8c80ff269165f1194b0c7484a13aba1c8924a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 10:46:12 2012 +0200

    refactoring urls: 7 => multiDeleteFromWorkspace

commit 1836694302311199df1303d88add1f3c2ed0e236
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 10:27:07 2012 +0200

    refactoring urls: 6 => multiDeleteUsersFromWorkspace

commit 1649f217c0d96166832955100be56edc4d85a6a1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 10:27:07 2012 +0200

    refactoring urls: 6 => multiDeleteUsersFromWorkspace

commit 0b86ff05fc7d5e974dff0220393d11fb1b18f63a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 10:15:34 2012 +0200

    refactoring urls: 5 => multiAddUserToWorkspace

commit bd1851198c677ea2d77d7f28052be1a9eb63bd88
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 10:15:34 2012 +0200

    refactoring urls: 5 => multiAddUserToWorkspace

commit 11a11d32cc154df7e41d4fea299475d0bcc2a707
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 10:10:03 2012 +0200

    refactoring urls: 4 => multiDeleteUsersFromGroup

commit ee54ca291cd1d76dbe8e47e9114beec8c89f1fc0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 10:10:03 2012 +0200

    refactoring urls: 4 => multiDeleteUsersFromGroup

commit 3124901dfe301c9ba1e68ed11024bd1746eeaa6d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 10:00:00 2012 +0200

    refactoring urls: 3 => multiAddUserToGroup

commit 27b439d28fd18f96bc4268079d2080da4f9925d3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 10:00:00 2012 +0200

    refactoring urls: 3 => multiAddUserToGroup

commit 0820c1a07647d29f2d6b273aa3f11e5f1b078108
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 09:50:49 2012 +0200

    refactoring urls: 2 => multiDeleteGroups

commit 97e2a1e34d35505de364e564ccdec6c5ee8411e9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 09:50:49 2012 +0200

    refactoring urls: 2 => multiDeleteGroups

commit 9355677320edd385550c9e1f0442f00b41298e98
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 09:46:51 2012 +0200

    refactoring urls: 1 => multiDeleteUsers

commit 132dc8c33890fe5924dc6be90ea36a0fe9f4a048
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 22 09:46:51 2012 +0200

    refactoring urls: 1 => multiDeleteUsers

commit 7c2fee5528e5b9d8afd90362000fef8c158ce7e7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 15:56:58 2012 +0200

    fixing a test

commit a7b40fe5253fe8a1c5486c7e82e827d42ddc1e8f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 15:56:58 2012 +0200

    fixing a test

commit 596d7c2e689b690e647f4f73648333e45c962f08
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 14:21:46 2012 +0200

    should fix the broken test

commit 590afb875e68eb55ea13056fbd412a771e474aaa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 14:21:46 2012 +0200

    should fix the broken test

commit 9d3945a2475a0b5fdcf412f2756ff809b4d4842e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 13:46:13 2012 +0200

    removing a var_dump

commit d4e6a2fbb74840c99a99e8b8166bc2e2cf2372b8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 13:46:13 2012 +0200

    removing a var_dump

commit d6afaa6364a4701ce6af63704acd50c22e3a249c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 12:08:05 2012 +0200

    uncomment resourceController tests

commit e0a4af55f918b326c6911b1943b4e0c5e44534c7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 12:08:05 2012 +0200

    uncomment resourceController tests

commit 892d3833f9f5f588b9fa48e79fa03759e9e983f5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 12:06:12 2012 +0200

    fixing resourceControllerTest

commit 75cc4fb48a2da8e7a356bd36b18ac0cd219aeb6b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 12:06:12 2012 +0200

    fixing resourceControllerTest

commit 96e0ba6a8ef840f23890b7472f77a04074caafbc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 11:59:32 2012 +0200

    removing from WorkspaceUserController:
    - addUserToWorkspace (keeping multiAddUser)
    - removeUserFromWorkspace (keeping multiRemoveUser)

commit c18a442f02ee865d4d76376b91eba6d3e6412e96
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 11:59:32 2012 +0200

    removing from WorkspaceUserController:
    - addUserToWorkspace (keeping multiAddUser)
    - removeUserFromWorkspace (keeping multiRemoveUser)

commit 4d22f3098e1b9237a3bc8c72827944fa707e94c0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 11:49:36 2012 +0200

    removing a var dump

commit 227d5aaebaf5a9b53a93247210837e28ddd21393
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 11:43:42 2012 +0200

    removing from WorkspaceGroupController:
    - addGroupToWorkspace (keeping multiAdd)
    - removeGroupFromWorkspace (keeping multiremove)

commit 12768d9d949f8efb6757bf6d9449ff4a7d2a5f01
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 11:43:42 2012 +0200

    removing from WorkspaceGroupController:
    - addGroupToWorkspace (keeping multiAdd)
    - removeGroupFromWorkspace (keeping multiremove)

commit 6bc444f13017af7dfe8b22c3ce1837ba41e3fd1e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 11:17:25 2012 +0200

    removing from administration:
    - delete user (keeping multidelete)
    - delete group (keeping multidelete)
    - addUserToGroup (keeping multiadd)
    - removeUserFromGroup (keeping multiremove)

commit 096237d7231a730e77d3ab82f6a0ef68c6c98c25
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 11:17:25 2012 +0200

    removing from administration:
    - delete user (keeping multidelete)
    - delete group (keeping multidelete)
    - addUserToGroup (keeping multiadd)
    - removeUserFromGroup (keeping multiremove)

commit 46fc23d9e4c1c2029711288930971cac75664748
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 10:59:38 2012 +0200

    removing the old ForumControllerTest file causing a bug

commit 7b200fbcc55fcfeb506512ce586b9cd7a2015070
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 19 09:13:52 2012 +0200

    fixing delete_files

commit 56581fa2ae8a57cb3a1f414755d5f75019d02abb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 18 17:00:46 2012 +0200

    multi export shows relative paths

commit 35d74193408cdaba985a50c4783b15422c7b28a0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 18 17:00:46 2012 +0200

    multi export shows relative paths

commit 6b7243e875b0acc05f28129934ef4479c5dc4028
Merge: b11a694 a11a138
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 18 16:30:20 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit deb19fe11ffae8203908c2363f5bdc7b0a6dd846
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 18 16:29:58 2012 +0200

    forums tests

commit b11a69427647ddee4b8ea38321687ff5c74a430e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 18 16:29:58 2012 +0200

    forums tests

commit a11a138e238f902c31ace164faf68cc067afd997
Merge: f5db119 5af5cde
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Thu Oct 18 15:24:16 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit f5db11973788f36baf8305f0e9d841a7e9e15459
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Oct 18 15:21:08 2012 +0200

    Plugins doc (partial)

commit dd962490bacc76a45db754cf8b2d42a9ace71ccc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 18 09:49:34 2012 +0200

    refactoring workspace management command

commit 85c23ef19cc76b537466541c83e27827d300db44
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 18 09:49:34 2012 +0200

    refactoring workspace management command

commit 5af5cded8ca0da629648833428a50ec3e45cdf7a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 17 17:31:44 2012 +0200

    refactoring dev fixtures dev command (workspace management not refactored yet)

commit 172f3df009ec84dc5182ddb3ddc9c35e5a47c43e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 17 17:31:44 2012 +0200

    refactoring dev fixtures dev command (workspace management not refactored yet)

commit 7a6d379fcca81815d1a75b02fcab5727f49d6916
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 17 09:35:05 2012 +0200

    streamedresponse for resource multiadd (broke a test)

commit 656c924ec431cad015caa61fb5c6d3333acee69b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 17 09:35:05 2012 +0200

    streamedresponse for resource multiadd (broke a test)

commit 4f8e3fa66f40209177d6556841c26f386aa62539
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 16 15:28:33 2012 +0200

    uppgrading to Symfony2.2

commit 3f0a5dd243f9cd8d31617461014a7ac98d3c6f15
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 16 15:28:33 2012 +0200

    uppgrading to Symfony2.2

commit c6828848196665b99fc5518097bb0211fa5f5f8b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 16 09:52:48 2012 +0200

    forum paginated subjects

commit 600b1a1d9042562d109726b30515cbc92b9bd2da
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 15 17:28:12 2012 +0200

    fixing ResourceTypeRepositoryTest

commit c9423b67eaed5465e0b77f29b9ae1aae86cf82c4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 15 17:28:12 2012 +0200

    fixing ResourceTypeRepositoryTest

commit fdbfa5e5df3d5d56c87977324d433bf1d6fc72ec
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 15 17:22:26 2012 +0200

    paginated messages for forum bundle

commit f12d64ec6957bf419c113176c5fcd01aabeca0e4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 15 14:48:48 2012 +0200

    forum options form and validation

commit d60beda8f59ddddaa02c6fd69b7a8f2d28a54afa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 15 14:22:53 2012 +0200

    checkstyle

commit 0d437ac1b6ac101afb6475a68d96e09346ac0e0b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 15 14:22:53 2012 +0200

    checkstyle

commit a593b2b6c374952c566b714c71af7de48674bcff
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 15 14:20:26 2012 +0200

    raw_install loads plugins fixtures

commit 166f8c6916c58f8e737e2b20f2d48183ec85a466
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 15 14:20:26 2012 +0200

    raw_install loads plugins fixtures

commit 002f9b471bfbb85e18db487b401109fbe01500db
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 15 10:09:56 2012 +0200

    plugin options event

commit 2c5ce7af22581282f255616424059b3dcf61136e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 15 10:09:56 2012 +0200

    plugin options event

commit cc41eda751559b2040a77c41050bd944c1afb35b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 12 14:58:24 2012 +0200

    plugin parameters: translations & icon

commit 76dd78b347cff28057b1e8aed013e34b205327bd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 12 14:58:24 2012 +0200

    plugin parameters: translations & icon

commit 083a33fe4d96e619e534bce8acca26ac761092de
Merge: d38ca86 693b7cc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 12 10:19:02 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit ae9b6a26d9782873352cae2eb45a10b90a44b395
Merge: a1e4057 fcf6c09
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 12 10:19:02 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d38ca86436bf866a2ba2d854da11d544bd151c63
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 12 10:18:22 2012 +0200

    Refactoring plugin installation

commit a1e4057f9b4663124154358286a1c9652803ef61
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 12 10:18:22 2012 +0200

    Refactoring plugin installation

commit 693b7cc52cb3c63e05629d7cbc1ce74708f8e555
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Oct 10 17:52:36 2012 +0200

    more user-friendly code

commit fcf6c090bcd9ea25680c32458aed90ded268645f
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Oct 10 14:55:07 2012 +0200

    html fix

commit 490b21c8003705a9e36da44d33ace1abf1cb63ad
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Oct 10 14:55:07 2012 +0200

    html fix

commit f01bd7f97776d9db0149821bf8bcca43dfa70f3d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 10 09:39:34 2012 +0200

    optimizing doctrine for displayed forum's messages

commit 9cd8e217dc411444ca3ad54a8c3ebfa99eeded10
Merge: 64a4b21 d5ca223
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 10 09:18:45 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit fc2c93928127208f8529c632aff54499076e58e2
Merge: 57c9e42 9adf7ae
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 9 17:30:55 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/plugin/Claroline/ForumBundle/Command/CreateForumCommand.php

commit 64a4b21ea747dc353d42be2e1f282a08915537f1
Merge: bce45d7 0a3614f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 9 17:30:55 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/plugin/Claroline/ForumBundle/Command/CreateForumCommand.php

commit d5ca223a6273548be5108d2f926a31b8dd8cb30c
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Oct 9 17:28:53 2012 +0200

    removed SensioGeneratorBundle

commit 9adf7ae710e40228e848fa7b2e5c0a34092d5151
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Oct 9 17:25:13 2012 +0200

    Optimize an adapt

commit 0a3614f558e8048f286344a72575e7702f1f56c4
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Oct 9 17:25:13 2012 +0200

    Optimize an adapt

commit 3495f22b5d50ebb61c7998439ba467a66865f958
Merge: a853bb0 adabdb9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Oct 9 13:27:24 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/Resources/less/layout.less
    	src/core/Claroline/CoreBundle/Resources/views/Resource/resource_thumbnail.html.twigjs

commit 6f62e51739d0f7251d24b0baa357a5d6f045d245
Merge: 19447a6 a9e8d5c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Oct 9 13:27:24 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/Resources/less/layout.less
    	src/core/Claroline/CoreBundle/Resources/views/Resource/resource_thumbnail.html.twigjs

commit e80ddcd752cd38b5429fb3539c4e2af620cce77f
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Oct 9 13:35:46 2012 +0200

    Added unique index for resourcesinstances

commit d6a6d3f4063f2c8020b48e874250e4ce48227108
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Oct 9 13:35:46 2012 +0200

    Added unique index for resourcesinstances

commit a853bb0ec773060a503b609ced26a1f80c0559a3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Oct 9 12:11:51 2012 +0200

    Pre-merge commit

commit 19447a69ae1dff488d6d4ae3c24d5625da593013
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Oct 9 12:11:51 2012 +0200

    Pre-merge commit

commit 57c9e4281289c515d08e18e56dcac327ac7a20b1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 9 11:48:21 2012 +0200

    checkstyle

commit bce45d7b507c56de6d597cf0692dc65ee78226e3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 9 11:48:21 2012 +0200

    checkstyle

commit adabdb96aec1883f9d39b5ae60600c7ff537bb90
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 9 11:00:07 2012 +0200

    fixing the merge

commit a9e8d5c35f720e318191d4bd4af01c0e70a12775
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 9 11:00:07 2012 +0200

    fixing the merge

commit 881496489d4f531a8ec9bc0511770101a6f79086
Merge: d1c54dd d3c66c5
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Tue Oct 9 10:40:43 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit e3482eb63f4468f6494f11ce6eecd4f0a6435156
Merge: 9b83f08 c700813
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Tue Oct 9 10:40:43 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit d1c54dd471bd680d5526551149596161a18c1ad0
Merge: f68a09b 4dfaa23
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Oct 9 10:40:22 2012 +0200

    Fixed conflicts

commit 9b83f083ad6867afe1f72a05e705fd22dc5a3de8
Merge: d2774f4 e61e60c
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Oct 9 10:40:22 2012 +0200

    Fixed conflicts

commit c70081360d2839b2dc812ce6b7027fb4b9056328
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 9 10:34:17 2012 +0200

    fixing forum message url

commit d3c66c53a60ede3ae61fc4d21a1ce0025e2adea8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 9 09:52:46 2012 +0200

    updating removeRole function

commit 2c29f3f203fa718827e5a3dfa0190ef47b06155a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 9 09:52:46 2012 +0200

    updating removeRole function

commit eea3fd3d95d09452f8c17188eb7347f2bb211d60
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 9 09:12:59 2012 +0200

    fixing tests

commit 5a6844a27d6dfef16f773a29a5162a4f46cd0a01
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 9 09:12:59 2012 +0200

    fixing tests

commit f68a09bb089d5402e9f0fff8e7b761059f090961
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Oct 9 09:02:22 2012 +0200

    Break the limits: Doctrine optimisations to allow creating "infinite" number of items without falling out of memory. Improved the speed a lot too.

commit d2774f433d19572f2d65d96f096132c6649844b4
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Oct 9 09:02:22 2012 +0200

    Break the limits: Doctrine optimisations to allow creating "infinite" number of items without falling out of memory. Improved the speed a lot too.

commit f7d9e294da2fd1430db6691d97b7a78da0e83951
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Oct 9 08:58:16 2012 +0200

    Added one cascade=detach to use less memory creating lots of resources in batch command

commit abdcd4e7d9c29465dccb2e27402c24d8f667c819
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Oct 9 08:58:16 2012 +0200

    Added one cascade=detach to use less memory creating lots of resources in batch command

commit 4d7b2b29919df2520771273f0d8447b05c71fe25
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Oct 9 08:55:46 2012 +0200

    Added hint to variable

commit 3355e5066e87b54ed844ba32954ef579331aa7c2
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Oct 9 08:55:46 2012 +0200

    Added hint to variable

commit 4dfaa2318473ad4e25ca998bb3eade234711305a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 8 18:09:52 2012 +0200

    random forum generation command

commit e61e60cc27f44209669e47529b4333c11c8ab994
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 8 18:09:52 2012 +0200

    random forum generation command

commit efeefb2c70c8613108bf4e158158c5c86fd1bc7a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 8 16:14:04 2012 +0200

    fixing resource repository

commit c3d20a711c86cb8e41bc487ca4828a89aeda7ff5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 8 15:26:11 2012 +0200

    hierarchical workspace roles

commit 11fbeb5e5b5d45f845caf9eb5d0c728a2ddc1f39
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 8 15:26:11 2012 +0200

    hierarchical workspace roles

commit e7e08971d88ba727a170191ead5bf13c6141fa9a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 8 14:45:00 2012 +0200

    removing setResMask method from the workspace creator

commit 8d99844b5f87d25e6f76cf38401a79129ce59dac
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 8 14:45:00 2012 +0200

    removing setResMask method from the workspace creator

commit c697f76201565fce894ddd33833d0bf1567b7ae5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 8 14:37:51 2012 +0200

    removing the mask field from WorkspaceRole

commit ab0535148b6d71a737142478794e9776a52004c3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 8 14:37:51 2012 +0200

    removing the mask field from WorkspaceRole

commit da03ae369b6b861f922be1523e1cc23013e31b23
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 8 14:12:07 2012 +0200

    WorkspaceManagementCommand added

commit 388b62b28ebd493835d63f2acd140a42f2c280a0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 8 14:12:07 2012 +0200

    WorkspaceManagementCommand added

commit 6070c6e5152fe31cf8bbfbc7951f8c2668b1a6aa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 8 11:13:44 2012 +0200

    forum plugin forms updated: wysiwyg editor & validations

commit 7ee149d8c9574745e523a94cf5890f4ecef9b7b8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Oct 5 15:53:32 2012 +0200

    ForumBundle plugin major improvement

commit db16178cba2fbd453e1cb855e0523d1b8a85bd9b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 4 13:50:08 2012 +0200

    removing test.webm

commit f9d1f57cf71515466cee276311f15b9786f72301
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 4 13:45:50 2012 +0200

    moving the video player from the core to the plugin folder

commit 88709a525acde7e4f52ea24ab0f45b0cce1bc83c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 4 13:45:50 2012 +0200

    moving the video player from the core to the plugin folder

commit 9e3f3ba772f7f038dd27aeaddca5cfa234584777
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 4 13:36:14 2012 +0200

    Improved exportAction for ResourceController (streaming)

commit 1c756adba5033392acb3530cbe08bf4fc014b895
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 4 13:36:14 2012 +0200

    Improved exportAction for ResourceController (streaming)

commit 31d2c367338d80f439d38ebd1aa9f45737d0f11e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 4 10:25:12 2012 +0200

    video player (draft)

commit 5237b81a9f680c3d5b85f08eaa144e16645d1cec
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Oct 4 10:25:12 2012 +0200

    video player (draft)

commit 8774930a4378ccb336a2c3fa5ce028c18488fff8
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Oct 4 09:07:37 2012 +0200

    Replaced private properties by protected (as warned in Doctrine documentation)

commit 784548e97dbd8ebc5db60319a944488ee8396ce5
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Oct 4 09:07:37 2012 +0200

    Replaced private properties by protected (as warned in Doctrine documentation)

commit ba6049d39e14fec84b92572ab0c5dd3898673e9c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 17:54:29 2012 +0200

    improved workspace layout

commit 1b0b16bc295bbcb5726b8d3b487a842d40020c7e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 17:54:29 2012 +0200

    improved workspace layout

commit 27e066b8e03ea215f14886356da1473201b53b15
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 17:08:08 2012 +0200

    checkstyle

commit 9330cd9ebb58a8ee8b8f1ad32d6c6a8ec31e5401
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 17:08:08 2012 +0200

    checkstyle

commit b4e7891a38e71099afc8df94ffe7df3563de6401
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 17:04:22 2012 +0200

    fixing DirectoryControllerTest

commit 17d22b0bb170c33d421119b6ef487fbcf035df9a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 17:04:22 2012 +0200

    fixing DirectoryControllerTest

commit 5477bc3603281f76c343366752b5fad823d3bee4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 16:56:20 2012 +0200

    refactor workspace interface

commit 911cc658ceb9a25f32680cc709d3805b71b54ef2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 16:56:20 2012 +0200

    refactor workspace interface

commit 8aec11e3ba9bfc1265ff0782a4a6570147dc53c4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 16:06:04 2012 +0200

    fixing resourceControllerTest

commit 8a7278c4002d02c8855979bc8c86b806042188fc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 16:06:04 2012 +0200

    fixing resourceControllerTest

commit c4d1f5d358967ecb045220e8cd8a8ed5b627d651
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 15:15:52 2012 +0200

    Claroline ExampleText plugin

commit 2c3bf1ce67e87450dbcafcd14a89df1802bd75f2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 14:51:09 2012 +0200

    fixing the TextListener

commit 0b3eb78605ba71219b608caab5e27c8e7e8904c5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 14:51:09 2012 +0200

    fixing the TextListener

commit c8ae6b7064c799af2748e5a10d886a82661eadb0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 14:38:27 2012 +0200

    filename exported updated

commit f25c23b6bc2a7ba75438a18ecaf57aba3c8618bb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 14:38:27 2012 +0200

    filename exported updated

commit 93295ac263becbb5daad61c02fb072d2b5f2e2d1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 10:10:38 2012 +0200

    forum bundle keep the context and message/subjects are instances

commit c0e0ea3581a976b280595c16c9883b41063f8371
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Oct 3 10:10:38 2012 +0200

    forum bundle keep the context and message/subjects are instances

commit 4cb525ffd1a4f6470f04d13a49775ceffbb3ee13
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 2 15:54:30 2012 +0200

    mimetype fields for File resource and player management (draft)

commit 074028cd6e0a68fbb82e18b76a67971ed932f552
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 2 15:54:30 2012 +0200

    mimetype fields for File resource and player management (draft)

commit 19d19be694c5812add326117c0a2fcfed08a745b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 2 09:42:15 2012 +0200

    refactoring json resource menus

commit 0ae52fda28b0a8a687afdc93e22957058d27100a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Oct 2 09:42:15 2012 +0200

    refactoring json resource menus

commit b152fc7aabf08aec1134a461cb1260eb5c3eb1f9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 1 17:45:44 2012 +0200

    add open custom action to file

commit cb9726825b5e60fda89f763d95da1719f587f8b7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 1 17:45:44 2012 +0200

    add open custom action to file

commit 2bd439aa3bc2c9eefc9167873309589b92ad0f10
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 1 16:44:18 2012 +0200

    administrationController dql requests optimizations

commit 984cc97ec3ff9bafac690645d5cf534568432b01
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 1 16:44:18 2012 +0200

    administrationController dql requests optimizations

commit 3b1bc4cd478f98834ff51383a020eaa8adb00f50
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 1 15:29:25 2012 +0200

    fixing a typo

commit a149952a4cfaea65f1b2f7e2e1a788254a093b6e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 1 15:29:25 2012 +0200

    fixing a typo

commit 276a9c5abbb944a8c7904b4e227af5cba000ef79
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 1 15:17:20 2012 +0200

    checkstyle

commit c222dd91bf713360ee348ad32d506ff8b08366ea
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 1 15:17:20 2012 +0200

    checkstyle

commit 64a317337799f5cabd517d4c8872e3eee657663f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 1 15:05:05 2012 +0200

    optimize dql request fired by WorkspaceControllers

commit 644e617cdc94a558f564d33a6bb860c14be5a085
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Oct 1 15:05:05 2012 +0200

    optimize dql request fired by WorkspaceControllers

commit 1c39f6994d10daa11e6a757ce99f2e898b3b8be5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 15:39:00 2012 +0200

    renaming userRepository and groupRepository methods

commit 00db17b040eecbd75bea45aed297b1ad04c53a4d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 15:39:00 2012 +0200

    renaming userRepository and groupRepository methods

commit 02a69bfb0c3fda1ab5b6647f96f2caac6aec846c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 15:12:48 2012 +0200

    fixing a workspacegroup test

commit 12159d5902e2cbc9e3e87594422d2285144af74a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 15:12:48 2012 +0200

    fixing a workspacegroup test

commit bded7f9f4c09f0d28d266a10535b50081184bcb4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 14:51:00 2012 +0200

    rollback

commit aa5b0ea042a5aab8423c2b4b9a8926206efe1106
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 14:51:00 2012 +0200

    rollback

commit e01c2648e5b15de2aa4cca3f92aa0d27b514e856
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 14:17:55 2012 +0200

    raw install doesn't install fixture for the test database (it may crash everything)

commit 2894c5c596938ae064ecc13b75a1c0367d759338
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 14:17:55 2012 +0200

    raw install doesn't install fixture for the test database (it may crash everything)

commit 76c2310bc5f74a8d7e6b4e73ddaa82604760add8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 14:17:34 2012 +0200

    changing workspaceGroupsController methods name

commit 27ca535741018833159081e57274f7aace36f546
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 14:17:34 2012 +0200

    changing workspaceGroupsController methods name

commit df36a6cf33d4687488a05ccd7aa85defd97f2140
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 11:55:07 2012 +0200

    refactoring workspaceController: renaming workspaceGroupController methods

commit 1dada413f57d555dbe3b5d3d8855d83637007770
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 11:55:07 2012 +0200

    refactoring workspaceController: renaming workspaceGroupController methods

commit b331e2fc1eafc513136801333149a2a58e09f523
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 11:07:59 2012 +0200

    2: refactoring WorkspaceUserController - names & dql

commit 8be92a46095f2722fe5e2a264f85b22613615596
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 11:07:59 2012 +0200

    2: refactoring WorkspaceUserController - names & dql

commit dd5884500542594e0185350724e8a332546b8f5f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 09:49:42 2012 +0200

    checkstyle

commit dee4dc031d0557da39e7cd46538092e5442cf487
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 09:49:42 2012 +0200

    checkstyle

commit 1e08e43bebade26e5e580391e37c2fb369359e42
Merge: d9a37dd 9100a87
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 09:40:49 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceControllerTest.php

commit 899cf01bc4a21fcb7f295cd9a062bdd33cde7eb7
Merge: 8c79533 6b588ae
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 09:40:49 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceControllerTest.php

commit d9a37dd7c1f42bacbe5f83446e2035eff7bc2077
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 09:38:43 2012 +0200

    1: refactoring workspace controller - splitting

commit 8c79533e46aacbe3d5f7ecde8c3a982ab88c0555
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 28 09:38:43 2012 +0200

    1: refactoring workspace controller - splitting

commit 3ce0ffcffd9190d9083b3fb979d8452e3e400027
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 16:57:36 2012 +0200

    checkstyle

commit 84582cbf4d5d2318bcb07341582dbb5f04f0f91e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 16:57:36 2012 +0200

    checkstyle

commit 9100a87392086202e7635d18daeef4d4f0685fac
Merge: f6c0dd9 ae857d4
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Wed Sep 26 16:03:53 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 6b588ae9b37a65756b8b7e6649b13cd0f4cfb37a
Merge: 2258330 9b21b42
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Wed Sep 26 16:03:53 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit f6c0dd9953be936e01b325369e8e81fc6ea4d029
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Sep 26 16:03:26 2012 +0200

    Uncommented the cleanDirectory method

commit 22583305ec293ef4d2139e2db53aad89c05db2b3
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Sep 26 16:03:26 2012 +0200

    Uncommented the cleanDirectory method

commit ae857d4efcea0b18f6467e4b6abbad99f0ebd1ce
Merge: 380ef98 db2ac9a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 15:21:20 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 9b21b423cff49f8e4f63dd59f31d380eee51b12c
Merge: ea8fcb3 6789589
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 15:21:20 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 380ef9850952d25702a101c3679c2d5894a2cca7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 15:20:40 2012 +0200

    AdministrationControllerTest (tests for users of groups)

commit ea8fcb3212001f4a7cd3b697d2108ee99d89a2ea
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 15:20:40 2012 +0200

    AdministrationControllerTest (tests for users of groups)

commit db2ac9a1f1d2fb024d413381f86135827135b4cf
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Sep 26 14:09:22 2012 +0200

    added test on exported zip file content

commit 678958988315dfe0524e90761a6d0085b5256a93
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Sep 26 14:09:22 2012 +0200

    added test on exported zip file content

commit 3717d3762e03ceb4390d12ad5ca22e0740eb7a92
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 13:30:27 2012 +0200

    Puts the test zip file in the test/files directory

commit 419f04de8a634ca40a2015f29bcc31770f2ad05a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 13:30:27 2012 +0200

    Puts the test zip file in the test/files directory

commit 891e2d290cbcbaac842df9b7a0bbfb6979ccb278
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 11:58:06 2012 +0200

    fixing the search button

commit f41e271f92c6ce26a613f7d8d050de5fce018c2a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 11:58:06 2012 +0200

    fixing the search button

commit 958bade84108e0766a831cdf601206f8fa4aab4b
Merge: b2de95b 962e544
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 10:56:53 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1def6fd72f225957dd900d6cd85c0e5d00a850fd
Merge: f46acd0 e067d7d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 10:56:53 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b2de95b6bae22ce2945eb07feed6bb3d02487611
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 10:56:15 2012 +0200

    multidelete and research for users of group listing

commit f46acd0e1e3935527f66d178c0fec291dbf33523
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 10:56:15 2012 +0200

    multidelete and research for users of group listing

commit 962e544958ebe6722f8035d172fa9fb23e8a2f2a
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Sep 26 10:36:33 2012 +0200

    Some refactoing of code style for phpcs

commit e067d7d08097f43f2613115acb9397942fd11461
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Sep 26 10:36:33 2012 +0200

    Some refactoing of code style for phpcs

commit 4ff9e0594ea9298f241183b0bdf54572d797a32b
Merge: 73a06a5 82c6078
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Wed Sep 26 10:26:12 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 1f464780b19faa423cab27cc43ecc0628681faff
Merge: 1f16aaf 7e442a4
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Wed Sep 26 10:26:12 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 73a06a521cfe1be8ccc038299bf544a7fe40b1d6
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Sep 26 10:25:53 2012 +0200

    Some refactoing of code style for phpcs

commit 1f16aafad3db01f5ea0e3a3e1330610e7dcc26c7
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Sep 26 10:25:53 2012 +0200

    Some refactoing of code style for phpcs

commit 82c60788f44fd00dc396d6e46095d7f2d7440bc4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 10:07:53 2012 +0200

    unique index on claro_user_group table

commit 7e442a4461e84601366e3a3c0536402df308436e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 10:07:53 2012 +0200

    unique index on claro_user_group table

commit 569ab2c655d80a4030b5a356b31701bcfc31338c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 09:29:23 2012 +0200

    removing a skipped test

commit 61d4e99cca3b47376da9b84d361fb20b313a7e23
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 26 09:29:23 2012 +0200

    removing a skipped test

commit b5e1b6017482ab576322770844fafe0c7f251070
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 25 17:45:22 2012 +0200

    no more users duplicatas with the create groups command

commit 23b305afe672ca2d5b2bce2aff0295789a7049a8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 25 17:45:22 2012 +0200

    no more users duplicatas with the create groups command

commit ef74d63cb0e49fa0d889a3efe9efea672ff85ffe
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 25 16:54:20 2012 +0200

    fixing user of groups dql request

commit 7ed639d87e821ff32d51a3a2004ede4a540411b0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 25 16:54:20 2012 +0200

    fixing user of groups dql request

commit e0c0e319c6a02a1994eae549ce3b92e42ab95496
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 25 14:19:50 2012 +0200

    replaced old resourceInstanceRepository function names by new ones.

commit c6a144ed11cc290921941c4f09b3528d17c1f881
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 25 14:19:50 2012 +0200

    replaced old resourceInstanceRepository function names by new ones.

commit f6ff85c9acf2a71baa8629e3f1c1f902071e28ea
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 25 13:57:35 2012 +0200

    replaced old resourceInstanceRepository function names by new ones.

commit b78c9112bbc24093dbca8c7768bb308e8df70b28
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 25 13:57:35 2012 +0200

    replaced old resourceInstanceRepository function names by new ones.

commit b6b0b09726b5017bd68553d27a0d7fa71c72c36a
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 25 13:30:41 2012 +0200

    Removed logger code.

commit a53e00d53f9b7599093b1642fead04cdb9d6e9a9
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 25 13:30:41 2012 +0200

    Removed logger code.

commit 4b2754dc3ed8f493da295e8b35e2282d22e08e88
Merge: c449408 1138aa3
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Tue Sep 25 13:22:13 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 664123b3257ae866aad57cd89476a0a66c2c271b
Merge: 4b31356 ba8e008
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Tue Sep 25 13:22:13 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit c4494087d9f3fb3e913b7808870afb406ea28cc7
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 25 13:21:37 2012 +0200

    Replaced nested tree by materialized path as resourceInstance storage

commit 4b31356f0f448ef9340a6f599c622b5afb103160
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 25 13:21:37 2012 +0200

    Replaced nested tree by materialized path as resourceInstance storage

commit 1138aa35635d6ee1ecfb1c0b5b11f743d54e359d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 25 13:15:16 2012 +0200

    skipping a test

commit ba8e008b0d9aec5b4e1fd5eec2333004376b06ad
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 25 13:15:16 2012 +0200

    skipping a test

commit 9c4211ff6014ae1d38434b1a0b2c54f3399dfa35
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 25 11:37:11 2012 +0200

    multiadd user to group for administration

commit 4736ee3f874d4ddbdb8c0c09a8faf9d4917787f0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 25 11:37:11 2012 +0200

    multiadd user to group for administration

commit e9c3c2cf1ba2a8543fc4be089507b4f81e326ff0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 25 09:18:11 2012 +0200

    fixing WorkspaceControllerGroupManagementTest (missing '/' before requested urls)

commit f3a768b7611933647702de9c9d90ce746333b176
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 25 09:18:11 2012 +0200

    fixing WorkspaceControllerGroupManagementTest (missing '/' before requested urls)

commit bdd5cd0320d9bd2217a8f3e1e1fe671530eb8233
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 17:35:04 2012 +0200

    administration user & group search tests

commit 646a044c2876da0823b9bb47c9c8abebfb57b2e2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 17:35:04 2012 +0200

    administration user & group search tests

commit b0623686c0a80ceab065bf2b79a234393f0b7940
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 17:26:25 2012 +0200

    administration user list search

commit 77e961a63237e20414e64fe91a43ad38bc0e100e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 17:26:25 2012 +0200

    administration user list search

commit 6a27dc5b29ebbb53e4618696878286749b1c10f5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 17:04:48 2012 +0200

    administration user multidelete

commit 89caadd544d40830dc1fc9a8e3e0ea060774bffb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 17:04:48 2012 +0200

    administration user multidelete

commit 1bc0a3187018c71d92b2a14c21e5bd77a9aac0ca
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 16:26:54 2012 +0200

    multidelete group's confirmation box cancel button fixed

commit 0fa112a1f43340a5c66023ec0b3ea098b0464fba
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 16:26:54 2012 +0200

    multidelete group's confirmation box cancel button fixed

commit dc1c1000c19cd5afeec7602095e169e9940dedd2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 16:24:01 2012 +0200

    multidelete group for administration

commit 2f2ea4cacd501e15c16e2cd2ebf17121f6087b2e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 16:24:01 2012 +0200

    multidelete group for administration

commit f52b08b63a2ab5fa4131ff3d67bfc843c57e48ea
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 15:31:36 2012 +0200

    refactoring workspace_user_management.js

commit c21c9b0eae2bafcc12cbfa78883c256101ee650c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 15:31:36 2012 +0200

    refactoring workspace_user_management.js

commit 5d1c19719fc61fc18f9a0dc7c56351cc02f5b0e6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 15:23:51 2012 +0200

    refactoring unregistered_user_list.js

commit 865ec37b59e2458e9c14bef90a44ff42391edd55
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 15:23:51 2012 +0200

    refactoring unregistered_user_list.js

commit 629bc950e19a541411aac33ec56474e673944c7c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 15:02:07 2012 +0200

    refactoring unregistered_group_list.js

commit 0e45bc8b1b511e8cc2ad8b2bd119275035600a7c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 15:02:07 2012 +0200

    refactoring unregistered_group_list.js

commit 0f9722601cf2e9a5305c4c73ae042b932a9b24dd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 14:49:18 2012 +0200

    administration paginated group research

commit 43bd2ede5702cb9e5ad24391f323d5a0730d2abe
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 14:49:18 2012 +0200

    administration paginated group research

commit 18c7a86d92d715714ee5622242d7c8df64b6ba4a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 13:47:58 2012 +0200

    workspage groups management

commit 4aed33101cefafff1f11926021e3c14c63fb2d0f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 24 13:47:58 2012 +0200

    workspage groups management

commit fb9a4f218e60742892cb9f278a3c22e2177acb0b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 20 13:40:07 2012 +0200

    Randomly generated groups name are more "readable"

commit ca78cb89e6b231ea50584d15770eada3bfa4899b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 20 13:40:07 2012 +0200

    Randomly generated groups name are more "readable"

commit e281163d5763c95bce5de290a474c9cdafb096c6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 20 10:57:19 2012 +0200

    reorganizing WorkspaceController

commit fd82057e31a545f62cf433b6d88549ff360799bc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 20 10:57:19 2012 +0200

    reorganizing WorkspaceController

commit 071ecc3bbe36cd7695fef9d900d9652e39378057
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 20 10:11:58 2012 +0200

    workpace user management rights and tests

commit 70f1b6964d713c6e1eb0851ff071a26e3faeba42
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 20 10:11:58 2012 +0200

    workpace user management rights and tests

commit ec6113ea937efd10dad36fa7ee1519c6bbee359a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 19 11:01:16 2012 +0200

    uncomment administrationControllerTest

commit 176d460539012967e3383ab726ebfebe9088d31e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 19 11:01:16 2012 +0200

    uncomment administrationControllerTest

commit e368fd68916a9c7d17bd9db1cb1a7b95832acc95
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 19 10:57:15 2012 +0200

    checkstyle

commit 94b58bacdc3e416d1bba08a941d9ea46bdabe06a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 19 10:57:15 2012 +0200

    checkstyle

commit 0babfc3a62db93e54831dc7eb0784d4444d64326
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 19 10:45:34 2012 +0200

    the user list only displays the platform role (still buggy)

commit f35b7db93f3a12a679e01452c868976863ec4976
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 19 10:45:34 2012 +0200

    the user list only displays the platform role (still buggy)

commit d46ac076a473251d6a4bd42cb7cddfc506399702
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 19 10:45:21 2012 +0200

    bidirectionnal many to many relation between user and role

commit 943efe693983b8ff8315c46fdb04e5548a732e3d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 19 10:45:21 2012 +0200

    bidirectionnal many to many relation between user and role

commit df70dc1a6b2ad2c07049b93b79f2b16387ef5a64
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 18 17:37:56 2012 +0200

    multiple delete for users in workspaces

commit c33fab9c0a5dfc70753829f5b6f7b3b3bb7dc236
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 18 17:37:56 2012 +0200

    multiple delete for users in workspaces

commit 9b87345775ba1e61586710741436efaca38c1874
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 18 16:28:10 2012 +0200

    Roles can be edited for a user in a workspace

commit 6cc78c637a6ead89d05a767011445d4cb8f9bb11
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 18 16:28:10 2012 +0200

    Roles can be edited for a user in a workspace

commit 47474ba6032458bb567cc38dcfdad31f25042638
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 18 09:31:48 2012 +0200

    workspace user & groups management (draft)

commit 756717c587b11d912d0a5a55b35a99bd87644654
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 18 09:31:48 2012 +0200

    workspace user & groups management (draft)

commit 67589cf503133b1c4881e55884896403285a87f4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 17 10:10:25 2012 +0200

    using offsets instead of pages for paginated routes

commit 1cc61a8711aae3b4622127a2cbee932d18a7287d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 17 10:10:25 2012 +0200

    using offsets instead of pages for paginated routes

commit d89d62788b2a20f8a0dad4b9a98f42fbcb10b608
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 17 08:59:24 2012 +0200

    search for registered users in a workspace

commit c8ce8378f16a1f5ddc22c80c4c7470684a50405c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 17 08:59:24 2012 +0200

    search for registered users in a workspace

commit 79e2cb245c71766b327e5c92bc77a3e373c7270c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 14 15:45:18 2012 +0200

    workspace_user_management refactoring (draft)

commit 78f20bd97b6d72126900761f3ab47fa5e29bd5a7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 14 15:45:18 2012 +0200

    workspace_user_management refactoring (draft)

commit d0a63d96ae3119fac3cca3cdc3f6c21e21c0aa97
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 16:52:24 2012 +0200

    flush() outsite the loop for createUsersCommand

commit b07c624abbe07d7887f8f27c1ff61924f08b6915
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 16:52:24 2012 +0200

    flush() outsite the loop for createUsersCommand

commit c7e7d91221ff226288a682f83856ffc26a961553
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 16:31:15 2012 +0200

    workspace creator optimization (removing a flush())

commit 4e3dc15b960caeba3fb71673c5faa45e04105daf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 16:31:15 2012 +0200

    workspace creator optimization (removing a flush())

commit 64fd3c43be71aee5851e86a846403ca98a22c0c0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 16:11:27 2012 +0200

    paginations working with offset and limits

commit 6ac869809ad56ce57a6d0aecec2331a249d66f52
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 16:11:27 2012 +0200

    paginations working with offset and limits

commit 00db178404147a8b3c28c0ccf23030a57c39a540
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 15:47:46 2012 +0200

    fixing a test

commit dabc997386d7f833d48ebb92a5b6f88c03e72d3c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 15:47:46 2012 +0200

    fixing a test

commit 6269b24d9e0d920312cf0d22a4e396a4bee06ebe
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 15:38:28 2012 +0200

    lazy loading for group_management & user_management

commit 0e738b3f34ff4c83e130fa042afedd0b0b887d06
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 15:38:28 2012 +0200

    lazy loading for group_management & user_management

commit 2a3d5fd4bb7cee8a1a8c17e1d15aec43ab141c10
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 11:34:45 2012 +0200

    "prepared statement" for dql requests

commit 0a1fb2d6e28fb260a9d756c907d7e573d9b4cdb1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 11:34:45 2012 +0200

    "prepared statement" for dql requests

commit 42062c67e5022b55551416b7fd293d98cd2cd9c4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 11:01:14 2012 +0200

    slight optimisations for create users & groups command and the workspace creator

commit 52bb245c5022bcc4397c505c3e16395de7b41212
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 11:01:14 2012 +0200

    slight optimisations for create users & groups command and the workspace creator

commit 000c28cc8a5bc616e2a63fc457d128c0fe4e4c05
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 10:39:49 2012 +0200

    more restfull routes for administrationcontroller

commit a5aeee61f1a30fcc08bedc2000ceeb47e67144e9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 10:39:49 2012 +0200

    more restfull routes for administrationcontroller

commit 2d57f2702079506cbe675d1657743ab97db1174e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 10:16:44 2012 +0200

    lazy loading and ajax suppression for resource & groups lists in the administration

commit 11d1735f426a39421b161796a9a5cb19bd9560a7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 13 10:16:44 2012 +0200

    lazy loading and ajax suppression for resource & groups lists in the administration

commit de38bb9ed30a015c43e6eea896d3bf0f790a1764
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 12 16:02:37 2012 +0200

    replacing javascript scrollTo by jquery animate

commit c60ecff163364aa36254db2baf76ac2e1e0e415f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 12 16:02:37 2012 +0200

    replacing javascript scrollTo by jquery animate

commit 495a9d979edf9ff0493afa0edb38ea30a0eecfe6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 12 14:37:20 2012 +0200

    infinite scrollbar for resource list and workspaces tools (draft)

commit f2d263804dca8851251ada0b55b263d61c35ae19
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 12 14:37:20 2012 +0200

    infinite scrollbar for resource list and workspaces tools (draft)

commit f25b4dab9dda2ab2e8d8622729c1978ab43435ad
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 11 16:19:51 2012 +0200

    selecting workspace's tool tab

commit 95aa600cc01c5b453c8099ccb66652d9503f633c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 11 16:19:51 2012 +0200

    selecting workspace's tool tab

commit c7787421473a4544e45b9eeb327ccc54d20f0611
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 11 13:52:25 2012 +0200

    updating front-end-bundle with infinity.js

commit 443f19caeee40fb3408986de9636ee58a9299e53
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 11 13:32:59 2012 +0200

    workspace controller refactoring

commit d5464983c1c09c65387ed8f15c0e1f0cbb143e56
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 11 13:32:59 2012 +0200

    workspace controller refactoring

commit 8fc8c7d917e3f6e9e20d619a38d782c4047a9c0a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 10 12:50:28 2012 +0200

    testUserCanRemoveDirectoryAndItsContent

commit 466833d3030506d2810e17459ea4e6cdf1020520
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 10 12:50:28 2012 +0200

    testUserCanRemoveDirectoryAndItsContent

commit 4d866f77c29242570d1e407bea4a8bdd1ca3f873
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 10 11:39:05 2012 +0200

    removing arrayToJson method (replaced by json_encode)

commit c12a742fd6aa39265872c8411920cf4d6a58aa06
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 10 11:39:05 2012 +0200

    removing arrayToJson method (replaced by json_encode)

commit 57b949d7b5f4646d055fd9b2795d33617c537611
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 10 11:38:56 2012 +0200

    list of groups displayed in a tab

commit 25820fa3b06715054e12957d5574c61e9284eeba
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 10 11:38:56 2012 +0200

    list of groups displayed in a tab

commit f90713250cf230bf80bf2925b20720b637be0f3b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 10 09:45:08 2012 +0200

    form validation errors tests for the AdministrationController

commit 0da6e3a4801b2dc881f0888a3b045834848f7676
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 10 09:45:08 2012 +0200

    form validation errors tests for the AdministrationController

commit bc24baa5e146e64af11a53cf62ba21de0bed5773
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 10 09:14:37 2012 +0200

    removing a useless return

commit eef011a908ecbf6d0e3eb6f54cf2fa477521344c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 10 09:14:37 2012 +0200

    removing a useless return

commit 1642835aa617075e074ec817c33b1149d8fc001e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 15:31:36 2012 +0200

    updating testFilters

commit 529289c3755ab900a7f16f4818aa455b3c8421d1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 15:31:36 2012 +0200

    updating testFilters

commit 206741723e31035403d174cb8cb77939d00360b1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 15:27:23 2012 +0200

    filter by mime types

commit 17674ad4aecba684dd07c4e3f06dab55f5a4ab63
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 15:27:23 2012 +0200

    filter by mime types

commit 2021ac23e41daaca5cd69b6230a902cd920cdac5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 15:05:18 2012 +0200

    refactoring the resource searcher

commit c09fdb7ad372b2cc9b0b17b7050c712e2e3d907c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 15:05:18 2012 +0200

    refactoring the resource searcher

commit c54c99354555e6ab5bde68e05b8a5f8b82b4aaa5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 14:19:57 2012 +0200

    Adding 's' to a parameter

commit e6a8ce63d3298310f0de107fc222ffb10732fe0f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 14:19:57 2012 +0200

    Adding 's' to a parameter

commit 29c8ca2be88390103139044f7256cd8a303e5003
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 14:19:14 2012 +0200

    checkstyle

commit c04205d355bd8df12c39d47778351cac2500a28c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 14:19:14 2012 +0200

    checkstyle

commit 6edbd4adb6dc85c14a13efd36a2e894564fb6011
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 14:17:12 2012 +0200

    Refactoring filter method (way shorter)

commit 47a67b54d143747f01d03e6703681f594673fce8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 14:17:12 2012 +0200

    Refactoring filter method (way shorter)

commit 512d2b5683461befd31ccbc2bf0f38dc285d8f3f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 13:32:40 2012 +0200

    mime types are rendered in the filter

commit d4aa39e0f803b02c031e87f3e87ae52c79f5647e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 13:32:40 2012 +0200

    mime types are rendered in the filter

commit b1531787e9d6bd576c6d97ee06db2badf06df3b3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 11:34:44 2012 +0200

    testRendersFilter

commit 200bca486618fdf353a82360134da305431094aa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 11:34:44 2012 +0200

    testRendersFilter

commit 6a626d84aab4e1c956e4d5d9d3de2d896af3687f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 11:25:37 2012 +0200

    resource filter by name and getParents tests

commit db73bd2f85406c706eb9e7e170f3fe5d2cf17d98
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 11:25:37 2012 +0200

    resource filter by name and getParents tests

commit 0fc9359d2228357360241cdcf2d3d98079cff42a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 11:14:10 2012 +0200

    Removung unused methods

commit 59536bad1d1b203649b68d883105cd8a9990bef6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 11:14:10 2012 +0200

    Removung unused methods

commit e595a131e7020ab3610c2c72cb89566ab2289742
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 10:59:40 2012 +0200

    Making phpmd happy

commit 9a80b665ceb21c26f0cef377955ad97764bab46d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 10:59:40 2012 +0200

    Making phpmd happy

commit 9cd7fdde1fce27fc8a2f61fb445593b92fc30d83
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 10:59:26 2012 +0200

    Removing unused methods

commit a5ccf015286aeb289f5618e2d8dc4771b7de85a0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 10:59:26 2012 +0200

    Removing unused methods

commit b62da433fa6ed435877e258358f61e586e75554e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 10:30:43 2012 +0200

    Fixing the broken test and remocing an "echo"

commit 0fc3e38fc0fc30c3f59ffba38574ddcf153b5d00
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 10:30:43 2012 +0200

    Fixing the broken test and remocing an "echo"

commit 277fc2ed5ee1cfb8dd0c208cac74d3b2b317b462
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 10:25:33 2012 +0200

    Groups can be added to workspace with ajax

commit f59537d40748db85db49d74f55298c3edb0704d7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Sep 7 10:25:33 2012 +0200

    Groups can be added to workspace with ajax

commit 1ece1675892a28df942f496f570df48195b3ab0e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 6 16:45:51 2012 +0200

    testMultiAddUser

commit af6544a2fe892dd2f3b5341630737d0d606f2b56
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 6 16:45:51 2012 +0200

    testMultiAddUser

commit e16dfb0a059ece1ef020a6495bf7650c1b599a41
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 6 16:24:44 2012 +0200

    multiAddUserAction function (WorkspaceController)

commit c2dce67fb50cce9a0ca3a21ee06f86bcfa8c4ca1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 6 16:24:44 2012 +0200

    multiAddUserAction function (WorkspaceController)

commit 98c2ec189e137c3cbf563a4575b269813d2c8998
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 6 15:34:09 2012 +0200

    Users are removed from workspaces with ajax

commit 9173b352cf4987eccf5dae4c76d23fcc2f336c99
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 6 15:34:09 2012 +0200

    Users are removed from workspaces with ajax

commit 91fff498487dbdbb2a0005f6470144d981a2ac7b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 6 15:17:55 2012 +0200

    ajax groups/users suppression

commit f79db390f00d8356491f12d681c96436c9cb90ad
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 6 15:17:55 2012 +0200

    ajax groups/users suppression

commit 69ce10a979a79d8b01ac2ede6d576c35dcae8c30
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 6 15:01:36 2012 +0200

    AdministrationControllerTest refactoring

commit 0e06fd331df84247a2f1ef2b223c3fe6df114c6d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 6 15:01:36 2012 +0200

    AdministrationControllerTest refactoring

commit 03a14c6bd56dc6bcbd4de628aab435d98696871a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 6 14:38:07 2012 +0200

    pager for the group list

commit 4e9bc4a4fa3e16e96479d38b1f5a28bde02030e6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 6 14:38:07 2012 +0200

    pager for the group list

commit 67e0dc69358dc8a3c1174aaac2f611feb7c28cf5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 6 13:44:10 2012 +0200

    responsive pager

commit 4c7dd1de70cd8ce8a7d9c7b3bfb4fd0db6939dfa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Sep 6 13:44:10 2012 +0200

    responsive pager

commit 5ced954d5c58713a90981e7ca3e2105a237e2da2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 17:11:48 2012 +0200

    removing pager when going back to the resource standard view

commit a0a89d2bab88abac5dac944bcb0e77eb78f46c13
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 17:11:48 2012 +0200

    removing pager when going back to the resource standard view

commit f0ffeac5aebb667e6a7efa953c154efb1a9a8bec
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 16:57:35 2012 +0200

    moving renderPager to ClaroUtils

commit 4ec0dd94d9522562ad04a22efa716addf8d7575f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 16:57:35 2012 +0200

    moving renderPager to ClaroUtils

commit a96dbb583af45e1ab3324d82f3f2be8df801c752
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 16:17:16 2012 +0200

    fixing tests

commit e0367615d53c331daf50317ad3a1015bec516184
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 16:17:16 2012 +0200

    fixing tests

commit 8aacfb6a7a8665c336fa58c75b5f6b8df5a8ef82
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 15:37:16 2012 +0200

    checkstyle

commit 172c77ca5e40e7da608aede06247ce3f20614632
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 15:37:16 2012 +0200

    checkstyle

commit 3bfb0780e041d0ccbb5cdb993fc8787180564572
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 15:34:23 2012 +0200

    basic pagination for the user list

commit 906feb5b03ff7dc2cfc0f3be1caaa1e127227794
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 15:34:23 2012 +0200

    basic pagination for the user list

commit 34c5e2541d8ffbb22bfa7bf6d9b7079a7ad86c12
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 13:46:57 2012 +0200

    "readable" names for the command line generated resources

commit 270288b6c66079f61bc3ac3e5ee569bed6473eaf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 13:46:57 2012 +0200

    "readable" names for the command line generated resources

commit b29b226ca34392fa2745451bdc085ec545d23635
Merge: b0fa654 e221286
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 11:53:28 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e08e2471b7b22dc7212f582708e2eb68c7f1b5a1
Merge: f917894 925bbb3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 11:53:28 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b0fa6540083c9b583a1603109bf96a87148f1559
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 11:52:17 2012 +0200

    Fixing the users registration to workspace with js

commit f917894ceeb0ff210eb1f024188b4c3f399f340b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 11:52:17 2012 +0200

    Fixing the users registration to workspace with js

commit c180ef5f3e37f21353eff8020c3366aa92cdc91c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 11:51:01 2012 +0200

    making phpcpd happy

commit 5c141454ebbf509f3becfc0b200528a93301ec2d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 11:51:01 2012 +0200

    making phpcpd happy

commit c7094247d8f5d1af20e7539d00d60fd5c9279ad7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 11:46:00 2012 +0200

    random group creation command

commit 44b9b3945307e014b4ab9f71cbfd1b778ca1dd33
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 11:46:00 2012 +0200

    random group creation command

commit e4c8dfc5ac23f752601c484a387c03b307ce6cf9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 10:34:03 2012 +0200

    realistic names instead of guid

commit 5074594e6e64aaef472fbdbb51192d4d497e1726
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 10:34:03 2012 +0200

    realistic names instead of guid

commit 74e797253934d70d43e9a568fab49b1f095f0efe
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 10:09:57 2012 +0200

    claroline:users:create command added

commit e66a8942f9b72cd034ebe4eec1e724aad8a53612
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 10:09:57 2012 +0200

    claroline:users:create command added

commit 44f6b97b644b3f70b712eceaf174163016eedaae
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 09:10:05 2012 +0200

    search by name for resources

commit 5420f2aa9d7fc98f01522dd1312196e0e277a3ab
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Sep 5 09:10:05 2012 +0200

    search by name for resources

commit c35192ced7221922dc2c80b42ba3a21038d3df36
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Sep 4 17:13:03 2012 +0200

    Fixed logo link

commit d9f5b4f5b3c58fe4064af6524fe3b2b251fbca2a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Sep 4 17:13:03 2012 +0200

    Fixed logo link

commit 0ff01a15a79db7770ea5ff33610557afeeabdf1d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Sep 4 17:10:55 2012 +0200

    Prevent fatal errors on dev install if a directory is not present

commit 1cc4f18d5a7fcf912b14ca4171ba4427057da9fc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 4 13:17:48 2012 +0200

    fixing breadcrum link

commit 931a993f19349b0f633d1851462543ba1e66bdb7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 4 13:17:48 2012 +0200

    fixing breadcrum link

commit e2212865fe8f4714aaed82f53a2ff96bc2947ad7
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 4 11:43:06 2012 +0200

    New icon for contextual menu

commit 925bbb386fc81da975786ead8691eb0f3eade6c5
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 4 11:43:06 2012 +0200

    New icon for contextual menu

commit d48e691966f392a847c1cba1dc5a933488d67b4d
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 4 11:31:49 2012 +0200

    Fixed some details

commit d0c499b0af59d48654212d9608a189f37510966a
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 4 11:31:49 2012 +0200

    Fixed some details

commit 26d2d00e18e4b7446f623a1df2c16f20b4a28ad3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 4 11:25:43 2012 +0200

    Adding pathname to the filter results

commit 0c932aa8e1186608a46b4e0d97f83a5e089d91fd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 4 11:25:43 2012 +0200

    Adding pathname to the filter results

commit 0ca6fac2dc0a828a42bec6a6793f27d0e8d45c79
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 4 11:18:12 2012 +0200

    Moved inline styles to layout.less

commit be198455511fda01da417637fe3609bae85bd356
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 4 11:18:12 2012 +0200

    Moved inline styles to layout.less

commit 41021a4ff4be4edfc70aa7b2acd22e7026e6d6c6
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 4 11:17:48 2012 +0200

    Now give WebRoot to the list template

commit e69c1cb435ad64b71fcb492f712e3da77283d7b9
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 4 11:17:48 2012 +0200

    Now give WebRoot to the list template

commit 9b1ff9e00bbad3d6d1ac4f762c6f809fa213fce1
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 4 11:16:23 2012 +0200

    Added styles for ressources managers

commit 4d3a2a4187e49374c02eb1d41b4535b80f33089e
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Sep 4 11:16:23 2012 +0200

    Added styles for ressources managers

commit aa513c8c94a5436106f1a762425a4fbc5f8d3b4a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 4 10:13:48 2012 +0200

    removing unused method

commit 4bfdefa2354a279dc305f46414600bfa086c595e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 4 10:13:48 2012 +0200

    removing unused method

commit d06e1a0bb454a33d34886446124bfa292bc4ea0d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 4 10:12:22 2012 +0200

    date filters tested

commit 8b930849c564eafba6ba1b44d59a0d046f59195d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 4 10:12:22 2012 +0200

    date filters tested

commit e8b44bf7cebae3d8d6a97bdad754d0680b30644e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 4 09:24:52 2012 +0200

    Bringing back the default values for the datepicker

commit d829fb0b7d7a2260123f047a559a76813c5e7e12
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 4 09:24:52 2012 +0200

    Bringing back the default values for the datepicker

commit 299aed2686efb40047db6e78575e02d69ea38b2a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 4 09:14:43 2012 +0200

    fixing bindFilter method

commit f814ed6534d9eb4747bc38faf296afb879ab7ce7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 4 09:14:43 2012 +0200

    fixing bindFilter method

commit b358d0417ff7f9a0a0e370fa242be327726f5ad8
Merge: 949ee83 dd51b59
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 4 08:51:14 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b8840252db14f6d363341d97be6f3610ba91d6d1
Merge: 1bf349a 10a71f2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Sep 4 08:51:14 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit dd51b5964ce9660b3528fd0ec093180c772b45ce
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 17:48:51 2012 +0200

    Replaced > by / as path separator

commit 10a71f291adbdfd54addb1afd2df0495d7408ec2
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 17:48:51 2012 +0200

    Replaced > by / as path separator

commit 67aa09ef0ecd9274b8290b85972f3d5692b43af9
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 17:48:16 2012 +0200

    div organisation

commit bb03ad92a334c7c9d31d3ee6a2f72814e83399ef
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 17:48:16 2012 +0200

    div organisation

commit 2a8a816421bf42a835675a0bc0a76add52354a37
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 17:47:27 2012 +0200

    removed alert

commit dfcfd46857bca084b2b9f438cbcc64ed64237ddf
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 17:47:27 2012 +0200

    removed alert

commit 11bea20b33fc89dd2f2e5e7484f21c0e47a71c86
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 17:47:04 2012 +0200

    Replaced "crums" by breadcrumb

commit 80f5d332d9e15df2ec779cf47294c39f3cf41683
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 17:47:04 2012 +0200

    Replaced "crums" by breadcrumb

commit 949ee835bc3d7f24cc5a5952964d2d8f54ddf3d6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 17:20:02 2012 +0200

    update js resource manager readme

commit 1bf349ac0d01f39ab4e7384f08ef11b666af75fb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 17:20:02 2012 +0200

    update js resource manager readme

commit 4983679138f2eec325f3484dc470a1d6956e4106
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 17:13:33 2012 +0200

    Fixed conflicts

commit de67e4053222217661886563ef15686fa2b3a875
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 17:13:33 2012 +0200

    Fixed conflicts

commit 6b06b80e1be11036499217b88662261b45201938
Merge: 6000542 e0c7903
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 17:06:31 2012 +0200

    Fixed conflicts

commit 96bd1a9123f50f61082ec704693df5c5e94a88d4
Merge: 933f487 bfea37d
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 17:06:31 2012 +0200

    Fixed conflicts

commit 6000542ceba174fdcd2df3a163482da7a11c0f75
Merge: 04e2b0d 4e80593
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 17:01:16 2012 +0200

    Fixed conflicts

commit 933f487a8e2abc5dc24c7c88e99d0a576c5c075b
Merge: b8845df 362a8c8
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 17:01:16 2012 +0200

    Fixed conflicts

commit e0c7903feabeb72d0b6b2baf34379f39add867c2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 16:55:38 2012 +0200

    removing prefixes from resource manager

commit bfea37d1535f5c787369c7364d746499ca0894db
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 16:55:38 2012 +0200

    removing prefixes from resource manager

commit 04e2b0d092d2d0db74f2551d77092e5cb8285896
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 16:52:33 2012 +0200

    Extended doc and replaced breadcrum with breadcrumb

commit b8845df5a8cea9e36fec28536f2620827fab06aa
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 16:52:33 2012 +0200

    Extended doc and replaced breadcrum with breadcrumb

commit 544e1be5ea4c5b7d4175cb11c46512c9212df0cd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 16:35:13 2012 +0200

    fixing testMenusAction assertion

commit 2c3b6eb83243debcfb114be7a1baa4359d9c0731
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 16:35:13 2012 +0200

    fixing testMenusAction assertion

commit 4e80593777cf7815d1af26119b301135c48591a6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 16:06:27 2012 +0200

    fixing resizeBreadCrumb method + readme

commit 362a8c84c56774de6d84019e2779d45e8c61c6c5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 16:06:27 2012 +0200

    fixing resizeBreadCrumb method + readme

commit 795591ca281241dd2bbc65cbd714cc72393435b7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 16:03:28 2012 +0200

    removing prefixes from classes from the resource manager

commit 3dea24ce6a612a0e850a9149c61335417f801e74
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 16:03:28 2012 +0200

    removing prefixes from classes from the resource manager

commit 70f7bbcc56c840b318b9e7a72b829883563d33d2
Merge: c4f3b95 9a3d929
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 15:37:57 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/less/themes/bootstrap-default/theme.less

commit b9223440dc8733eb8cd6d5d1f11d4241e0250739
Merge: aab9425 7b75f2e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 15:37:57 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/less/themes/bootstrap-default/theme.less

commit c4f3b95d091b94aec64513e545e1b596b133d9b2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 15:36:22 2012 +0200

    replacing contextual menus with boostrap dropdown

commit aab942503ac7d8047583972ad750db1384f42a7d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 15:36:22 2012 +0200

    replacing contextual menus with boostrap dropdown

commit 9a3d92975faf4bb9b80e796e81353b915cb498f0
Merge: 8a27852 7ea4d00
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 3 15:34:43 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/less/themes/bootswatch-cyborg/theme.less

commit 7b75f2ecbb1562b3d6ba9e7b36b406ee2bde8a7f
Merge: 1cd3295 671dd17
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 3 15:34:43 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/less/themes/bootswatch-cyborg/theme.less

commit 8a27852e52b7faa9a10fefe7baea4c99fe79252a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 3 15:30:36 2012 +0200

    Replaced glyphicons by font-awesome + layout changes

commit 1cd3295016629389e421f2ddaa218a7a351f7776
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 3 15:30:36 2012 +0200

    Replaced glyphicons by font-awesome + layout changes

commit 51a6c2dcb63accd3d1787cf4b3113b2e78393f99
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 13:03:19 2012 +0200

    contextual menus destroyed on reloading

commit e378ca2be75d1ad234df67962e0503c15784ec31
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 13:03:19 2012 +0200

    contextual menus destroyed on reloading

commit 1804b87484985038ea7215436b873ae1f8c81b0d
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 11:47:41 2012 +0200

    More "official" colors for widgets

commit 1c4ace0398b345ed9f55c86b1ebc58120b8d499f
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 11:47:41 2012 +0200

    More "official" colors for widgets

commit e2a15f33e3ca8a9c94fdbf2b85945a71ec5daca4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 11:37:44 2012 +0200

    resource manager close button functionnal

commit b30a259abf52a654b38c4e44e24b325902dc118c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 11:37:44 2012 +0200

    resource manager close button functionnal

commit 7ea4d00d4ac9ac5cb240115b8721fab1f44bd8cd
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 11:26:45 2012 +0200

    Set white icons for widgets as the theme use a dark background

commit 671dd17053ef35b8cc27c11cfc4dc05ec5632da2
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Mon Sep 3 11:26:45 2012 +0200

    Set white icons for widgets as the theme use a dark background

commit 90ac65c4a96c2ddcacc05ae0da9b3907276da09b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 10:57:08 2012 +0200

    if there is no title, the error is displayed

commit a8a1ed2d970900583688837f52eb7ac36f645428
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 10:57:08 2012 +0200

    if there is no title, the error is displayed

commit 62e9edbf4c458dab0d47010c9fcb83794766540d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 10:53:39 2012 +0200

    sets a title to a move exception

commit 6b36bf8997c2397b154c4ef03902efff380009cb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 10:53:39 2012 +0200

    sets a title to a move exception

commit c40cb472038799b7f65e4a70c29f178d8b37dd4c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 10:45:30 2012 +0200

    title of ajax errors displayed in a modal box

commit ef9c55d238871442a32a664d57f3a25af48e0128
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 10:45:30 2012 +0200

    title of ajax errors displayed in a modal box

commit e6a0746f08d7c916941d5158f710fedba17441ca
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 10:11:04 2012 +0200

    Adds a test

commit bf944a6bb0c3edbcd7cd885f4ed8a8fbc2e43aa0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 10:11:04 2012 +0200

    Adds a test

commit 9526779bc98838c55ac71f9a6dc140815ec89f0b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 09:41:49 2012 +0200

    root's resources can't be removed

commit 9ce62cd017a0f7d6ef469ee7f77209049aecea6d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 09:41:49 2012 +0200

    root's resources can't be removed

commit c4bf6908efb07b6a00082f568928ad15eb1ce11b
Merge: a3f2187 bf24690
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 09:15:34 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e9e85f0146b1a4914af55997df50c7603ff184a3
Merge: c9cf00c 674670e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 09:15:34 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a3f2187a31544e402c71424d48f961530f962da3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 09:15:01 2012 +0200

    refactoring custom actions declaration + tests

commit c9cf00c8895fe415a909837fc58ee5205daaed09
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Sep 3 09:15:01 2012 +0200

    refactoring custom actions declaration + tests

commit bf24690b398ed467a09424e8c4b857cc7d42ff43
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 21:41:30 2012 +0200

    Claroline logo in small size

commit 674670ebbd2eaedd99f42edee91f0a43deaf5042
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 21:41:30 2012 +0200

    Claroline logo in small size

commit 5e90db9853e8c33c87eb1878a4bb5c3ec0c027d3
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 21:41:07 2012 +0200

    Adapted widget for other themes

commit eff1f6c97699315b79ae42ab573ea60eb6248875
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 21:41:07 2012 +0200

    Adapted widget for other themes

commit 7386fb3d73468797f1b61e81cbf5e36885ddb54b
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 19:46:31 2012 +0200

    Fixed broken display of widgets in IE8

commit 360cc2bfdf41d6f248e7d2e588a4cb590032a11f
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 19:46:31 2012 +0200

    Fixed broken display of widgets in IE8

commit 1706a298b4ca484a30d920ef3bc61a72f306bbf8
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 15:27:33 2012 +0200

    Set background gray from Claroline logo.

commit 7391415261aefd929ff9151161e9fe69a036cdbb
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 15:27:33 2012 +0200

    Set background gray from Claroline logo.

commit 705bc456dddea9c1f541871379aaae3ba003533c
Merge: 7f64054 4194d6a
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Fri Aug 31 15:12:19 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit f2c04d33a962ce643fdd59e3addc40d5ad694ef2
Merge: 0540a0a 91ef3a1
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Fri Aug 31 15:12:19 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 7f64054b77fcb081eeae22bde4fc4dc611198f44
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 15:11:35 2012 +0200

    Moved icons in theme directory

commit 0540a0af04be1babbfbedd8c8a25667e11ec7115
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 15:11:35 2012 +0200

    Moved icons in theme directory

commit e5898cddbd231dfde2ff69b979e426a3b9b0575d
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 15:10:17 2012 +0200

    Changed comment format at top to allow EDI applying auto-complete on CSS items.

commit 5c173029e7ac6abda07b32afc2b5fa0d03eda9e5
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 15:10:17 2012 +0200

    Changed comment format at top to allow EDI applying auto-complete on CSS items.

commit f344e7b8e4fd33e79edcc8ffa79da6a277617d38
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 15:08:48 2012 +0200

    Added Claroline logos and icons

commit 34138989b1970d7d88bde875c44ceb2371bef9b5
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 15:08:48 2012 +0200

    Added Claroline logos and icons

commit acc0a97ba4739b89daa5d40dbc03402fc12b028a
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 15:06:01 2012 +0200

    Added icon on top

commit 8fcedf6ac8bc7ac79dda88bc1438c6c97efadef1
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 15:06:01 2012 +0200

    Added icon on top

commit af5ca9c62964557f21340d670005d0f57e0de051
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 15:05:42 2012 +0200

    Added icon for iphone/pad and android

commit 17039d9b718b49bef7386fbaf85d80daf6a6c535
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 15:05:42 2012 +0200

    Added icon for iphone/pad and android

commit ae3f7663df1a66355cc11061466aa905c8f90327
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 15:05:06 2012 +0200

    Css fix for widgets

commit 271324e9c7ca03f1cc1923519ed654bf424b15aa
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 31 15:05:06 2012 +0200

    Css fix for widgets

commit 8baf18fd48f4e7e9da88ecc89f60b7694ceddd16
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 14:34:02 2012 +0200

    changing the forum icon

commit 91ef3a1386f9e303d2350b7041de838979f61b26
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 14:26:38 2012 +0200

    cleaning forum bundle (draft)

commit 4194d6a457e29965856c6cca052e930c45f1db07
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 13:35:04 2012 +0200

    reducing resourcechecker cylomatic complexity

commit 14c1803946f131afbce76cae670d42bd93a3e22d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 13:35:04 2012 +0200

    reducing resourcechecker cylomatic complexity

commit da3dcc9c50cd9711c21cded4eb7156157cc5b703
Merge: 1040f7b 4b37e7b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 13:16:49 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e3567f4cd458dc916fa71e190c928ef6fdbe88a7
Merge: 64a55a7 eb0af85
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 13:16:49 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1040f7bb48baa05eb047b9be6a80b46d1dff5194
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 13:15:03 2012 +0200

    Reducing databaseWriter cyclomatic complexity

commit 64a55a73a456daa7a41d9de1bca418328e215aa6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 13:15:03 2012 +0200

    Reducing databaseWriter cyclomatic complexity

commit c2912951d12cc3ba78d26682b30128042705fa0c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 13:14:38 2012 +0200

    DatabasewriterTests for custom actions and icons

commit 53729f7afb9f48822b3088402b3b4ea4a6f0a300
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 13:14:38 2012 +0200

    DatabasewriterTests for custom actions and icons

commit 4b37e7bfd6e4fbbd1875b3dea62a15b555a6cec1
Merge: be88286 fa64085
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Aug 31 11:33:20 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit eb0af85cd33471189220edc145bb3653d5f76f24
Merge: f2a027f 70f4c1a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Aug 31 11:33:20 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit be882866a750600148fa6eab201348b65e37803d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Aug 31 11:32:07 2012 +0200

    Delete generated twigjs templates before dumping

commit f2a027fd70a4c4b0ca90ae3531adf2e479e552c2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Aug 31 11:32:07 2012 +0200

    Delete generated twigjs templates before dumping

commit fa6408593a2b73cad83a195f2abbef16254395a5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 11:14:18 2012 +0200

    fixing text tests and renaming moving twigjs templates

commit 70f4c1a0e9c617e41b92e9330528e81230477368
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 11:14:18 2012 +0200

    fixing text tests and renaming moving twigjs templates

commit 2885cc56076a39c450a161cef307da8b00a9a91f
Merge: 3efde42 504eade
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Aug 31 10:13:17 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Dashboard/resources.html.twig

commit 371bd514a6bf7f5e4358ef007970a4787fed40d0
Merge: c3f22a2 b3540b4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Aug 31 10:13:17 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Dashboard/resources.html.twig

commit 3efde425b4c679bc474351c1b52816e5590e9846
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Aug 31 08:44:07 2012 +0200

    Added a watchr script for twigjs/less assets refreshing

commit c3f22a2225324ed926d7afeec5292fdd2d3f0f8a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Aug 31 08:44:07 2012 +0200

    Added a watchr script for twigjs/less assets refreshing

commit 504eadedae36fe36d85423a205e32c5ee2c23c6c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 10:03:35 2012 +0200

    fixing wrong layout for the text resource

commit b3540b4e22fe12fa75044db781d8873fb9be9497
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 10:03:35 2012 +0200

    fixing wrong layout for the text resource

commit 752531935862dcccae89a981746eaa423a93d133
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 09:51:01 2012 +0200

    changing data-resource-id attribute to data-resource_id

commit eeb120311bda68046a9a723b5cbae075bb34d149
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 09:51:01 2012 +0200

    changing data-resource-id attribute to data-resource_id

commit 4603f68af4b9871d2c04e761435455932de768b0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 09:27:02 2012 +0200

    delete/download button disabled if no resources are selected

commit 2d2f4a0e3bf2ba4ab77b64d08c652e80d1f0befb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 31 09:27:02 2012 +0200

    delete/download button disabled if no resources are selected

commit 4bb900a3c0b2ed9c179c5180f342b0136a7f28b8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 17:37:34 2012 +0200

    Sets the correct value for the assertions for the testGetEveryInstancesIdsFromTheClassicMultiExportArray

commit c3823f964242444c15f56ddd0327077795cd3876
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 17:37:34 2012 +0200

    Sets the correct value for the assertions for the testGetEveryInstancesIdsFromTheClassicMultiExportArray

commit 620d44b686edfba2a245c7e2f5631b952e3fd7c0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 17:33:10 2012 +0200

    checkstyle

commit a54f50e30a2406c959b729a1c9230a1a7fce492b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 17:33:10 2012 +0200

    checkstyle

commit 9832101bbf2dbec5a5f5c9928ccfe47e871a4797
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 17:26:51 2012 +0200

    multiexport throws an exception if it has no parameters

commit a7bb2d06976a3b60f3ddb4cac5072c93e89cac24
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 17:26:51 2012 +0200

    multiexport throws an exception if it has no parameters

commit 78bae35c00f3e708313221651f4e294e52875f31
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 17:17:12 2012 +0200

    fixing the empty directory export bug

commit 5371546ba7b17d9de02de9ca3d67e9c4f1e3701f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 17:17:12 2012 +0200

    fixing the empty directory export bug

commit 57444174e8d1a9f5ac2ec235da943d224b9c5f9e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 30 17:03:06 2012 +0200

    Slight theme modifications

commit 13654da40651a15f6309c553f08bd2c97038896a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 30 17:03:06 2012 +0200

    Slight theme modifications

commit fb37a6809416a9299956d2456f52286bd4c4b672
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 30 17:01:15 2012 +0200

    Disabled assetic controller in dev env (TwigJs trans filter working)

commit 5795b0f87934ba117da48b857d82df1889039350
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 30 17:01:15 2012 +0200

    Disabled assetic controller in dev env (TwigJs trans filter working)

commit 742fcea9b858e5a31008ce3d625959c1c1c693eb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 16:29:22 2012 +0200

    unique identifier not needed anymore for resource-links and resource-menus

commit 3bc99dfed474c01f53cbede870c832742e425007
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 16:29:22 2012 +0200

    unique identifier not needed anymore for resource-links and resource-menus

commit 1d4b7bf1a06b4694a54f379ebe543a37ca4bf9b0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 16:23:57 2012 +0200

    resource_list.html.twig for filters (draft)

commit 2a7eb7fe4f273e438658d34c682fda78cdc3f3b5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 16:23:57 2012 +0200

    resource_list.html.twig for filters (draft)

commit 9458ed591e2aa9c2de8f183be209e7da282290b5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 16:01:16 2012 +0200

    twig resource template doc for thumbnails

commit 9d7c5977ea27d8a597bb6db7a068c11ef22c5398
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 16:01:16 2012 +0200

    twig resource template doc for thumbnails

commit 78f98e3bc5d5901d8e4c9d744338d84eba2d65e6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 15:59:13 2012 +0200

    rename the resource parameter for the resource twig template

commit 459ffb4b3357877d198fd38b2b0628ef15c8370d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 15:59:13 2012 +0200

    rename the resource parameter for the resource twig template

commit 3f9390b1b02829f494956db25421b20437d20f49
Merge: 71d9a1c a15224e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 15:48:20 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 7511f97e8d4e98e91d68143ce0417fcffb1e4649
Merge: 212e6f5 bc24342
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 15:48:20 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 71d9a1cdc7a9270b685a98e2299342a6ef5959c7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 15:47:19 2012 +0200

    pass the prefix for rendering the flat view (corretcting the chkbox bug)

commit 212e6f55786646a5ca3a3867031fc961b5bc877f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 15:47:19 2012 +0200

    pass the prefix for rendering the flat view (corretcting the chkbox bug)

commit 65636d8f8334da1b34a2b61b7e4ddd02ddbfc1fd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 15:39:55 2012 +0200

    refactor resource template name + some doc for templates

commit 93206d8c58279ea3a139d5e7edf6831e7e30172b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 15:39:55 2012 +0200

    refactor resource template name + some doc for templates

commit a44b768eb9e0e2fa0480e4cdfadeb0b9f09f444c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 14:23:39 2012 +0200

    js resource manager renders works with json instead of html

commit f7bbaf5478723692a12b0897796030c532ae582b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 14:23:39 2012 +0200

    js resource manager renders works with json instead of html

commit a15224e934cdf3dc0e6bec796a973f6c42fd47a8
Merge: 1bc4a9e 0d76a17
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Thu Aug 30 11:36:44 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit bc243421cacde248ea578fc523666f0b765c763e
Merge: a8c2f23 620134b
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Thu Aug 30 11:36:44 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 1bc4a9e7c3cdbc175d65a64891165db8a5712ff7
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 30 11:36:32 2012 +0200

    Favicon with new Claroline logo

commit a8c2f239ff3f11a765ba27070c7971c4e0844008
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 30 11:36:32 2012 +0200

    Favicon with new Claroline logo

commit 6c690a367a952cf2332a5bf0aeb5defa91fcad47
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 10:52:50 2012 +0200

    cleaning the array results from ResourceInstanceRepository and refactoring arrayToJson method

commit 84d1b0c112c8859db26e8aff5aeb97a4612e67f0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 10:52:50 2012 +0200

    cleaning the array results from ResourceInstanceRepository and refactoring arrayToJson method

commit dc690644d6fa1bc806404dc6309b6bebd5ef07a6
Merge: da4b38d 0d76a17
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 09:10:23 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit e3767098f544b1b4be65a7cc89f3364517b87914
Merge: c9621fc 620134b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 30 09:10:23 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0d76a1751b20bc80ca87aea79b2ce203640e08b7
Merge: da88896 7475ddc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 29 17:53:57 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 620134b93bafcecc5ed0ddd907b92722dbe34df4
Merge: 6f8ed64 fa4540f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 29 17:53:57 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit da88896c97d6bcb6b1ae527fb08668cc78a7bc6c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 29 17:53:11 2012 +0200

    Added placeholder in for css themes

commit 6f8ed643da34ef2fd9afbbb6dd83491db3ab255d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 29 17:53:11 2012 +0200

    Added placeholder in for css themes

commit 7475ddcf25d18991d56758fe7fc217694a06bb8f
Merge: dcfb8b6 beb8453
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 17:43:34 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit fa4540fa085ab3e49f8975a4c01b33bd75e62fdc
Merge: fbc8a93 539b812
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 17:43:34 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit dcfb8b60ae58fc571c29b26e7074f117f4b4acb0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 17:42:37 2012 +0200

    changing dataset into getAttribute to make IE happy

commit fbc8a93cc27b410a09209ef8a75102b7fa96029e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 17:42:37 2012 +0200

    changing dataset into getAttribute to make IE happy

commit beb8453d929d8a867f2f23f7cd82b6e7b8b71cb9
Merge: 8bac709 5c71fbd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 29 17:08:58 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 539b8129d534080741d40669ce2a7ecf20c7d6ac
Merge: b59ecaf 92baeea
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 29 17:08:58 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 8bac70995db80af73b62d3de38a90289ce3188b5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 29 17:08:30 2012 +0200

    Renamed compile less command and added some doc

commit b59ecaf0ab2e02c722c619ac0aacb88057502681
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 29 17:08:30 2012 +0200

    Renamed compile less command and added some doc

commit 5c71fbddb2e3a9a985911d98fa728d2ee7f8cce9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 16:34:40 2012 +0200

    fixing wrong url for generated thumbnails

commit 92baeea2560d013b1275717df31b45576f941506
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 16:34:40 2012 +0200

    fixing wrong url for generated thumbnails

commit ffdae476c143cfb2d620d5f074f9dd334709ad5a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 16:29:34 2012 +0200

    fixing thumbnails urls for windows vista (!)

commit 438919e1da066c47c092dba071845fa96fa6ac13
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 16:29:34 2012 +0200

    fixing thumbnails urls for windows vista (!)

commit 67a5e72f4a6d92c4604b6007ecbba340d0c53c96
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 29 16:13:01 2012 +0200

    Added img dirs in bootstrap less themes

commit 3ff538133fce5727fa0161a1c58f56593f20b054
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 29 16:13:01 2012 +0200

    Added img dirs in bootstrap less themes

commit 65e838f06cd6b0b35d5506235db16daa255238fb
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Aug 29 15:24:56 2012 +0200

    Widget prototyping

commit b816005594777ff5b2f00dfd33c475f02b89c59a
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Aug 29 15:24:56 2012 +0200

    Widget prototyping

commit 6ceb5127879d61e7f3c6259e7dee89303f3bce88
Merge: 9ef2134 25a2f29
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 29 15:08:00 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/layout.html.twig

commit 567629c9a020c8333110bf6bb1b9605a75702faa
Merge: 1c1bed0 5e31b31
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 29 15:08:00 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/layout.html.twig

commit da4b38d650d5e5c9f73c71f1d6660d7a26248642
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 15:04:57 2012 +0200

    checkstyle

commit c9621fc56f594a5e9a939efe6b96dcc91e150dda
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 15:04:57 2012 +0200

    checkstyle

commit 25a2f29283f308eab66c86c84848a3ad2f398cac
Merge: 6a8d785 4699f1d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 14:39:34 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 5e31b311143e0ea7593c39da0afcfa7af4cdb8d2
Merge: da01e91 3eb4e77
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 14:39:34 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6a8d7853921f9c67586c95bbdb5a9bd8b37ededc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 14:39:09 2012 +0200

    twigJsTest

commit da01e91e18613be3573536cb2f75ee6b0ec47202
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 14:39:09 2012 +0200

    twigJsTest

commit 4699f1d1af4eacae8eb5ce0e1355c1eecf822852
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Aug 29 14:38:31 2012 +0200

    Widget prototyping

commit 3eb4e77b74b52d677b8ffc3bd81d699337cf7f0b
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Aug 29 14:38:31 2012 +0200

    Widget prototyping

commit 339ecf72d1468e5be1e764d796760600aad32903
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 14:25:06 2012 +0200

    setting filters callbacks

commit 55fabce0a7e72168e3055ff186b69b4206eea85f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 14:25:06 2012 +0200

    setting filters callbacks

commit 0095ca6ff2318eb0e3eaaa07b92dabb9650700b3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 13:21:13 2012 +0200

    js resource filter is now an instanciable object

commit 2ff4c9d6bbade779edda172caca0df25482a3c8c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 13:21:13 2012 +0200

    js resource filter is now an instanciable object

commit a0efae0605b4ed6007010934503c720796fcb004
Merge: c219c23 72e641b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 12:06:23 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 9a546af9eb65591aac06d009ea2bffcfc323860b
Merge: c5e90d8 b5b9369
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 12:06:23 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c219c23d4e09ebb06825de8d5cb2a4a0ec4dd10a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 12:03:54 2012 +0200

    prefixes for menu & navigate links

commit c5e90d8cee7bbbc5cdeec5bc89699161cd084cff
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 12:03:54 2012 +0200

    prefixes for menu & navigate links

commit a8cafe162f4f20d6c79f6b4eca137cafc4b93dbe
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 11:55:35 2012 +0200

    splitting the resource getter from the interface builder

commit 135c70a84443178c2c7d88cbed15fb3fd9037a97
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 11:55:35 2012 +0200

    splitting the resource getter from the interface builder

commit 9ef2134c7cc53cdb6e0ea809018daed3220bd076
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 28 12:13:46 2012 +0200

    Replaced css by less files; added a less compile command (dev); added support for multiple themes

commit 1c1bed034c897ede7920dbda59d4eb81f4b4691b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 28 12:13:46 2012 +0200

    Replaced css by less files; added a less compile command (dev); added support for multiple themes

commit fe9aa5e9eb5a20a79d471c908fc3f48598400f28
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 10:01:15 2012 +0200

    js resource manager is now an instaciable object

commit 16572cf8af988c4d48d16063d0fa435c71280556
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 29 10:01:15 2012 +0200

    js resource manager is now an instaciable object

commit 72e641ba3f23cab581bb5ab269efb5e6f3f54204
Merge: 15607d1 4864601
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Tue Aug 28 16:37:55 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit b5b9369eaad7f02de3aa850703b0fc3c7d1ca0ee
Merge: fb0db40 989a8f1
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Tue Aug 28 16:37:55 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 15607d10ac21ad3e342b344e83f3f0ffec55b45c
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Aug 28 16:37:03 2012 +0200

    added new mime type mappings

commit fb0db40abc4b78a0f50f2b7c7ed09ed19daa46a3
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Aug 28 16:37:03 2012 +0200

    added new mime type mappings

commit 48646012e94ad05191bb0e3ac6accfa83c9eb926
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 15:06:45 2012 +0200

    resource filterAction returns html instead of json

commit 989a8f17bc2941275455ef6471247eb7b1fa6672
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 15:06:45 2012 +0200

    resource filterAction returns html instead of json

commit ee0a82db9d7ebd6e62b010ad3ef40791e5a43719
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 15:00:40 2012 +0200

    removing var to make phpmd way happier

commit f69d7a8c91f2abca438d97cc3fa53726f8a7aeea
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 15:00:40 2012 +0200

    removing var to make phpmd way happier

commit 38b3f37dcb29026eeb95df25461a1b002e97e294
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 14:56:41 2012 +0200

    reducing ResourceInstanceRepository::filter cyclomatic complexity

commit 8a7a8422e478f8f4a7bad21b4a9c1659886b9004
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 14:56:41 2012 +0200

    reducing ResourceInstanceRepository::filter cyclomatic complexity

commit cb5d84bed35d296f24e971e58732e86f3f57615e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 14:18:11 2012 +0200

    Fixing resource_icon data base 'longtext' fields

commit 2878eafaa7e364557b8a907097a8e139dc18850a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 14:18:11 2012 +0200

    Fixing resource_icon data base 'longtext' fields

commit 229bc57c514b19eaacbb37b22e623b0b86914041
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 14:12:45 2012 +0200

    fixing IconCreatorTest if ffmpeg isn't loaded

commit 7c39f3266e66265ba3b09a751d22a1d1e3d9ab10
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 14:12:45 2012 +0200

    fixing IconCreatorTest if ffmpeg isn't loaded

commit f474f1a65fab992117b66e38c006b94270df6ebc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 13:58:35 2012 +0200

    update app/dev/delete_files

commit 55af0fdd3ed5d1f5ab935338cf301eeb72149825
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 13:50:52 2012 +0200

    adding the test/thumbnails folder for jenkins

commit 719b46128351dab64a192cf2ca8d5a65653a4299
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 13:37:44 2012 +0200

    fixing a bug happening on window for the iconCreator

commit 8717b64bfe76d4635701496375422d2aee5bd5f0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 13:37:44 2012 +0200

    fixing a bug happening on window for the iconCreator

commit c0b2c39b59ac391156dffe8a5d9555bf6080a5a9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 13:13:02 2012 +0200

    fixing datatree commnad

commit d07db27412fb4989286c2d068b3eff027e643b3a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 13:13:02 2012 +0200

    fixing datatree commnad

commit be11234d30e9944377d4746730bdfcb6ac2298c8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 12:00:00 2012 +0200

    IconCreatorTest

commit 26315ae61a4c4e23e0753b93f6eedd87dde92ab3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 12:00:00 2012 +0200

    IconCreatorTest

commit 7add187d5d722ddd25bdd4e39782d2ac2397b45c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 09:28:44 2012 +0200

    splitting IconCreator::setResourceIcon

commit 04f4f516b3aa2b2bd8482b11f9ccc594f09be319
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 28 09:28:44 2012 +0200

    splitting IconCreator::setResourceIcon

commit a30a50ffa0a723ebad4b069fa22a4d1bd4fdeb83
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 17:32:57 2012 +0200

    multidelete for resource manager

commit ffffbee2aef3afbaf156cebc4ff07a43fca126e0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 17:32:57 2012 +0200

    multidelete for resource manager

commit 8c37e1f413a94aa4cd11214e3d334e831042d16a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 16:46:53 2012 +0200

    fixing a small paginator bug

commit ba9a5b846786706f8e151891c1a38fda3f4ae7f5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 16:46:53 2012 +0200

    fixing a small paginator bug

commit 961e47689e9d9ff2767708776df04dd4dd3c635f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 16:34:14 2012 +0200

    fixing createRootsCommand

commit b3018d2cf91cc40d5a3ee359188d112c93a660eb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 16:34:14 2012 +0200

    fixing createRootsCommand

commit ec394cf13897f39e6af5decc9b96ce2c76b0c7b4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 16:31:54 2012 +0200

    splitting the resource manager

commit fcb6f4239929e261dc486b1261bcff5b4a260d3b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 16:31:54 2012 +0200

    splitting the resource manager

commit ce3432122aa09d308068d6f9b85e3c00dce375be
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 14:06:02 2012 +0200

    unskip a test

commit aa3fec6aeaf5248f030acf85adc86a67ee2daea5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 14:06:02 2012 +0200

    unskip a test

commit 57bda720ab2b7376560d01360cd57dc17fcb99ff
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 13:52:33 2012 +0200

    removing the request object from the resource creation services

commit 42758f6e668262a9d6990436d09472d71834d103
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 13:52:33 2012 +0200

    removing the request object from the resource creation services

commit 0f6793f879c968d63300dbc744ae8f2ad816eac7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 13:05:45 2012 +0200

    dependencies rollback

commit 67e1df3254b06284726aeae5e8908b85898430fa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 11:38:56 2012 +0200

    moving some logic from the filterAction to the resource manager

commit 9627d7e0cbe6e73a69c4b97ef3fbbe33a2478966
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 11:38:56 2012 +0200

    moving some logic from the filterAction to the resource manager

commit 2798b34399dcb40ee27043c402c53e900ca9668d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 11:21:16 2012 +0200

    checkstyle

commit 163d4e041590d0212315fb5e00948bfd5bebf4eb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 11:21:16 2012 +0200

    checkstyle

commit e522e14fdc4b351ca23f6117a28e7ee2c44bfec6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 11:19:14 2012 +0200

    thumbnailcreator renamed and setResourceIcon moved to the IconCreator

commit 68fd57a7b55c20360dd42dc6f9e988911d334fdd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 11:19:14 2012 +0200

    thumbnailcreator renamed and setResourceIcon moved to the IconCreator

commit ef4a5ff6987591ba61af5e72afa721e4d4704976
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 11:06:24 2012 +0200

    freeing memory on thumbnail creation + white border

commit 64b16665c915af1f21547bb0b72da61e3f139157
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 11:06:24 2012 +0200

    freeing memory on thumbnail creation + white border

commit 323afb92a1ad092309b1d7004677a0ec6e9dcf8e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 09:59:47 2012 +0200

    adding bootstrap datepicker

commit 212d7868282e44febddde1cca3a20c993007591c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 09:59:47 2012 +0200

    adding bootstrap datepicker

commit 1cfb8032d881c44cc336357d66591176b003950f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 09:30:13 2012 +0200

    updating dependencies and removing jquery ui

commit e6f1ebf7279fe4c6ad50d6cce524b3d95f6e8789
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 27 09:30:13 2012 +0200

    updating dependencies and removing jquery ui

commit 90329e1f2379cf990a17286c503297ec3de0bdd9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 24 15:53:04 2012 +0200

    renames getDynatreeJsonFromArray method and removes the required dynatree fields

commit ac6862fd6a01097fad1fd42da65a68a14cc95374
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 24 15:53:04 2012 +0200

    renames getDynatreeJsonFromArray method and removes the required dynatree fields

commit dbff88772b00eed0d926b1c7da995ecdd4198ac3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 24 15:37:32 2012 +0200

    removes the dynatree initialization from a cookie

commit f270d172e5f10e7fa1d14b82fd8bd269f3f6876d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 24 15:37:32 2012 +0200

    removes the dynatree initialization from a cookie

commit 40196530f3699d78c87f1bfe6c8d8bb1731c0c40
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 24 15:13:26 2012 +0200

    changes resource icon database fields name

commit 9afbcbe936654e9238e68f1631f17925d5d6c3aa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 24 15:13:26 2012 +0200

    changes resource icon database fields name

commit 79b049b644dd1c0e2308ded4a2fc45700421881e
Merge: 40db137 746ac85
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 24 14:54:28 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/DataFixtures/LoadResourceImagesData.php

commit 0476046280055272a014988859707c04db01e28e
Merge: 11c0e66 c5c9069
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 24 14:54:28 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/DataFixtures/LoadResourceImagesData.php

commit 40db137e5334c7bff552a716c41e7a4e022557be
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 24 14:48:18 2012 +0200

    icons management refactoring (database fields names still need to be changed)

commit 11c0e66d76fd6e5bc2c5853706bb13de8e40b603
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 24 14:48:18 2012 +0200

    icons management refactoring (database fields names still need to be changed)

commit 746ac858f1bdd0b23fa98e0fe7bcb69b721d026b
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 24 14:32:36 2012 +0200

    added new mime type mappings

commit c5c906952de7201769cf394c2a819fc1bf89923a
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 24 14:32:36 2012 +0200

    added new mime type mappings

commit 88b051a1db8422d70f678f54ad1eb88d3502d076
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 24 14:32:01 2012 +0200

    new version

commit 840aa20021f3108ab56f61d10b92f5f1ca805090
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 24 12:39:19 2012 +0200

    new icon

commit bf5422e765db7003792ca059267ffc436b95d60f
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Aug 24 11:59:44 2012 +0200

    new icons

commit 6f265cd3f40d9030e258d7fb57ba11259651425c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 24 11:19:29 2012 +0200

    thumbnail generation when a video/image is uploaded

commit 7fb56364ca90d0fa7e18a52294cf6b802c719abd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 24 11:19:29 2012 +0200

    thumbnail generation when a video/image is uploaded

commit cf092d6e06e65cfd19f25bd95a4e7ca0cc7c19c3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 24 09:05:35 2012 +0200

    uncomment tests

commit 62e1636c6f4249c6083863c15be66d146b1da9e1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 24 09:05:35 2012 +0200

    uncomment tests

commit 0e2a2cbf0b35be95930ae04e1868ae4725e44b59
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 23 17:49:06 2012 +0200

    Icons for video and default

commit 2c70942de6c635b6b64b7e7958f3edf37fa78b69
Merge: 7472bea d7773ba
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 17:39:10 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit bfa369d03c49ecfdab93e2228821b4e0309d6ef0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 17:38:30 2012 +0200

    thumbnails for differents resource mime types

commit 7472bea45e43e0f454a1fe4fb7e3385940b421ca
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 17:38:30 2012 +0200

    thumbnails for differents resource mime types

commit d7773ba1a6a7847e3e8fdb008f5f909a85c2a8d5
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 23 16:47:11 2012 +0200

    Added icon for Powerpoint

commit 2379047206194bcd2e6d7088b8502ec40e185cd0
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 23 16:36:41 2012 +0200

    Centered box

commit 18befae4359c4f8100574f9dfa8689d453888f69
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 23 16:28:11 2012 +0200

    Resized

commit 0220c24b57865e9901c86145b86c8078df50177b
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 23 16:25:09 2012 +0200

    New icons

commit 1963eed199e8dfe00548eadc69ec73c5123c15a3
Merge: 523a7a5 f6b3493
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Thu Aug 23 16:24:12 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 523a7a5f624c80c09932c7cef48101753fefbc85
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 23 16:21:57 2012 +0200

    replaced "texte" with "txt"

commit f6b349334e4a926e671eaf3b5cff379e06a33098
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 23 16:15:19 2012 +0200

    Added missing command-line argument in dev install script

commit fa91cd153fe8e19791060028b1b480f63dd278b9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 16:02:50 2012 +0200

    remove the old require folder in the test suite

commit 77253067818f0e20c6539ab1a69b62abbe30c8cd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 16:02:50 2012 +0200

    remove the old require folder in the test suite

commit 2428217e583641b63de9943be45d801c07ef73fb
Merge: 93cd903 21f10e9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 16:01:58 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 7513055b536037270020637b350032523835281d
Merge: 6d0e2e1 4bb8016
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 16:01:58 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 93cd903409115841f873dfbd3a828534e046f0b7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 16:01:27 2012 +0200

    rename claro_image and adds claro_icon_type

commit 6d0e2e1b8874c7eb177f84c0d77c4626dd7b000b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 16:01:27 2012 +0200

    rename claro_image and adds claro_icon_type

commit 21f10e9e2f062cc9ccffbdcee2297cc2112f526d
Merge: aaa138c e0923bf
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 23 15:09:06 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 4bb801625e48ff62c63af9c93e68ac2738e323c8
Merge: 13dd264 625ce80
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 23 15:09:06 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit aaa138c8d2242ca807895d019eb401e802fed74f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 23 15:08:36 2012 +0200

    Removed wrong html id

commit 13dd2649104de3fd2f87131eda94da079ba8fd13
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 23 15:08:36 2012 +0200

    Removed wrong html id

commit 364ec1a8c9250a1467a8e2c760b303ca8c3cd5be
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 23 14:59:35 2012 +0200

    Modified install command to include required fixtures in test env

commit 5e72e6f88c727c31094393d779742b23087f0a28
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 23 14:59:35 2012 +0200

    Modified install command to include required fixtures in test env

commit cc359e8d082e24e77777044c2e6892132d441c03
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 14:02:48 2012 +0200

    resourceinstance repository updated for the new resourceimage table

commit 5b6aaacf2cfb23f07b629ae0c1c7d4d924bf4045
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 14:02:48 2012 +0200

    resourceinstance repository updated for the new resourceimage table

commit ec49b219aaf28588a6b1f85319aba3519b6a8a88
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 14:02:25 2012 +0200

    resource form closed after the resource creation

commit 00ff64867af9d3a5c92206976a7cc318fe977a4c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 14:02:25 2012 +0200

    resource form closed after the resource creation

commit cc9d4410e80ec255b094ddb7bb80d2891dc300f2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 13:30:33 2012 +0200

    icons & thumbnails removed from resourceType

commit 9bb0f9b3ffbbb5dae9fd37ef0fda1fd8f7ff8abb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 13:30:33 2012 +0200

    icons & thumbnails removed from resourceType

commit 625ce809799d5d227302d7561516a7f4468b4c4b
Merge: 54ffa76 14dea85
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Thu Aug 23 10:23:23 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 54ffa7699e5e4a04d5aaebd270d900f710fff3e0
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 23 10:23:12 2012 +0200

    changed to vertical folder

commit e0923bf2b071ee0c5c79443c4310b81f22ccc432
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 10:20:16 2012 +0200

    fixed resource manager delete

commit 14dea85c51a1cd24965ed5cefd1574186b3aa245
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 10:20:16 2012 +0200

    fixed resource manager delete

commit be11655c0ccd2406f38a7d2ba2d91da94adff373
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 09:56:54 2012 +0200

    breadCrums repaired

commit 2a9a1a186719430c893ed5b3b853907a7f6565c7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 09:56:54 2012 +0200

    breadCrums repaired

commit af84e0321049cfc0c600ad1850153dafe07862bf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 09:49:15 2012 +0200

    fixed resource creation for manager

commit 8c76b881b1915fc2a5a6d24ed9421ee96d7d4d0f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 09:49:15 2012 +0200

    fixed resource creation for manager

commit 847b5b92cb04d341dfedb40708dc2745fbcc5357
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 09:34:58 2012 +0200

    resourceimage mapping & fixture

commit b02e5f8365043f2295705ce0c2ab9d436747372b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 23 09:34:58 2012 +0200

    resourceimage mapping & fixture

commit 9edd622d2f208840bfecd722c96c638a635f3973
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 17:51:27 2012 +0200

    Adding claro_resource_images table and removes the mime type field from resource

commit bb63e06c520ba1163f45f175d49cd8e6faa2f63a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 17:51:27 2012 +0200

    Adding claro_resource_images table and removes the mime type field from resource

commit b4ccc326b87e53ec2f2c8706002e99505e6732f9
Merge: a0070b3 a5e09c1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 16:56:11 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 3a651985874d47b6e5f30ad5f9f48d3773ef3a6b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 16:55:33 2012 +0200

    fixed copy/cut/paste for the resource manager (wrong div class selector)

commit a0070b3ef34d193ae5f954089850ce00633b654c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 16:55:33 2012 +0200

    fixed copy/cut/paste for the resource manager (wrong div class selector)

commit a5e09c18de50afe8a77c884241ce02fe168a9439
Merge: dfa7729 20962cb
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Wed Aug 22 16:44:01 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit dfa7729818f75191537767f75109bb5fd1790bde
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Aug 22 16:43:49 2012 +0200

    new icons

commit 051fb76bf7675f0c9c6d1e8fd86e6f7f4c82f2f8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 16:39:40 2012 +0200

    contextual menu on resource thumbnails

commit 20962cb1bfa70603a44a89fa76cd3eadcca3f005
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 16:39:40 2012 +0200

    contextual menu on resource thumbnails

commit 66dd02f4687978d88a0564897e3ad6d33e5af4f9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 16:23:13 2012 +0200

    the select for the resource creation is displayed again

commit cd9a42527e9ff3a543041b0eb009b7f29fb0a534
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 16:23:13 2012 +0200

    the select for the resource creation is displayed again

commit f101a7d6935674405858aa9fbc5d2e0424d0a900
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 16:14:40 2012 +0200

    responsive breadCrums

commit f7b2a1b9f7c02e71b4738116b8a8d977f5ae9349
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 16:14:40 2012 +0200

    responsive breadCrums

commit c6c4eb7131f0eeb986ed189f868de0a0590d5cc1
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Aug 22 14:24:05 2012 +0200

    added new icons for ressources

commit 8a22aa8fc479c76a5dd77a812b950b647924850f
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Aug 22 14:24:05 2012 +0200

    added new icons for ressources

commit 33b6a74acb645a577b9f65bfe8655373eda3f54f
Merge: be36f3f 70d6ef1
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Wed Aug 22 14:14:51 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit be36f3f4f1fff17fe5923bb8d86d57b05db85f89
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Wed Aug 22 14:14:04 2012 +0200

    added new icons for ressources

commit 2f594c92ba4e0fa292ec93aa184c0cff9a6a4809
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 13:59:52 2012 +0200

    fixes a bug happening when breadcrums are not defined

commit 70d6ef168503392488e56a87c65efdf6370c4741
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 13:59:52 2012 +0200

    fixes a bug happening when breadcrums are not defined

commit be3b58fa93b2f3fd47b8a63ce6d99ff9ec2a007e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 13:50:05 2012 +0200

    breadcrums for resource manager

commit 4156181ab1e8ece239b1a2fee9366dc3df0634dd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 13:50:05 2012 +0200

    breadcrums for resource manager

commit aebf1ddfdb4631e0cdcd5bae6dcbc5d739c82949
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 09:59:35 2012 +0200

    formatResName for flat view

commit 854bf69c673512b25e65c343890cfd8bcd6fb50e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 09:59:35 2012 +0200

    formatResName for flat view

commit 41d7d497fccf8221c1b3e22497d6dee63571c80c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 09:53:01 2012 +0200

    resources form names & double quote

commit b3f0c6d58429b5b324fbfac169bd1735c445eb3e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 09:53:01 2012 +0200

    resources form names & double quote

commit 3156c210a00a9b7119865b38fc1d26831ffd4335
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 09:10:36 2012 +0200

    refactor filters names

commit 3f8a2c1ef8abb9bf4a61950bc41752d9fc28a52e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 09:10:36 2012 +0200

    refactor filters names

commit 915d3c8c5643978f9d54e452a91ff749e62d66c0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 08:56:13 2012 +0200

    double quote instead of quote for dashboard/resources.html.twig

commit c6b9d552fc295b18e8b3181aa27007246cbec2e4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 22 08:56:13 2012 +0200

    double quote instead of quote for dashboard/resources.html.twig

commit 8d8db384d9dc57f6581010adb293705d50032f64
Merge: 1874575 8806fc6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 17:44:16 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit acdbe0975059b860b8c8d649fd336d146f7e0762
Merge: 421292b 9b8fd21
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 17:44:16 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 187457500bf087a9d1ceaf22d911dfa0114a721e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 17:43:43 2012 +0200

    back button hidden when there is no root

commit 421292b7bf5cfab033c4f1938b0bc23929b3b3be
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 17:43:43 2012 +0200

    back button hidden when there is no root

commit 07724d7812ead21d959b9263f3ae009c1c0061e8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 17:41:34 2012 +0200

    Refactor class names and id names for the resource manager

commit b8fd923002a18f258059d510ad1fc346d7edd5e4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 17:41:34 2012 +0200

    Refactor class names and id names for the resource manager

commit 8806fc65de2f5a97b02ae1b2b82e9557798bb039
Merge: 67a7780 0c13b4a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 21 17:33:49 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 9b8fd21de8170ec63b26c6c5959452bd45646e61
Merge: 59d3840 b8a13ad
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 21 17:33:49 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 67a7780fd7f04eee412b256f515f2e81a9de4071
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 21 17:32:55 2012 +0200

    Fixed "link" buttons in forms

commit 59d3840a8e907726184d45199eebc69fb406cdf7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 21 17:32:55 2012 +0200

    Fixed "link" buttons in forms

commit 1b3c3f832ccd541ff429d22797b298d78f52e75f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 17:30:43 2012 +0200

    replace the navigate link by the thumbnail

commit 42b0039c3aa78feca217f22f0df9fb0e1a8389ca
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 17:30:43 2012 +0200

    replace the navigate link by the thumbnail

commit 0c13b4a16533913bbb0448392184c8612b2393d4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 17:07:34 2012 +0200

    render thumbnails tests

commit b8a13adf264dcb3ae658594a5c516a3d597e45e7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 17:07:34 2012 +0200

    render thumbnails tests

commit e7e9353e2a4e5e544fbffc5138d853b230d9dfaf
Merge: f11b300 c722ed9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 21 16:49:55 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit fb2971f62973704ade5cac2ab5edf42c01ec66bd
Merge: 563e957 296ccc9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 21 16:49:55 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit f11b30092bb45b7fcdf6e4319ee4bf4af458006d
Merge: aada69c 8e5d70e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 21 16:49:25 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Dashboard/resources.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/layout.html.twig

commit 563e9578d16f6b466c36ee0a5b01993f6c341be0
Merge: 954089a 79945e6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 21 16:49:25 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Dashboard/resources.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/layout.html.twig

commit c722ed975c2d6a131c7d8ef7b129b8eeedb442d8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 16:42:26 2012 +0200

    the number of items per page for the pager is a const in the ResourceController

commit 296ccc9447db1f98b5fac20552c05099f146b6e8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 16:42:26 2012 +0200

    the number of items per page for the pager is a const in the ResourceController

commit d73ea32f2e78f60f3da8769abfd269d7e12dba23
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 16:33:10 2012 +0200

    fix countInstanceForUser request

commit 15f6eccc304dca6ffde8f04b8fb33bccf62bec59
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 16:33:10 2012 +0200

    fix countInstanceForUser request

commit 6ab24942f027c4b9212e47e7272165449f77ad65
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 16:32:43 2012 +0200

    create roots command

commit eceb293fe02460816d646c840992a4dcfba9d0e4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 16:32:43 2012 +0200

    create roots command

commit aada69c81951c2d6724fe86281c80311c0492532
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 21 16:28:08 2012 +0200

    Views/layout refactoring :
    - reduces number of templates
    - use bootstrap when possible
    - update flash messages management
    - modify form theme
    - make minor html/css enhancements

commit 954089aa84702161f02264d5d00afc8dcc2596d0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 21 16:28:08 2012 +0200

    Views/layout refactoring :
    - reduces number of templates
    - use bootstrap when possible
    - update flash messages management
    - modify form theme
    - make minor html/css enhancements

commit 8e5d70e10bc04e5f2397101a1f047634445e7311
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Aug 21 16:07:37 2012 +0200

    Refactoring of divs 	and spans

commit 79945e60e3f7e4ba86a91dfaa72346f15e660a60
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Aug 21 16:07:37 2012 +0200

    Refactoring of divs 	and spans

commit b23946f38463cdd42a24dad014bfbaaebd7a6b78
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Aug 21 14:00:03 2012 +0200

    Refactoring of divs 	and spans

commit 16bcd327cc8aa9936053901c8f286192de56821d
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Aug 21 14:00:03 2012 +0200

    Refactoring of divs 	and spans

commit 87e927842d67210c9a5cd5d40d99bb1d9bfdd68e
Merge: 26897d4 8484bf5
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Aug 21 13:14:00 2012 +0200

    Resolved conflicts

commit 3368417cb2494665cdf9db0f779df7c5a8935519
Merge: 6d7b341 ff6592e
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Aug 21 13:14:00 2012 +0200

    Resolved conflicts

commit 26897d40b371ba9c813c576d771f6beef6e21cfc
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Aug 21 13:09:38 2012 +0200

    Cut ressources names

commit 6d7b341ffe0a57debdaf32f76322eeb33cee9c00
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Aug 21 13:09:38 2012 +0200

    Cut ressources names

commit 8484bf5f54cee6cded6d38221184a01e04f2a58c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 11:59:06 2012 +0200

    next/previous for the pager

commit ff6592e0e520314c1263f760f8e12593bca21953
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 11:59:06 2012 +0200

    next/previous for the pager

commit affceeb7eca1905dc83d13e294cfe5ba2595014d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 11:29:38 2012 +0200

    flat view pager

commit 721daacb9b3c49f4141fa70f20a9845f9475a786
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 21 11:29:38 2012 +0200

    flat view pager

commit d9da9274ed7f94bd5521ae03d638a1bcd4927555
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 16:44:21 2012 +0200

    count instance method

commit 98d1759c57fe4bcf2c2c1ad7f5dbf9c99255403f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 16:44:21 2012 +0200

    count instance method

commit b35af5ac8e5cae8798da564653d812817e8a367e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 15:44:39 2012 +0200

    checkstyle

commit 7600d2de01f4fb6ceaf4d8072a95c4ac98b22517
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 15:44:39 2012 +0200

    checkstyle

commit 3fa72b90191d639e2f8039335b991e8818adf36b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 15:38:52 2012 +0200

    the formDiv can be closed for the resource manager

commit e1974a47c2bc5076c51e2d75f46a2ed7160196a0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 15:38:52 2012 +0200

    the formDiv can be closed for the resource manager

commit bd709c1723a9afddf7c2f9759f8f060cfb5d533e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 15:11:14 2012 +0200

    copy/paste for resource manager

commit c4a866307403f9885ad3cf6a42d1c5ad4dff6225
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 15:11:14 2012 +0200

    copy/paste for resource manager

commit b5a7438ab5ec03edb0cc121f88461a9ec6c6ac8e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 20 15:08:50 2012 +0200

    Fixed old-style doctrine mapping

commit f71437d4f880d22884f28e8f26edb71f3724a7c5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 20 15:08:50 2012 +0200

    Fixed old-style doctrine mapping

commit b62f3953e7d605891b539357dd50393bdd3e0257
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 13:44:59 2012 +0200

    cut/paste error handling (draft)

commit 90dead87f7a64e79a52be935d18a994768a1a061
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 13:44:59 2012 +0200

    cut/paste error handling (draft)

commit f6713f7e2e0c7dfa943a04044ace0805a11b95e3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 12:01:06 2012 +0200

    resource manager cut/paste

commit a0963f7587f1945cdb8b0f34536826784a325b35
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 12:01:06 2012 +0200

    resource manager cut/paste

commit d61d85c2d5f8b218dc4dcd7ce66b49748bfedb06
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 10:10:32 2012 +0200

    back button for resource manager fixed

commit d21abb23cd38343d0b711b53881c082330abecef
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 10:10:32 2012 +0200

    back button for resource manager fixed

commit 990ddda7e4d11aedbe808ce367304e4227cbe9ab
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 10:04:19 2012 +0200

    html style for resource manager

commit 26ac5c18f5d1a53ee9950ec95a03820a5393a476
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 10:04:19 2012 +0200

    html style for resource manager

commit acbfcf1998b34ee7364998509fcfaa6406e56636
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 09:55:59 2012 +0200

    add & delete for the resource manager interface

commit cb009e626d718d201bf0094ad68b1a9b1b2fce20
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 09:55:59 2012 +0200

    add & delete for the resource manager interface

commit 2c0cb6ace671de9af578d8fc060771f790e857c5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 09:25:58 2012 +0200

    portable sql for getRoots

commit 096e691528c519be9fb44940004658b5ea34d1cf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 20 09:25:58 2012 +0200

    portable sql for getRoots

commit 1cf7acc6c5d87265fe8aececbdd8c31432f73e3d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 17 15:32:35 2012 +0200

    userEveryInstancesAction (flat view) + tests

commit 118a354f881e9b6b3cc0a302cd1e6ec639791d29
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 17 15:32:35 2012 +0200

    userEveryInstancesAction (flat view) + tests

commit 404e54c654ae4cbaf2ba96b492a1f7d30e0431f1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 17 14:11:59 2012 +0200

    image and display inline for resources thumbnails

commit 4616e8fbbf4e5dbb7b8b7bd67f9e0471d5c13d4c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 17 14:11:59 2012 +0200

    image and display inline for resources thumbnails

commit 36cc638bbc4d95e0176b42360dc09f64af28f85d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 17 12:03:25 2012 +0200

    Adding jquery ui css

commit 7cb2d809e1263d67d11c38a4fdc39dbf533dbbe0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 17 12:03:25 2012 +0200

    Adding jquery ui css

commit d0cf71e233caf20f0deacbe494f99e23587946f7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 17 11:37:45 2012 +0200

    filter tests for type/roots + prepared statements

commit a6e52b63b63c7560417e99fdeb12cb049a8b9e89
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 17 11:37:45 2012 +0200

    filter tests for type/roots + prepared statements

commit 0cb74495c8f6e6df884b5fd95953b9997ae29ddc
Merge: 5e204fe 83ea46f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 17 10:10:40 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Dashboard/resources.html.twig

commit 775b55a94d43c2bdd6902b2578c6ab3dbf6d4f3f
Merge: e43b97f 7b36ca8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 17 10:10:40 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Dashboard/resources.html.twig

commit 5e204fe2ccfc69630d23097a40566600d9b2631b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 17 10:09:01 2012 +0200

    checkstyle

commit e43b97f1ed52d0f8faf4db99172cf5ad6c56738c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 17 10:09:01 2012 +0200

    checkstyle

commit ef2115657b698259b0390567908db0cab81493ad
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 17 10:04:21 2012 +0200

    resource filter function returns the correct json response

commit 58fe24e1286be932695b963377dd3c49093764c0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 17 10:04:21 2012 +0200

    resource filter function returns the correct json response

commit 83ea46fe3d3862d7c8fa90a8771b4ad4ecd13d26
Merge: 1bc6361 94e5e05
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 16 17:33:09 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 7b36ca84dcf5ac19d85ee492e29a85f37034dd25
Merge: 08e0fe4 38543e1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 16 17:33:09 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 1bc6361e713b498db818a4656a93812cbbc5759a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 16 17:32:48 2012 +0200

    Modified footer positioning

commit 08e0fe4f03ad1b864b04e6563774fe001ae525c0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 16 17:32:48 2012 +0200

    Modified footer positioning

commit 94e5e05b584caa8b4b86a93fc8348a1428a6bd97
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 17:14:15 2012 +0200

    Added missing close div

commit 38543e1ca3bd1fb75d57e5881f0422bd25f11faf
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 17:14:15 2012 +0200

    Added missing close div

commit 6de799000f9dd2d093b7c4a3da40ece6626cda07
Merge: 9ec7e50 ac4a0c9
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Thu Aug 16 15:51:26 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 6c7ea85262623011c08daa5be15908e15d14aa3a
Merge: 76676b3 de23081
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Thu Aug 16 15:51:26 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 9ec7e50329ac80cafdca24f96106532983473c19
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 15:51:09 2012 +0200

    Set nice black for footer background

commit 76676b30c5d0ede4d11d5a9f4520602fdbb114b6
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 15:51:09 2012 +0200

    Set nice black for footer background

commit ac4a0c9fdfe86ff7bc600f6de7b69ad5bf677dca
Merge: a1989f3 d59f10f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 15:43:30 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit de2308179f93084f5c014e1ead5b80c97e9f3fe7
Merge: 3ac4e96 9175c77
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 15:43:30 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit a1989f33b973b696d2e696d2d5151b6b97548c2e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 15:42:49 2012 +0200

    download for the manager

commit 3ac4e96931d4f33783bf8f73400e90ab9251d537
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 15:42:49 2012 +0200

    download for the manager

commit e134a72daf0007c754985bcccae2ab94c2ed0872
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 15:40:51 2012 +0200

    Added hint for the Modernizr include

commit 9175c77200fda9298995fe71c662f0883dd77c1d
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 15:39:16 2012 +0200

    Set minimum height size for content div

commit d59f10fcfa6afaafe917f4a6f945ceb5004812b2
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 15:39:16 2012 +0200

    Set minimum height size for content div

commit bd6487e52aeb68ec49947e49f3d7959763d0dfab
Merge: cfc1491 525fa91
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Thu Aug 16 15:05:23 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 335f579317264e4d1d46a517e8af49de0c464c76
Merge: 15b92f4 bedb3a4
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Thu Aug 16 15:05:23 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit cfc14910cf1afae025048f813fd1fcb6ca524fd5
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 15:05:15 2012 +0200

    Fixed bad closing divs

commit 15b92f4fc332f3ac60a5f14b842446c92e2ac172
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 15:05:15 2012 +0200

    Fixed bad closing divs

commit 454b61be7a6ab1e37582b6f571135f83ad31241e
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 15:04:46 2012 +0200

    Presentation improvements

commit 5612d276743ba72b5e14cd6951d3b5e73ff04b64
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 15:04:46 2012 +0200

    Presentation improvements

commit bedb3a41c0fd7878bf3f0435365b2fdf197e423d
Merge: f7f1daf e7d5f01
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 15:01:17 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 525fa91e4dda21261d05ca0cbce1a126deee0d0b
Merge: 2d85202 374a904
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 15:01:17 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f7f1dafb2ed3fd588211932fa68664933cd73ce1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 14:59:44 2012 +0200

    fixes a test

commit 2d8520259c68cc7816e88b719d1f2459be270775
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 14:59:44 2012 +0200

    fixes a test

commit 47ee662aba3e417194ebff6c2d766cd734966db0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 14:52:15 2012 +0200

    plugins can define their own default thumbnails

commit 3c50f3f289adbc260db3bf19310347fc4854bf18
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 14:52:15 2012 +0200

    plugins can define their own default thumbnails

commit e7d5f01d7d0dd0f6497182745c13f1926c1fc249
Merge: bb22d94 fa182c1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 16 14:24:30 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Dashboard/layout.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Dashboard/resources.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/common_layout.html.twig

commit 374a9043adef44481a4c68c36888a19a76a41f50
Merge: e153282 f34dcb8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 16 14:24:30 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Dashboard/layout.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Dashboard/resources.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/common_layout.html.twig

commit f34dcb8b51427c7223eaf5e208f3d7e666f68bf3
Merge: 245df10 4c498d6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 14:11:38 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit fa182c1d46213cbe21ad8f4142e467844db2e230
Merge: 22dab2a 5a60cb9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 14:11:38 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 245df10b5b3b07724a7f486a6e26b28fb3943629
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 14:10:38 2012 +0200

    contextual menu repaired

commit 22dab2ae7911574a60c3477ae9f375a6692dc25b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 14:10:38 2012 +0200

    contextual menu repaired

commit 4c498d67cf80466bf7c58ffce1d53c73a20ff2aa
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 14:06:07 2012 +0200

    Change of footer colors

commit 5a60cb97de42e63cc16f3d8e8c5ba0e09e3e6343
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 14:06:07 2012 +0200

    Change of footer colors

commit 4b0f65c6452a29738935679dc41b53684dfd2b1e
Merge: b30c08e 9bd8797
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 14:05:03 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Dashboard/resources.html.twig

commit 151084e0ac8d1608f9a534dd558735c95c0cb707
Merge: fb979f9 78fca11
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 14:05:03 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Dashboard/resources.html.twig

commit b30c08e1d35a474bbd728c43e5b2cf9abbfa34bb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 14:02:15 2012 +0200

    resource creation redone (callback ignored)

commit fb979f9870b13105c389dc148f91a86cdee4793e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 14:02:15 2012 +0200

    resource creation redone (callback ignored)

commit 9bd879784d17531100d54b89b5a5e8c4e27ec194
Merge: 7d9625b 4f0f890
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 13:55:18 2012 +0200

    Solver merge conflict

commit 78fca113b5d4b3054213b5a1cf3bb70c2279355e
Merge: 0baf137 e643f51
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 13:55:18 2012 +0200

    Solver merge conflict

commit 7d9625b67374f8120c25bbede2defa7b759e4397
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 13:44:04 2012 +0200

    Modfied default route to dashboard

commit 0baf1371c7c6d2a4c72363199f6a7bef936d160a
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 13:44:04 2012 +0200

    Modfied default route to dashboard

commit ec56b1e0acf86be143973fad79edf3f2965fd158
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 13:43:03 2012 +0200

    Refactoring of bootstrap integration

commit 9f0c9742df167bd0a39a3e5eb68edf9231f53edf
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 13:43:03 2012 +0200

    Refactoring of bootstrap integration

commit 797c4d145c353677b82382c1958177f65fa87f6a
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 13:42:46 2012 +0200

    Refactoring of bootstrap integration

commit 00f9afab9806f974ca7185147693c25262e0388c
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 13:42:46 2012 +0200

    Refactoring of bootstrap integration

commit b31ea9759148937d261bec09a1f698b18563c928
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 13:42:09 2012 +0200

    Added texts for dashboard tabs

commit 2ac5e6cf31efcb9ff0006ad964ec061a4a81e60d
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 13:42:09 2012 +0200

    Added texts for dashboard tabs

commit b82719452760a6af4227dd6f92f0dbddbf6da2a9
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 13:41:28 2012 +0200

    Refactoring of boostrap integration

commit 70af5fce349ae9196ddc044c2d81577ed0efe0bc
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 16 13:41:28 2012 +0200

    Refactoring of boostrap integration

commit b4bb771cdaf2dc3162dafe4dbc59abdfcf6b5292
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 11:41:31 2012 +0200

    menu actions added (except new)

commit 8583efb1ecd1204ccf872a31a2385981dca38746
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 11:41:31 2012 +0200

    menu actions added (except new)

commit bb22d94a2040530377604150cc13826961047dcd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 16 11:22:15 2012 +0200

    Added cache:clear to ant build configuration

commit 7171992c7f008cfbc0fac1b5d3b548bd53e5e9d9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 11:08:33 2012 +0200

    contextual menus added (no action yet)

commit 55a8a9d930cb2348f79b85bf0b36732f5b385788
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 11:08:33 2012 +0200

    contextual menus added (no action yet)

commit 4f0f8909b00442d63772fcc2ad26ec0c40c49b13
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 10:31:21 2012 +0200

    checkstyle

commit e643f514337bc830e2b66096d0cd18157c8cc35a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 10:31:21 2012 +0200

    checkstyle

commit c36ea2ea18cc94a90645798d31cb4fcf6c15bf68
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 10:29:32 2012 +0200

    basic ajax resource thumbnails navigation

commit b380ab058cea9c20802864c9ec453676529056de
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 10:29:32 2012 +0200

    basic ajax resource thumbnails navigation

commit 496e4fc912c3df0b88bf51484dd0a3ed3108e834
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 09:35:33 2012 +0200

    resource manager tree view removed

commit d857d25b2e56d89416d994261e8c0e8f5b93a308
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 16 09:35:33 2012 +0200

    resource manager tree view removed

commit e153282218ed8597c50fc6add3d0e419284afb21
Merge: af79281 8ed2c87
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 14 14:22:25 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit ce5d9964667b29066c3825a392c94c80d02916fe
Merge: 340500d c6920e8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 14 14:22:25 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 8ed2c875962b8681e365e1e52d942287732c9e00
Merge: 448432e bd90f85
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 14 11:46:48 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c6920e82bda0072485425c1bff2ac46a32540a4a
Merge: 92244eb 7a625ef
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 14 11:46:48 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 448432e0706d1c642b3126ef09b24d1759b6c070
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 14 11:46:27 2012 +0200

    hybrid & linker views removed

commit 92244ebfebd9c5b1ea4bad04d4aa5ceb73aef23e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 14 11:46:27 2012 +0200

    hybrid & linker views removed

commit b21ab9311caf0a75437dbbb185d8c00ebeaa18ce
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 14 11:06:05 2012 +0200

    workspace code added

commit 15a5c528785c1008c574221cbef20aeea30f0ce6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 14 11:06:05 2012 +0200

    workspace code added

commit 0c0809b3e2409ca35fd16506f9bb1222f6e601b6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 14 09:54:29 2012 +0200

    improved topbar

commit a86fe4cacf089125554e55bc928a0028b5e20909
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 14 09:54:29 2012 +0200

    improved topbar

commit 34e4913f67824923e2c77af03bacd197aeebe963
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 13 17:45:17 2012 +0200

    prepare statement for sql select

commit 76cb91715d148ab89fec7643c35c5f5334319a18
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 13 17:45:17 2012 +0200

    prepare statement for sql select

commit 94eae802abaf10ae2e3d2d5dc01c5671d26fd50a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 13 17:44:57 2012 +0200

    temporary fix for a bug happening when the resource manager is loaded the 1st time

commit 2ed4735c9a06bc48c9cef4637b279032328edbad
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 13 17:44:57 2012 +0200

    temporary fix for a bug happening when the resource manager is loaded the 1st time

commit 24dcd3fef8b6ad799e7d357b0297ba0171807e69
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 13 17:28:34 2012 +0200

    temporary fix for a bug happening when the resource manager is loaded the 1st time

commit aa4cbce9e49209c87d6114de54c417baf64c6ae2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 13 17:28:34 2012 +0200

    temporary fix for a bug happening when the resource manager is loaded the 1st time

commit d87d2cdf3e0129c02c7eceb97e7ba0904a4e6e11
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 13 16:38:23 2012 +0200

    some resource manager refactoring

commit b12c2c5dd2db1c4df37def97d6d22cf18642ce3d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Aug 13 16:38:23 2012 +0200

    some resource manager refactoring

commit af79281d56ab379900a934e1f5930494c9a01df7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 13 09:58:04 2012 +0200

    Fixed html errors

commit 340500db70ceee395d8d4d4ddd2aaba15dc685a4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 13 09:58:04 2012 +0200

    Fixed html errors

commit bd90f8508730cde49cf038469ee775ba23859c6c
Merge: 6ea8c31 8757847
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 13 09:22:01 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 7a625efe8f792b9d7cab5d74c07c000767cb8211
Merge: 157642a fcd4076
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 13 09:22:01 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit bf48bfdfdb568ef77e6d0edfde43ba67624b1a55
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 10 15:50:26 2012 +0200

    linker mode node keep the data type (should fix the export)

commit d2f072cde90d35b6667c72ddf2f447b3c5c5582c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 10 15:50:26 2012 +0200

    linker mode node keep the data type (should fix the export)

commit 87578470cd4dc389f2566da0046a14d5571dd9f5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 10 15:39:39 2012 +0200

    linker mode can be displayed (export & persitence still broken)

commit fcd4076c87ed609379b0031bad0f725875a91972
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 10 15:39:39 2012 +0200

    linker mode can be displayed (export & persitence still broken)

commit d2d91284b64dde1b059c51a9711eb076bd61dc47
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 10 15:12:03 2012 +0200

    persistence for hybrid mode optimized

commit 5b199367661e0a22b05544b7f7d3c8f624ba24fa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 10 15:12:03 2012 +0200

    persistence for hybrid mode optimized

commit 03d8cc5413ef47b0667268baa7718447274f9790
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 10 14:53:45 2012 +0200

    persistence optimizatio for the classic mode (other modes are broken)

commit 4177d0ee63a131bc79c4c7412e4823715c404286
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 10 14:53:45 2012 +0200

    persistence optimizatio for the classic mode (other modes are broken)

commit bf4048e3cc44b110277fef9c6f9ebf3500eb8d54
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 10 09:16:14 2012 +0200

    sql resource instance select string in a separate method

commit 71e53aa357b9bf631cb6e1c9a096b64aacab3232
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 10 09:16:14 2012 +0200

    sql resource instance select string in a separate method

commit 4bb07f7b30b09e25644948d542147fed914568af
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 9 17:49:15 2012 +0200

    rootsAction is now done with a sql request (no more dql)

commit 445b30248ab8c576eaa6b981fdf2cf335c103d74
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 9 17:49:15 2012 +0200

    rootsAction is now done with a sql request (no more dql)

commit 5bd5afb2f8b0d92e1047963a6b2c6b1ddce11588
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 9 16:54:23 2012 +0200

    use sql instead of dql for the linker resource list and the childrenAction method

commit aed83fb535a3b6a48e246ccbbb0b530bce6787c2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 9 16:54:23 2012 +0200

    use sql instead of dql for the linker resource list and the childrenAction method

commit 2072e35d16d4159180d419709d988814e28f72c1
Merge: f3e5c63 831bd76
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 9 16:54:02 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c8a177bb557955d186d648eec63dbadae01da586
Merge: 72a0e1f c3f5661
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 9 16:54:02 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 831bd769233d6ab8aebba93852b1233b87b9cc74
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 9 16:51:58 2012 +0200

    Renamed directory of twig.js templates

commit c3f5661fe99a66739cef5bbe653db328ad32fa6d
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 9 16:51:58 2012 +0200

    Renamed directory of twig.js templates

commit fdff4a239e1ea12630e219f4b26d76e83feccaac
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 9 16:51:49 2012 +0200

    Renamed directory of twig.js templates

commit 6b06b4e4a284bd78e293862a6fdac4ade3fe057d
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Thu Aug 9 16:51:49 2012 +0200

    Renamed directory of twig.js templates

commit f3e5c636ae21f13cec3f486dfcea914b10ae104a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 9 10:09:17 2012 +0200

    fixes the directory delete method (flush() missing)

commit 72a0e1f549388f272b18db0bc80bf63eaa09d1ce
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 9 10:09:17 2012 +0200

    fixes the directory delete method (flush() missing)

commit 197fb501eedd9c7be30693e0ca7c5fd155834a4d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 8 11:56:47 2012 +0200

    persistence for the linker mode

commit 8c1caa21e4057f36ef67a899341ae4542ea1111f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 8 11:56:47 2012 +0200

    persistence for the linker mode

commit b870f65fec6c3ea9be95c6488efacf67bab2530e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 8 10:49:25 2012 +0200

    tree peristence for non lazy node

commit 51e28f69741ec747f0458dc4e5aa3a7f682ee4f6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 8 10:49:25 2012 +0200

    tree peristence for non lazy node

commit f57720f7c2e3e5bc260ad45f14f8dbf36c114dc5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 8 09:49:22 2012 +0200

    keeping track of the current display mode for the resource manager

commit a2ec53d8a6d3857a27eb8f29e1dd30eb4f242817
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 8 09:49:22 2012 +0200

    keeping track of the current display mode for the resource manager

commit 964771f5080087db6b97155465956e196ac3b629
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 7 17:49:00 2012 +0200

    cookie keep track of the manager current mode

commit a35fbaff31355f1a91da89fd6fa2518bde2b9c1d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 7 17:49:00 2012 +0200

    cookie keep track of the manager current mode

commit e9fd3e7d42405202a48c30c6c27da1ad6cef9446
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 7 17:19:58 2012 +0200

    dynatree d&d conditions

commit 60eec4119cda35332f4384aeb81c43a6f91722c6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 7 17:19:58 2012 +0200

    dynatree d&d conditions

commit 756e35a22a009b85c8e2538c84d13238d10cf65f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 7 16:53:01 2012 +0200

    Spiral view can go back the the tree view.

commit 905c15814b313617894f09ea0db920c7da9aef78
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 7 16:53:01 2012 +0200

    Spiral view can go back the the tree view.

commit d19700e26d770c3d0ce2159186e9caf22675a411
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 7 16:35:04 2012 +0200

    creation draft for the spiral view

commit 6c781268764d81db6c8eab9c1d790ca36181ba6e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 7 16:35:04 2012 +0200

    creation draft for the spiral view

commit f16aafae821acc496c1ff835d822e999ef7b091c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 7 14:02:52 2012 +0200

    resource manager accessibility version

commit 02e49539b811f4e4ab3f7320fa215ab365e69f3e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 7 14:02:52 2012 +0200

    resource manager accessibility version

commit 5e657e0482d59b38d6d89fec6120d8e061beae81
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 7 12:11:50 2012 +0200

    documentation & checkstyle for resource_manager.jquery.js

commit 3d9b242e0de5ad4f6cdbe6ffdde48fc771e4f27f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 7 12:11:50 2012 +0200

    documentation & checkstyle for resource_manager.jquery.js

commit 6ea8c319ddf5ac554ce534eddaaaa3048f43936b
Merge: 1a929aa d09ed9e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 7 12:08:13 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Workspace/show.html.twig

commit 157642acb387b6adc4e32414ee078f8cc8f75300
Merge: c8668bf 924bcb5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 7 12:08:13 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/views/Workspace/show.html.twig

commit d09ed9efc9c3e6ea50813f794c2269a9db33a2bf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 7 11:27:03 2012 +0200

    filters & some fixes for the hybrid mode

commit 924bcb5df7421197bbb8a7ce9c795353a291129c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 7 11:27:03 2012 +0200

    filters & some fixes for the hybrid mode

commit 1a929aa73ab7643d27b72496c2a9e07fbe475bc6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 7 10:25:21 2012 +0200

    Fixed outdated script references

commit c8668bf2733f296a0b006e3500451c5851ec0b58
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 7 10:25:21 2012 +0200

    Fixed outdated script references

commit 8ba2644e0e66cf61c48f90e21f566c688961095b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 7 09:28:39 2012 +0200

    hubrid view for the resource manager (draft)

commit f1de7a6608a56f323415a23da4616e32bd87fe6d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Aug 7 09:28:39 2012 +0200

    hubrid view for the resource manager (draft)

commit 031ef61b022147c8266fd6ad4fb59ccdd1fea785
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 3 14:07:21 2012 +0200

    fix the resource tree cookie when a user clicks on the switch_mode button

commit 1da9ea2b42fc8bf3aa23c819408b1f955a579b7e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Aug 3 14:07:21 2012 +0200

    fix the resource tree cookie when a user clicks on the switch_mode button

commit b0c3fbef66eb9d32171d55a8decb21f4957774c1
Merge: 062c5fb e12da76
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 2 11:33:37 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit fa7a1b7beeefaaf3fb2aff89a00cee91f8fba46c
Merge: 96b856a c7a7b2b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 2 11:33:37 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 062c5fbf3cc93f90d3222e1a9f082fb7bf133894
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 2 11:33:11 2012 +0200

    moves twig.js to the FrontEndBundle

commit 96b856aea5d36fae2ec976f3639a3a570e0c424c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 2 11:33:11 2012 +0200

    moves twig.js to the FrontEndBundle

commit e12da766ec30526556f30155cca1e7fe15bc19cc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 2 11:32:31 2012 +0200

    Removed jquery.cookie.js from resources (see front-end bundle)

commit c7a7b2b26598bbce2db95729ae83a66b2556d27a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 2 11:32:31 2012 +0200

    Removed jquery.cookie.js from resources (see front-end bundle)

commit 7568e24fa021531cbe3783ae5edc34e60f7ee53c
Merge: e3a8c50 35ce3d8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 2 11:29:36 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit d866b34f70fdd8a6fdf1bb38f74c6cee62d27c5f
Merge: 1ea7b66 fee29c7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 2 11:29:36 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit e3a8c501f480762c51902cfafebfd7f80602d881
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 2 11:28:39 2012 +0200

    Added assetic:dump command to installation process

commit 1ea7b66e30078152d7c60c8600002e9e3e6f7594
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 2 11:28:39 2012 +0200

    Added assetic:dump command to installation process

commit 35ce3d8954872af47784bbd34439e3a6e8c50162
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 2 10:01:54 2012 +0200

    fix a persistence error for the data tree

commit fee29c7f0dea2daca852dc678b0555b5805a2fb7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 2 10:01:54 2012 +0200

    fix a persistence error for the data tree

commit c9bf63df3d0c6bb1f9e659576fc89bc11bf1feb2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Aug 2 09:55:01 2012 +0200

    fix dependencies

commit e8538ee25f1ef9d7ffde0586ac2e13b3fc5039f7
Merge: db09048 f0f8d18
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 1 17:45:38 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 52d84bbab957f2f1521972ce5dd9f2f44f746159
Merge: 0941cb8 3d109d0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 1 17:45:38 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit db09048b429017a827a5da441e29fe3c97d1caa9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 1 17:29:08 2012 +0200

    persistence for the resource data tree

commit 0941cb870b9d104a358bd9a860da524217471017
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 1 17:29:08 2012 +0200

    persistence for the resource data tree

commit f0f8d180d29556c9b8f1b899aeb82b7f66c61ca5
Merge: 649faf4 2dcd483
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 1 11:51:57 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 3d109d085ed5b4e4fc9e456f01d516ebd5c4174c
Merge: f12b149 7c72b5a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 1 11:51:57 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 649faf4ad66afac8642e5fd9f70a51dba14fd818
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 1 11:16:59 2012 +0200

    Renamed translation files

commit f12b149260470f81564d87bc68bd098bb1e9bcbc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 1 11:16:59 2012 +0200

    Renamed translation files

commit 2dcd483a05a909b9c148108c6d446a7f45926363
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 1 11:15:03 2012 +0200

    js d&d refreshes the data tree

commit 7c72b5a25b8f29a7dd532aee2a0419fa899d9d8f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 1 11:15:03 2012 +0200

    js d&d refreshes the data tree

commit 73db5161fa68a7e73d478efc773b0fc1baf592f0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 1 11:11:47 2012 +0200

    Renamed claro settings to platform parameters

commit 71f129ee4d5148426d1e3f4980bb4c38122e239e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 1 11:11:47 2012 +0200

    Renamed claro settings to platform parameters

commit 49259c9539df0e1a4cefb700f50377282b5f3e7b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 1 10:49:39 2012 +0200

    Removed ClarolineException and Exception folder

commit 039574d8b5a295e897726db5ef9386e69c7fad19
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 1 10:49:39 2012 +0200

    Removed ClarolineException and Exception folder

commit ef8079b71dbea7ac6f603f3e16381897890e2798
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 1 10:31:55 2012 +0200

    instances renamed if they have the same name in a directory

commit 067665defd95d4eca4eba275f75f1d07b9f21ed2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Aug 1 10:31:55 2012 +0200

    instances renamed if they have the same name in a directory

commit a413346adaa7a448121fdaea7b3aedb32ef1a731
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 1 09:55:24 2012 +0200

    Moved SecurityException to Library/Security

commit cb9b6f4f95264059c175017b6cabb7c0d6f388bd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 1 09:55:24 2012 +0200

    Moved SecurityException to Library/Security

commit bd513f45d7060f7880e3962463cbc8fce31da38d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 31 16:08:13 2012 +0200

    Cleaned dependency injection extension

commit 1895e53f6beaa441dc12debf29d03566845036ef
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 31 16:08:13 2012 +0200

    Cleaned dependency injection extension

commit 91094c9ddda4d35476d294e023ab05867ec0a5ba
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 31 16:06:53 2012 +0200

    Removed test bundles

commit 84c4e050d4710199ee0f5b5beb579fca2027adc2
Merge: 1fbc47b 7af76cc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 31 15:47:58 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 63f3d59f89a2d4e91aeb283c57a3d121aed3e254
Merge: 0eb567a 2b711a6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 31 15:47:58 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1fbc47b01612cc4bed8a96e23915439c876870e1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 31 15:47:36 2012 +0200

    move name from resourceInstance to AbstractResource

commit 0eb567adca6904f32673dcca9c47a9b8430ed4dc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 31 15:47:36 2012 +0200

    move name from resourceInstance to AbstractResource

commit 7af76cc706d22dda7033f31af244a6c59c917f12
Merge: 168549c 58a857c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 31 13:34:42 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 2b711a6a2bfa4b720f4080b268b3aa2695875cb4
Merge: 0a1aa26 f4979f6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 31 13:34:42 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 168549c0968a819e413d02e2e7a22a763bc37ad8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 31 13:33:22 2012 +0200

    Moved front-end dependencies to a dedicated bundle/repository

commit 0a1aa26c59b4adcec5a2eaa7e82a20d6bfea9b86
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 31 13:33:22 2012 +0200

    Moved front-end dependencies to a dedicated bundle/repository

commit 063efa51bdd97dedc80ea69e175e46019a7d16b9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 31 11:02:02 2012 +0200

    no more menu for resource types in the resource manager

commit 43b93236f49d4b940e294b6821b94857bbfa90f3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 31 11:02:02 2012 +0200

    no more menu for resource types in the resource manager

commit 58a857c4e01ad1417a84f07518e32d6a0008f596
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 31 10:44:57 2012 +0200

    javascript resource tree filter functionnal

commit f4979f64042dc311cb60c39abc8d58d433e08336
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 31 10:44:57 2012 +0200

    javascript resource tree filter functionnal

commit f82fd9e2becb89c06db5b713de665f0cd0c27e7e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 31 10:29:29 2012 +0200

    Fixed platform language handling

commit 2f6701d8d8e814fde44129a6007b2eedb3153ddc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 31 10:29:29 2012 +0200

    Fixed platform language handling

commit 3e18207ec4072e687d575ebe21f93ee2fad61af3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 31 09:11:00 2012 +0200

    fix resource_manager.jquery.js checkstyle using closure linter

commit 3ee0fb48435d55d8e03739733d03b2b111a64013
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 31 09:11:00 2012 +0200

    fix resource_manager.jquery.js checkstyle using closure linter

commit 9615916e2706f9cc601ab6613f0e1a028e5743c3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 30 17:14:34 2012 +0200

    some js cleaning

commit 8be2d8a069445e06f7490c560c49d2779e737b66
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 30 17:14:34 2012 +0200

    some js cleaning

commit 87cc12f79ee059c5f186868f694652d5a5e38bea
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 30 16:17:03 2012 +0200

    linker multi export is now functionnal and tested

commit 034583443e64cbf91798bc251afa4595ec55b060
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 30 16:17:03 2012 +0200

    linker multi export is now functionnal and tested

commit 804bb8bcffe2518249ef59f5b6622dffe8cf7cf6
Merge: 41a519a e50217e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 30 14:59:47 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Library/Resource/Manager.php
    	src/core/Claroline/CoreBundle/Resources/views/Resource/instances.json.twig
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceControllerTest.php

commit b4280d9cd3f3fa689b4cb7d6b7382e90be2f7197
Merge: e419d8e 206a70f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 30 14:59:47 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Library/Resource/Manager.php
    	src/core/Claroline/CoreBundle/Resources/views/Resource/instances.json.twig
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceControllerTest.php

commit 41a519a95c17aaaf8a4c0b90025b16596efdba6f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 30 13:59:47 2012 +0200

    remove the linker export list and refactor + test the classic one

commit e419d8ecab856fb7c56f5a9b29c6dee0f161efe2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 30 13:59:47 2012 +0200

    remove the linker export list and refactor + test the classic one

commit b67ec797c3f966f7f6d2c3a9cabbf91e013e68f0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 30 11:24:05 2012 +0200

    move some logic from the ResourceController to the resource Manager service + code cleaning

commit 0ddae2fa11bb19c17541370ff37d03f6cb3742a3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 30 11:24:05 2012 +0200

    move some logic from the ResourceController to the resource Manager service + code cleaning

commit 206a70fb04a1244f70eb3904ae0f5b8358d0b0a4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 30 10:42:37 2012 +0200

    Fixed wrong path

commit df4c787cdca40642702a57157d412fec735e0593
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 30 10:10:46 2012 +0200

    resource manager filter (draft)

commit b542289a2c19fafd0e0c17b358e1fb551de193a8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 30 10:10:46 2012 +0200

    resource manager filter (draft)

commit 5a6a7eef2fb2f433f845b5e9dda81f67d69771c6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 27 16:11:09 2012 +0200

    Fixed build configuration error

commit e50217e5f83fafd5c504d48dd3f2de30fefe814c
Merge: 4fc7c41 18a0f4f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 27 15:49:04 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceControllerTest.php

commit 6d02b92abdc72ff97cd534cbd14ac281f7df524b
Merge: 618c41d 2689c69
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 27 15:49:04 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceControllerTest.php

commit c36bc0715c8ef77e5d56a58a9d253d08de76a4e3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 27 15:45:49 2012 +0200

    removes a var dump

commit f52b37ff2bf270586117dcc7edcf7b7ed46ab16f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 27 15:45:49 2012 +0200

    removes a var dump

commit 0637baf5d0102e3d217a348fa3cbd15c9cdcde55
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 27 15:45:21 2012 +0200

    split the multi export

commit fffed135e6de1a5e26a4e92a5955fb3863f54d83
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 27 15:45:21 2012 +0200

    split the multi export

commit 4fc7c417e10dbd4af3ea4d44e9e9a661cde254ff
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 27 14:27:40 2012 +0200

    Upgrading to Symfony 2.1 :
    - development scripts moved to app/dev
    - README updated

commit 618c41d39aa83a936e8ae0b2297ef34ec3e945a7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 27 14:27:40 2012 +0200

    Upgrading to Symfony 2.1 :
    - development scripts moved to app/dev
    - README updated

commit 2fd7706e6bb9c059a3ced58f7b69c6f092c490cf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 27 14:57:38 2012 +0200

    AjaxAuthenticationListenerTest

commit f3d21000eacb3e7aceffbfe6692f08052f6ab077
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 27 14:57:38 2012 +0200

    AjaxAuthenticationListenerTest

commit a4055073fe97e7baae816d7733733867eeb3a758
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 27 14:32:55 2012 +0200

    early js filter system for resources

commit 64a8e38d8570db4cd57117a1ac874a4001aa9d50
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 27 14:32:55 2012 +0200

    early js filter system for resources

commit 18a0f4fd50df232f6c4624c9a26d2e0730f8c4e8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 27 12:43:18 2012 +0200

    improved resource tests

commit 2689c69a6a216de7330d4ba9b252437b32cfc741
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 27 12:43:18 2012 +0200

    improved resource tests

commit e864ab7d5e635e9b6acb704d1363fef4a0708a2d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 27 11:00:08 2012 +0200

    removes addslashes() and use '/' instead

commit 0889f0e9645f94661ffc21861f8a0d5dd4fb2cf9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 27 11:00:08 2012 +0200

    removes addslashes() and use '/' instead

commit 85073e1cf2f4c05e7e2b93371e84b1113dfbc4b9
Merge: 6e03943 80efc2a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 27 10:49:20 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit fe61a57b937abfe169da74291bec3ca1edd6bfcb
Merge: e83bf40 91d20ef
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 27 10:49:20 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6e03943d6c10549de1a513d0a6c27b97ad2a94f9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 27 10:49:00 2012 +0200

    addslashes

commit e83bf40dbe2e54ce50d8d4be2b1feb3516591682
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 27 10:49:00 2012 +0200

    addslashes

commit 80efc2ab2329a9b2cac804983f9040505e4fde17
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Jul 27 10:02:26 2012 +0200

    Fixed call to apple icones

commit 91d20ef41a7eb35ca81f631b15fc82d71c1fc4ab
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Fri Jul 27 10:02:26 2012 +0200

    Fixed call to apple icones

commit 721e678639559897e620006fa4fff9c30b82cc59
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 26 15:07:24 2012 +0200

    test (filter interface for resource manager)

commit d0ea6cc58da544a3c79b70e56110b90a533c9183
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 26 15:07:24 2012 +0200

    test (filter interface for resource manager)

commit 023c15cf5089245a438468c6a1fcc8373dd3d271
Merge: c022e7c a8888c8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 26 10:26:18 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit c022e7cb9490384157fdd53447f5aa29a28f0e4e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 26 10:25:41 2012 +0200

    Upgrading to Symfony 2.0.16

commit 771bbcfde17562d47e6f3d12e5fb38e390f01596
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 26 09:24:12 2012 +0200

    resource controller almost fully tested

commit a8888c864308e91ea1de7f32de498ef8c311d9cd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 26 09:24:12 2012 +0200

    resource controller almost fully tested

commit 49d02aa240acb4b1de3f731db19c21178d0b082a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 25 17:52:20 2012 +0200

    improved resource controller test

commit b6d43a077c7c6be58a26e5ec32a1410c88c5d343
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 25 17:52:20 2012 +0200

    improved resource controller test

commit 7ddfa97882cf69e88d3682786cb180af0014419b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 25 15:33:15 2012 +0200

    link type removed

commit 85c96dcc28e6c0dcd050f1233fb79b3437a1dd63
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 25 15:33:15 2012 +0200

    link type removed

commit ce256873b66ffbbd5e3fb3fb9bf68e7586a1a282
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 25 15:17:10 2012 +0200

    custom icons for resources plugin

commit 3cba2c796f583e66c3068851a8fb629306f1ee7b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 25 15:17:10 2012 +0200

    custom icons for resources plugin

commit 9a9442825d663492f9eb8e3a892655ce93f3e86c
Merge: 1deb85c 8949eaa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 25 09:50:35 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 340eb444f3dd14595b717682aaae72cda17e4bc2
Merge: 8f5f9a3 005dde3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 25 09:50:35 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 1deb85c7efb981daf8c6330ff6fff4749eeb2e46
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 25 09:34:55 2012 +0200

    resource manager: creation from the linker mode

commit 8f5f9a3d1b2aa11fa0708881df9529b43de5ddd0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 25 09:34:55 2012 +0200

    resource manager: creation from the linker mode

commit 8949eaaddd00d145f15335fa88ef1a894a59f659
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Jul 24 15:17:51 2012 +0200

    Added the "--extension=php" option on phpcs because windows version scans css and js files by default.

commit c309f9bef7c3fff235898af5b6420117a4301360
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 24 10:51:41 2012 +0200

    getPath method for the ResourceInstance entity

commit 6078a140792e83e725470f0caa277cc99b26436a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 24 10:51:41 2012 +0200

    getPath method for the ResourceInstance entity

commit d39f1b5d7d982399276efe3d810cc2587645f18e
Author: Emmanuel Gervy <gervy.emmanuel@gmail.com>
Date:   Tue Jul 24 10:37:21 2012 +0200

    Fixed charset problem with unit testing

commit cc182f72a81b2f8847da430b17150e8641f2210d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 24 10:25:41 2012 +0200

    mutliple export by types

commit e1fda3138b6e244fc40fa3ec021ea05bffc9d060
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 24 10:25:41 2012 +0200

    mutliple export by types

commit d7ae4334489171f89606239494e68db216e3048e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 23 16:51:16 2012 +0200

    fix the multi export (lazy loading taken into account)

commit bfca464fa3dc8278b36ddfac9edb794c45b6be57
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 23 16:51:16 2012 +0200

    fix the multi export (lazy loading taken into account)

commit fb1ac455aef3395bb38758c15a920ceec434dc0f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 23 15:39:28 2012 +0200

    multiexplort always returns the resource absolute path

commit b266622625869f2161091dbfb1b64b2da2da6b53
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 23 15:39:28 2012 +0200

    multiexplort always returns the resource absolute path

commit 005dde3928a4b5e45888d1831c3dfe45f0204d9e
Merge: dc28610 42bb575
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Mon Jul 23 13:58:20 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 4bf1100da56d0d8724c0fa210007a859e066f32e
Merge: 58bf758 f94af55
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Mon Jul 23 13:58:20 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit f94af55c4afc6987fec080550d3e0fc956afda4d
Merge: d156cd5 06da008
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 23 13:56:35 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 42bb5750dbb47c74ebef81cbf3e1d77140fbeae2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 23 13:54:10 2012 +0200

    directories always added by copy

commit d156cd5465795a5b7c3ce1cd6af6cc2d8de059b0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 23 13:54:10 2012 +0200

    directories always added by copy

commit dc286104155b4ebef600f1a435ba48b7e167bf2d
Merge: 3fcc2ea 65b01d6
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Mon Jul 23 13:24:47 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 58bf758d1fd19e680f055b8f408c006757d8388f
Merge: 3c82bde 06da008
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Mon Jul 23 13:24:47 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 3fcc2eab3c5936804c8ac917d0e1d1c74dc05485
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Mon Jul 23 13:23:10 2012 +0200

    Some refactoring for HTML5.

commit 3c82bde13034e2c2214cb4ef9b61c5066dbd27bf
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Mon Jul 23 13:23:10 2012 +0200

    Some refactoring for HTML5.

commit bf33ca3a8defaf9aaa8ae31943b7377f83810d2d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 23 09:43:46 2012 +0200

    workspace_show.js resource tree shows resources for the 'by type' mode

commit b0455ec30cfcb2f6fb345c6d67f9cff8e2acd588
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 23 09:43:46 2012 +0200

    workspace_show.js resource tree shows resources for the 'by type' mode

commit 04273a33b68fce3f9f0c4da66be4849557b7463e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 20 15:10:45 2012 +0200

    resource manager "tool" mode show resources instead of resourceInstances

commit 4d283686d3f688898ea83312831220e54b6a8ebd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 20 15:10:45 2012 +0200

    resource manager "tool" mode show resources instead of resourceInstances

commit c903cfd570401c6a3f2da1f0eb73d582a35e3a9f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 18 16:37:07 2012 +0200

    multiple export selection (untested prototype)

commit 26c0aac97e432714b2d09bc4e685c81409475e60
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 18 16:37:07 2012 +0200

    multiple export selection (untested prototype)

commit 6fd8dcc57066e9f042a3be596e595701466a06dd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 18 15:06:14 2012 +0200

    fix forum subject creation

commit 06da00828860ed41c6288c8edc65e169ce325b5e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 18 15:00:14 2012 +0200

    Fix bad class name

commit ad7a238726f61c46634fc622242b1f1c8ec30e86
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 18 13:11:20 2012 +0200

    Use absolute paths in phpdoc config

commit b1fbf0475c63d9c6ff59c798f3a9a9d3f7eb6abc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 18 12:05:20 2012 +0200

    Fix typo

commit 8e71382e043da90537a227204aaff98fea4879cf
Merge: d14c14f 14e9a40
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 18 11:56:16 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit d14c14f19b2f8bb765d5fd9fddedd65989b08061
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 18 11:48:59 2012 +0200

    Fix phpdoc configuration

commit 65b01d6e3e24a608bed7b7cbdfa328e4ad18b57e
Merge: 1ea130a 4bed521
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 18 11:26:03 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/Entity/Resource/AbstractResource.php
    	src/core/Claroline/CoreBundle/Tests/Controller/DirectoryControllerTest.php
    	src/plugin/Claroline/VideoPlayerBundle/Controller/VideoController.php

commit 14e9a40339827abb9eb0bf61ba52eb10d520692c
Merge: df5c6a3 d921481
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 18 11:26:03 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/Entity/Resource/AbstractResource.php
    	src/core/Claroline/CoreBundle/Tests/Controller/DirectoryControllerTest.php
    	src/plugin/Claroline/VideoPlayerBundle/Controller/VideoController.php

commit 1ea130a85a4b17606dd3dcf6cc4d4fc3659aaeeb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 18 11:11:35 2012 +0200

    checkstyle

commit df5c6a3b12feeaed35da87b1cbe48600cc7eeb86
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 18 11:11:35 2012 +0200

    checkstyle

commit beff5bf2a479ca9948e06f37d3651f7a7f874a14
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 18 11:04:11 2012 +0200

    export event added

commit 975b551770173a6f97eed63ed11b8b3a1e72bd87
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 18 11:04:11 2012 +0200

    export event added

commit d921481e304865e5b88602da8ce1424e1c71a8a4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 18 11:00:06 2012 +0200

    Fix phpunit config

commit 2062bc3060d8e0cf91f08b5ed2c29f6a0259a6fa
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 18 08:52:39 2012 +0200

    Modify build configuration

commit d80bb600dbf2a9dc7e80acd7bbf5bb0c1ff92be9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 17:13:22 2012 +0200

    Fix plugin config paths in install scripts

commit e37a540c01491aed5e3c681630c5a55707b7b84b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 16:48:12 2012 +0200

    Add plugin config files deletion to ci install script

commit 4bed521ea5aef2d0dd48805b92793fc5c32c07fc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 16:02:55 2012 +0200

    Remove 'copy' field from resource instance entity

commit b526224230747615466aaa74a7618dcb452eb7ed
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 16:02:55 2012 +0200

    Remove 'copy' field from resource instance entity

commit e008fc1630865f01d5d48188b61ca3d7340edfee
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 16:02:02 2012 +0200

    Use php predefined exceptions instead of InstallationException

commit 32b8aa1735ae6276580eb61eb736b433b0ae30ab
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 16:02:02 2012 +0200

    Use php predefined exceptions instead of InstallationException

commit e50f87db698801a61e9fba44fa40a3f2fc4530dd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 15:21:18 2012 +0200

    Modify abstract resource getShareType method to optionaly return result as string

commit 98a33e1375ef6ab0dba14a156da37ff12885b101
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 15:21:18 2012 +0200

    Modify abstract resource getShareType method to optionaly return result as string

commit 0b6b143fc877854d807235f8a4c6d62bc8c448e3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 15:20:09 2012 +0200

    Remove reference to symfony security class

commit 7989208164d0093c08461a9c000ef6e358b05275
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 15:20:09 2012 +0200

    Remove reference to symfony security class

commit fc22a0edafdd0b4c1f457f42ca1c27566cfef9df
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 13:17:18 2012 +0200

    Remove unused variable

commit 05be4696f83d6c80f0bc8b9b4c590dad936b9b22
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 13:17:18 2012 +0200

    Remove unused variable

commit 5494053fb7b4baaf8ed3af8ff813b27017cc589c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 13:16:04 2012 +0200

    Remove symfony security class

commit 443c0b97f614adca78a94ba0df84144b4633e5a8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 13:16:04 2012 +0200

    Remove symfony security class

commit 823cbd697ac8b62abf09558d1e6890fe609ece11
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 13:15:16 2012 +0200

    Remove player depency injection and video player bundle

commit 294d41e96a92f700df5cbf62a1f9cca94d20e3af
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 13:15:16 2012 +0200

    Remove player depency injection and video player bundle

commit c19e843f2527491d2290da7a54f4731461b5d4ae
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 13:11:53 2012 +0200

    Remove plugin depency injection class

commit ba209a447619197b1fb560f336abac0cd0f7b127
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 13:11:53 2012 +0200

    Remove plugin depency injection class

commit cbf31ded8262ecd5baad3e8617b78e4f02151918
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 13:10:34 2012 +0200

    Remove unused variable

commit ba01b2bf1dba0f8c39f1e97f7656aba75ef80cfd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 13:10:34 2012 +0200

    Remove unused variable

commit dfc6b747e14e00e3f5977e75a05da4eee17528ef
Merge: c5a2f8c 38aec94
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 12:02:26 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 896898fb8a43a27cd6f3015577f056ecf9a2f2cd
Merge: 6b72803 ad48c48
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 12:02:26 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit c5a2f8cbc987357e89aec93c0a4a843a7c6d3e84
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 12:00:15 2012 +0200

    Fix checkstyle violations

commit 6b72803dc6cc9b6b96b1b6054a02938af9333e4a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 12:00:15 2012 +0200

    Fix checkstyle violations

commit 38aec94f7aa80f0dfd00e52a38a29ea94c0a04f3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 17 11:57:02 2012 +0200

    checkstyle

commit ad48c489fadcd22f39dc5dfdaf6c9d9a9d2a9f5d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 17 11:57:02 2012 +0200

    checkstyle

commit 0f07beedba47e7077644976cf02a5a8befc125e7
Merge: b12a4b1 d8cc23d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 17 11:48:42 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 09157b19e41e04517f370f562f22ccabe8eedb70
Merge: 2892bfe 44a0bca
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 17 11:48:42 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit b12a4b1285241c949b49fe902165cce97b346b05
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 17 11:45:58 2012 +0200

    fix resourcecontrollertest

commit 2892bfe52e41c45f39008a02c7047671882ce22f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 17 11:45:58 2012 +0200

    fix resourcecontrollertest

commit caa3a2312bf711e560029f82ac2b5bcd9ccbb77c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 17 11:26:32 2012 +0200

    js resource tooltip

commit e2c4e549f462db376e8707ef291777c11576b7ee
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 17 11:26:32 2012 +0200

    js resource tooltip

commit d8cc23d1f9777485017b8ce417ea0ab89d2e52ae
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 11:24:45 2012 +0200

    Remove reference to extension

commit 44a0bca784a575fbef575a88ef0a4b5baac54503
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 11:24:45 2012 +0200

    Remove reference to extension

commit 9c9c907aab4af847b558e35f70961e9ceeab6042
Merge: e3f79f5 1215757
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 10:59:46 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 41c87e4ccb2328e37971bbcdd881692c7652abd2
Merge: 2a4f986 3716071
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 10:59:46 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit e3f79f5e95c73b217cec36f385164a2e195de3a7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 10:57:17 2012 +0200

    Plugin system refactoring :
    - removes the tool/extension sub-types
    - rewrites the plugin validator

commit 2a4f98614b2f99e9d954d953e433a063cb9db8c6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 17 10:57:17 2012 +0200

    Plugin system refactoring :
    - removes the tool/extension sub-types
    - rewrites the plugin validator

commit f85e69038afbc7eacddabb16383ccf391e301f1b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 17 10:43:59 2012 +0200

    resources can't be moved/copied unless it's done by the creator or the resource is public

commit 204dfacebf9501fac151ee5ae766db281176ba9d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 17 10:43:59 2012 +0200

    resources can't be moved/copied unless it's done by the creator or the resource is public

commit 3d3e9c9600e205449b1557f608e05dab7f5a2f09
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 17 09:24:32 2012 +0200

    fix a bug due to a missing '#' and a missing 'root' property

commit 25c1b569ab077907e2b2f94b6677a8bf8e67148d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 17 09:24:32 2012 +0200

    fix a bug due to a missing '#' and a missing 'root' property

commit 121575776552855e38a38086b4ccad3aba577548
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 16 17:14:56 2012 +0200

    various js fixes

commit 37160711dbcd4e19bea4452d03473f5168174124
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 16 17:14:56 2012 +0200

    various js fixes

commit 550d02afdb882930cdec3f1d1e4dce19c685f0fd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 16 15:06:05 2012 +0200

    switch mode button for workspace_show

commit 93a046a58a0014028761c959514e7d5692f0825f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 16 15:06:05 2012 +0200

    switch mode button for workspace_show

commit c625f5bfa561c3be28d5f71b7141c97c1df7a759
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 16 13:26:11 2012 +0200

    javascript jquery chain

commit 191afefb32ed631119ab0eda42f1df5ace9cd77f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 16 13:26:11 2012 +0200

    javascript jquery chain

commit 6190fb1097f0ef4c2002adc89551cc13bf74ace3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 16 13:13:58 2012 +0200

    dashboard linker

commit 552cde634b80195f2b09dd8a539a71eba7f59caf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 16 13:13:58 2012 +0200

    dashboard linker

commit 948db2f6e47d142e32094da298981458aeaabc84
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 16 08:51:29 2012 +0200

    folder organization

commit 70016d2b088542c3328db23840d73dce41086553
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 16 08:51:29 2012 +0200

    folder organization

commit 4fd3f66b40203d54b54a36592de90fc854db4ec4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 13 15:17:24 2012 +0200

    menus only display "listable" resoures

commit ca647bb1f7e2c3e453c9317ea3d8abe700cc9a01
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 13 15:17:24 2012 +0200

    menus only display "listable" resoures

commit 8e038563c85c1883d76abe1f5b33177bc907f244
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 13 15:12:04 2012 +0200

    fix resource manager d&d graphic bug

commit cfe54787f139ea397472830a5b80808c77e05ca4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 13 15:12:04 2012 +0200

    fix resource manager d&d graphic bug

commit 6849eafee1a1e565d1c21ecb901755999aeb98da
Merge: 7f5fd0e d89c4e5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 13 14:27:27 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6a415c00a12e5d979ad769b5d26ff0c2416d6f9d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 13 14:24:24 2012 +0200

    removes the resource manager 'copy' option

commit 7f5fd0e30e6841c04916a8359c2e6424e3d44b1b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 13 14:24:24 2012 +0200

    removes the resource manager 'copy' option

commit f699d3a5bb7306ff726ac8eeb069231bee3a8aec
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 13 14:20:32 2012 +0200

    resource picker always adds by reference and can only fire custom actions

commit 5a1ced8a7e779c4c1a38f4acb62d522d2d9ebc2f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 13 14:20:32 2012 +0200

    resource picker always adds by reference and can only fire custom actions

commit 71be838790e398e16c72c8a1cd234cc3973e1ff0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 13 13:35:14 2012 +0200

    js resource manager as a jquery plugin with 2 different modes (picker & manager)

commit a3cfc0beda2ee2b3f6b2945c35813adffc246712
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jul 13 13:35:14 2012 +0200

    js resource manager as a jquery plugin with 2 different modes (picker & manager)

commit e490d464cfb4b588392df90d2f996ec23c5130ed
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 13 11:23:16 2012 +0200

    Fix checkstyle violations

commit 9e132fc1ad03c3cd88993cee658c831c91436adc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 13 11:23:16 2012 +0200

    Fix checkstyle violations

commit d89c4e52f32cb22e5eb5af21f6d7cba7504c7e67
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 13 09:11:21 2012 +0200

    Add a trailing new line at the end of deps

commit 8b6d75d1b584d59ebe530597ca93f9a8b377445d
Merge: 003440b 76213c1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 12 16:48:54 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/public/js/claro_utils.js

commit ea6b0a92b0d3f7250727fe275458b06c5f324602
Merge: 272fe3b d7cc01a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 12 16:48:54 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/public/js/claro_utils.js

commit 003440be8d671dcf61f2e2132a7fd60ca5bc0caf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 12 16:46:25 2012 +0200

    fix resources tests

commit 272fe3b070e77ac3cdec4f8d9952e4c1ebed7075
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 12 16:46:25 2012 +0200

    fix resources tests

commit 76213c147efcc1b4a85ddc7e239944d38042cbc0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 12 10:50:39 2012 +0200

    Fix reference to js function

commit d7cc01a0720ae5ece6e8016469f17f5da4cd75e4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 12 10:50:39 2012 +0200

    Fix reference to js function

commit fd0bb62aa8215a66ddf401a213080010980502c3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 12 09:13:08 2012 +0200

    Rename and fix desktop security test

commit 6dea30cbc9eab588727bc8907acf2ca5d7a52d9b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 12 09:13:08 2012 +0200

    Rename and fix desktop security test

commit c36b69004eb9e2695abf4a29d8f93192845eed00
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 12 09:06:15 2012 +0200

    Javascript coding conventions

commit 9ea53d2d6e3bad81d184728dca3c37509f5126dc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 12 09:06:15 2012 +0200

    Javascript coding conventions

commit 23bb8f2cf841182472946f23cb102eca0feb1743
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 12 08:52:03 2012 +0200

    Use anonymous namespace for javascript utils

commit d454504c333c1613fc1ea93b1a3978e8ab5ee5e2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 12 08:52:03 2012 +0200

    Use anonymous namespace for javascript utils

commit f51ffdaadf8bb0c087ff4c9d9e40e503a5fce812
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 11 17:03:48 2012 +0200

    fix DirectoryControllerTest

commit a319b0546c9907ae11d7c8309f5eef65bad1d8ca
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 11 17:03:48 2012 +0200

    fix DirectoryControllerTest

commit 5832630c7f1c04129808c3ee1554ce8d5c5a0c94
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 11 16:53:33 2012 +0200

    Use type hinting in method declaration

commit 568214fabdf2afa3d321e6d375687d645b66df2e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 11 16:53:33 2012 +0200

    Use type hinting in method declaration

commit ef52e5c5b67f338381145ea00469a42c559fbcfa
Merge: 4d80e23 2ab5562
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 11 16:41:29 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit f38bdef5813dcd1414ac7b0afa87040f37142ecd
Merge: f06e4ad 5df2d18
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 11 16:41:29 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 4d80e239c3dbc9169553389d0136b48a79645c4f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 11 16:39:32 2012 +0200

    Fixing plugin installation (+ tests)

commit f06e4ad9a79422a168c87d5ac8dab961eab21ec4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 11 16:39:32 2012 +0200

    Fixing plugin installation (+ tests)

commit 2ab5562804293aa873ebfdeda7ae9ec859d3060b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 11 15:40:47 2012 +0200

    refactor addToWorkspace function

commit 5df2d18aa744e47ea8909ab4fcb8d0dcfcd93b46
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 11 15:40:47 2012 +0200

    refactor addToWorkspace function

commit 7a892a79994cde674a597d7d8efc75ae292e00cf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 11 14:47:39 2012 +0200

    move getCheckedValue to ClaroUtils and fix the move route

commit 97b8b9ce3e4c68a81a4ebb3d161ab35649e20138
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 11 14:47:39 2012 +0200

    move getCheckedValue to ClaroUtils and fix the move route

commit 5c1f2776ce342571d3462298dc986cf01de569b1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 11 14:31:37 2012 +0200

    removes a useless $request variable

commit dad1d436de37d714d966801a4c579f32790ce08d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 11 14:31:37 2012 +0200

    removes a useless $request variable

commit 2783c9d6926a2e83666d04fb359d872809c4082e
Merge: 97878c3 f02d390
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 11 14:29:18 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/public/js/dashboard/resource_manager.js
    	src/core/Claroline/CoreBundle/Resources/views/Dashboard/resources.html.twig

commit 8681c71265617a9fbdce9559ba4ab2fbd84564f5
Merge: 1d83051 6663e5a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 11 14:29:18 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/public/js/dashboard/resource_manager.js
    	src/core/Claroline/CoreBundle/Resources/views/Dashboard/resources.html.twig

commit 97878c340fd9815cdf15c947772891fa449b6c91
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 11 14:14:40 2012 +0200

    resource controller ajax error handling

commit 1d8305123dadaabe6583e9fdb3873910742bf089
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jul 11 14:14:40 2012 +0200

    resource controller ajax error handling

commit f02d3908bbe4363a43571af3e528e543d8c3a0e9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 11 11:47:56 2012 +0200

    Resource controller cleaning/refactoring

commit 6663e5a53fb2e51bbce0467fd9ee5aff547de8e5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 11 11:47:56 2012 +0200

    Resource controller cleaning/refactoring

commit 813e6df1341b3228b6da447b18c7ef2a120c038c
Merge: 0b93bf5 28791c7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 10 16:01:57 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/plugin/extension/Claroline/HTMLPageBundle/Controller/HTMLPageController.php

commit d40bceae8bfd7c75138b54e259d3719001cd7d8a
Merge: f492582 8d1aaca
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 10 16:01:57 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/plugin/extension/Claroline/HTMLPageBundle/Controller/HTMLPageController.php

commit 0b93bf5845be9aa1bc22cddc7471291e98dd4bbe
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 10 15:28:49 2012 +0200

    More cleaning on resource controller...

commit f492582afc0cd3ffae9be3ccdb2927c96b1134dd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 10 15:28:49 2012 +0200

    More cleaning on resource controller...

commit 28791c76888c1d394ee70c6868ea85d0675a9138
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 10 15:18:26 2012 +0200

    forum refactoring

commit 8d1aaca27ef7afa5a11b49929f88b0ff90c2842d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 10 15:18:26 2012 +0200

    forum refactoring

commit a18d34021944d1cfbee60a4cf48ce26add12764f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 10 13:43:51 2012 +0200

    htmlpage bundle updated

commit cea7cf3e937640321d538709c30b64aa0d52f478
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 10 13:43:51 2012 +0200

    htmlpage bundle updated

commit 60ef9b165cf4d8b202867ca3a62293665c53ddef
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 10 10:48:03 2012 +0200

    plugin installation requires a set of actions for each resource type

commit 04ee3b1ea2061a8cc2aac5d212ccfefd32e5f38a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 10 10:48:03 2012 +0200

    plugin installation requires a set of actions for each resource type

commit fb25ad030816adb57b6935388d38cf2598b912ee
Merge: 4150cde 6f6fd9f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 10 10:38:01 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php

commit 075fde0d42c17aa0a022e4440f5ad3b62909c1bf
Merge: 60fd416 fe09904
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 10 10:38:01 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php

commit 4150cde6842e552f93888245776ebc2067b5d298
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 10 10:30:22 2012 +0200

    Cleaning...

commit 60fd4169de0eb4c1d3aac066b14bae83a65272b7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 10 10:30:22 2012 +0200

    Cleaning...

commit 6f6fd9f94064bf3c5999d6ce568b86a5794ba027
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 10 09:52:29 2012 +0200

    resource manager refactoring (draft)

commit fe0990412ceb2b580f9f157e3c2ea21625a6104f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 10 09:52:29 2012 +0200

    resource manager refactoring (draft)

commit f58eaabe31906e11912fac44c9e2544a1843f4f5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 10 08:51:00 2012 +0200

    resource manager refactoring (draft)

commit 6b673eb48b67e2323cb7998ace078040f749849a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 10 08:51:00 2012 +0200

    resource manager refactoring (draft)

commit c1dacd3df55b7050d3b2f880ebbdb6401469e6ec
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 9 15:28:22 2012 +0200

    Resource controller refactoring (draft)

commit 03646f9e3bbc02db7e2e223be125aa31217f2c99
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 9 15:28:22 2012 +0200

    Resource controller refactoring (draft)

commit a4c6cf11f0b183cd7fc60a3ca2af64ec776ea61c
Merge: 43889a2 0e39671
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 6 09:03:17 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit eaf3c079bd03395518d6990b88390c1eedaeb4eb
Merge: 185d9f3 4309d02
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 6 09:03:17 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 43889a2a6274aa7fb1e74c140932e2a0f5b8b608
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 6 09:02:31 2012 +0200

    Alternative resource controller draft

commit 185d9f3a97fad36c981bb3e68e713bc56a419189
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 6 09:02:31 2012 +0200

    Alternative resource controller draft

commit 0e396718931e21cd2eb5bebae0fe78b4cc782a3d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 5 17:17:07 2012 +0200

    dynamic contextual menu (every single resource test is broken)

commit 4309d0269bbb1bcdc396257d3e3d825e9838d309
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jul 5 17:17:07 2012 +0200

    dynamic contextual menu (every single resource test is broken)

commit 706418563621c4a19ed4c6474dcfeb76c85041d2
Merge: 67b5352 4112951
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 4 10:49:18 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	deps

commit c02e5c780ba65be6a91dd6944a34994c72285df5
Merge: 43a975b d70e927
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 4 10:49:18 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	deps

commit 41129514c776a6edd9dd04d36745b48a61f2cae4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 3 12:47:04 2012 +0200

    fix resources tests

commit d70e9270b0b3ba00b55c2dab63b594a2199919ac
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 3 12:47:04 2012 +0200

    fix resources tests

commit 67b535218892a3bb74d02a3225aee2e8a6e7ce24
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 3 11:25:12 2012 +0200

    Removing reference to bazing expose translation bundle

commit 43a975b00ba08acf108c2c8e8c2417eb65b10e51
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 3 11:25:12 2012 +0200

    Removing reference to bazing expose translation bundle

commit c4301e8aebcfb9312da8711f788723f97f6832b5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jul 3 11:24:32 2012 +0200

    Fixing twig.js dependency

commit 6c60bd357e3b2e652765adce351544aafb622fae
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 3 09:17:06 2012 +0200

    creating a workspace will also create a root directory

commit 51bbf060b8cd3058335e48423c3851bfae3de849
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jul 3 09:17:06 2012 +0200

    creating a workspace will also create a root directory

commit 941dd0f95c7d8ead0a4d3b9bfceba47811c32f64
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 2 14:14:13 2012 +0200

    rename twig.js folder as twigjs

commit 5d375a8198b08c0ba28ee2fe84b52bc4b98a2797
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 2 13:55:05 2012 +0200

    resource manager only displays resource instances if view is granted

commit edce3bc675bba267f5f8296f8abe7c83261b269d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 2 13:55:05 2012 +0200

    resource manager only displays resource instances if view is granted

commit 64ee4c50ca92657d3b16d31e779def1a6287d25e
Merge: 57bd67e 569b4d9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 2 10:43:44 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php

commit 57bd67e93ccc679271a337973170ea5df3d5b9f1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 2 10:32:23 2012 +0200

    remove useless file

commit f951cb817e209dca8bd4f3b5dfc2a7f23f7d5c18
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 2 10:31:04 2012 +0200

    Resource instance Acls can be changed for a specific role/user

commit 57151a311b3cfb5818b26be45eafae7a0fd65fbf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jul 2 10:31:04 2012 +0200

    Resource instance Acls can be changed for a specific role/user

commit 569b4d91a414a84b4ea951520161323f31f3b8a8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 28 11:27:20 2012 +0200

    Fixing call to old "setResourceType" method

commit 8619b39c1dbb4932c9e878a076d96e2f9fa3f138
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 28 09:50:03 2012 +0200

    twig.js added

commit 97c6a09ad04c290a90a8b90628388eed719d4470
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 28 09:44:00 2012 +0200

    claro properties page for right management (not functionnal yet)

commit cb304a746c47b60c562fd08d89442f4a80586258
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 28 09:44:00 2012 +0200

    claro properties page for right management (not functionnal yet)

commit 47054322808493d2a22eb2050e27893348bcfac9
Merge: cb5c0b2 fb56cf9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 26 13:06:33 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Controller/DirectoryControllerTest.php
    	src/core/Claroline/CoreBundle/Tests/Controller/FileControllerTest.php

commit 008c67acd460592bafd6236d17f03a8d76ec1b3a
Merge: ea6cb66 68ed7d0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 26 13:06:33 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Controller/DirectoryControllerTest.php
    	src/core/Claroline/CoreBundle/Tests/Controller/FileControllerTest.php

commit cb5c0b2b448cdb9114cbb1f7782ec45246052aa8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 26 12:05:14 2012 +0200

    move method for resource defined in resource manager

commit ea6cb66238f6dc5695dfee369b893d4ee45fcd0c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 26 12:05:14 2012 +0200

    move method for resource defined in resource manager

commit a20acfbce8370e9f22115df3a699297f474e28e6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 26 10:56:06 2012 +0200

    add method from resources controller uses an object as parameter instead of a form

commit 2f954b9c2a6f88a0e8c27d43a74b971e8012a941
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 26 10:56:06 2012 +0200

    add method from resources controller uses an object as parameter instead of a form

commit 68ed7d03bf5fac87e2f016f41766c33498f84eed
Merge: 6f7d610 5cefb6f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jun 26 10:23:48 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/Form/TextType.php
    	src/core/Claroline/CoreBundle/Tests/Controller/DirectoryControllerTest.php
    	src/core/Claroline/CoreBundle/Tests/Controller/FileControllerTest.php

commit fb56cf93d0da8d126c8af94cb9b4b6294d6b2b88
Merge: 0398a59 d8ac21d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jun 26 10:23:48 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/Form/TextType.php
    	src/core/Claroline/CoreBundle/Tests/Controller/DirectoryControllerTest.php
    	src/core/Claroline/CoreBundle/Tests/Controller/FileControllerTest.php

commit 09c731f107fbf8059ca5b5344b85559bcb4da436
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 26 10:03:55 2012 +0200

    funcunit added

commit da52e29411cf88722f5d3dfafaa15262fac995f6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 26 10:03:55 2012 +0200

    funcunit added

commit 5cefb6f26ea4d556e5ef7191464ed6e86db75153
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 25 17:03:59 2012 +0200

    resource controller refactoring: resource creation and navigation

commit d8ac21d9df1c8e38ab5a47406f32e0c392c22605
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 25 17:03:59 2012 +0200

    resource controller refactoring: resource creation and navigation

commit 6f7d610ee15731b33792a5524320f441e1080c78
Merge: 3368cec ac0a4b3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 25 15:10:29 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/Entity/Resource/ResourceInstance.php
    	src/core/Claroline/CoreBundle/Entity/Workspace/AbstractWorkspace.php
    	src/core/Claroline/CoreBundle/Library/Workspace/Configuration.php
    	src/core/Claroline/CoreBundle/Repository/WorkspaceRepository.php
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/index.js
    	src/core/Claroline/CoreBundle/Tests/DataFixtures/LoadManyUsersData.php

commit 0398a59ad88288f9dbac97a8261ac765f366bc5d
Merge: 728c4fd 72f5569
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 25 15:10:29 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/Entity/Resource/ResourceInstance.php
    	src/core/Claroline/CoreBundle/Entity/Workspace/AbstractWorkspace.php
    	src/core/Claroline/CoreBundle/Library/Workspace/Configuration.php
    	src/core/Claroline/CoreBundle/Repository/WorkspaceRepository.php
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/index.js
    	src/core/Claroline/CoreBundle/Tests/DataFixtures/LoadManyUsersData.php

commit 3368cece60b1e7325a63c3353d8fcd70c9fad527
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 25 11:21:11 2012 +0200

    Code cleaning

commit 728c4fdce0d01321635ee739c34312adae9d9cb2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 25 11:21:11 2012 +0200

    Code cleaning

commit 5c125e92f4a2d737db15753ae5971e35327596a4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 22 09:22:06 2012 +0200

    removes workspaceId from defaultaction & open actions parameters

commit 18016dfe629e154edcfa8eef46a0c3864db428d0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 22 09:22:06 2012 +0200

    removes workspaceId from defaultaction & open actions parameters

commit 38c2b2035b87b3f814a5aa520a046e130d2c9e10
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 21 13:47:16 2012 +0200

    fix resource js d&d

commit 35b6829b208726ba9e32a3406e174cf54754f179
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 21 13:47:16 2012 +0200

    fix resource js d&d

commit 8a9e470d3f6d1ca7d842feb14fbbecb2f8fe9349
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 21 13:28:11 2012 +0200

    js resource node expanded properly when a resource is created

commit a78014e80bc8e581052ed8832dc8197510a4eeef
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 21 13:28:11 2012 +0200

    js resource node expanded properly when a resource is created

commit ac0a4b3c99ef20fd26dbef5540d30762c50b1c9f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 21 11:40:01 2012 +0200

    refactor sharable for the resource creation

commit 72f556907f5642077331899b2e3c45b37b9eb827
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 21 11:40:01 2012 +0200

    refactor sharable for the resource creation

commit 8af9a10d749d0a7f6ccc09a10480e57834a55731
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 21 11:29:00 2012 +0200

    directory controller renders a different template depending on the workspace context

commit 849b7d72a18f962e759633ce26433d8023d8a901
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 21 11:29:00 2012 +0200

    directory controller renders a different template depending on the workspace context

commit e2922b4f1989c27afb6b375ebe2bdb9d183d4b4b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 21 11:14:36 2012 +0200

    WsController sent with ResourceController DefaultAction

commit d7d0e99902ad39e8a263c3c5b49546e6f2359a73
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 21 11:14:36 2012 +0200

    WsController sent with ResourceController DefaultAction

commit 322f3d5ad85f592fe8198472c90e095856d34b4e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 21 09:50:05 2012 +0200

    Refactor Workspace type

commit 643cbfcaac6d8beb50d3fe2e392c81834e785f5d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 21 09:50:05 2012 +0200

    Refactor Workspace type

commit 5c390ebdbf74b6ffbe3a8cf56332a406e0f19efb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 20 15:39:15 2012 +0200

    form validation & tree update for resource options the form

commit afce87fcb69fff0a7171d44e396753e0b3bc7dd7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 20 15:39:15 2012 +0200

    form validation & tree update for resource options the form

commit b99301672e94a711696f7321152b2bd15cbb3ad2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 20 13:47:56 2012 +0200

    js will check the response headers when a resource is added

commit 8ead63a87f22f34b05f92392defb98765bc6d6c8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 20 13:47:56 2012 +0200

    js will check the response headers when a resource is added

commit bc85541b1abadab50733417a83f13ca3303f56c0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 20 13:16:46 2012 +0200

    Resources options can be edited

commit 840b8e2f327483839a5664f11e7a40d56cf2c7f1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 20 13:16:46 2012 +0200

    Resources options can be edited

commit ce2b11ff022b07c9f88ef74046ec8a12653566b1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 20 10:24:47 2012 +0200

    removes a useless line

commit 51df64423aa9b13e4cfdd37481f9af223d5919d3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 20 10:24:47 2012 +0200

    removes a useless line

commit 68c9eacd605e8fb0a4e4f84e20f2a25258b3e809
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 20 08:57:14 2012 +0200

    claroline phpunit resource test suite command

commit c50b31d9fa4c68d6c4bfb2dd629644cb94f77088
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 20 08:57:14 2012 +0200

    claroline phpunit resource test suite command

commit 046561d284c8b0a54709198b17dcc01de3cb74bd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 20 08:56:55 2012 +0200

    remove a use

commit 97ff111b20e71b55c2edd01219065807c3a61466
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 20 08:56:55 2012 +0200

    remove a use

commit 4c912b015185ce737fe6297a1568373e9b9d51a9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 19 17:27:50 2012 +0200

    Improved addToWorkspaceAction & moveResourceAction. D&d is working for the resource index.js file

commit 06ecf9ba4ec4615a6db1d6544ea28608da641d55
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 19 17:27:50 2012 +0200

    Improved addToWorkspaceAction & moveResourceAction. D&d is working for the resource index.js file

commit b2ad4ab9ab2be7066467048440f44853e7faf3bd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 19 11:06:54 2012 +0200

    firepicker verifications: resourceinstances entries can't be duplicated

commit 992c693907dbbee264dc821810bbf00e3b58be82
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 19 11:06:54 2012 +0200

    firepicker verifications: resourceinstances entries can't be duplicated

commit 2f11363e295943c296586fd05ca4bccb8e701cb8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 19 10:48:11 2012 +0200

    fixes filepicker delete event

commit 70360230035a880c3ac296b7180c5ad392bb7ebc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 19 10:48:11 2012 +0200

    fixes filepicker delete event

commit 9ca823fa592e05d10203ebed699deb9365690e95
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 19 10:30:47 2012 +0200

    forms only display navigable resources types with js (still not working with php)

commit 6acda4701d76d1118c97f83e644c6bf6e1a49fe2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 19 10:30:47 2012 +0200

    forms only display navigable resources types with js (still not working with php)

commit 77cf340eb01622338887c56a952657df1c6122b9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 19 09:38:46 2012 +0200

    fixes some clareFilePicker.js & index.js  bugs since the refactoring

commit 898af6d4e418cc66d492ff152211e6625b939ff7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 19 09:38:46 2012 +0200

    fixes some clareFilePicker.js & index.js  bugs since the refactoring

commit e9ad40833c30fa79eee619fd144c192050667199
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 17:35:39 2012 +0200

    update tests for resource Controller

commit 27eedd978726644a653c7b326415ba8eccf9c2c6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 17:35:39 2012 +0200

    update tests for resource Controller

commit 27d981d3f94436b2d109bfe500612428d115da34
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 16:01:08 2012 +0200

    private files can't be added to an other workspace + some directories fixes

commit f3b0c073cf3c5021113cd347a5a3da161ed7e76d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 16:01:08 2012 +0200

    private files can't be added to an other workspace + some directories fixes

commit c9e538d94333c8121cc29bdc39e6428eeb69be51
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 15:10:54 2012 +0200

    fix directory controller

commit 82fdf63b15312f0ad605907eee43f3413781cd58
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 15:10:54 2012 +0200

    fix directory controller

commit 46ab67e91a2d8efabf75eaa94ed175e5a00ffb8d
Merge: 572f3b5 f798249
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 14:27:34 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/Entity/Resource/AbstractResource.php
    	src/core/Claroline/CoreBundle/Entity/Resource/ResourceInstance.php
    	src/core/Claroline/CoreBundle/Resources/public/js/jquery/claroline/claroFilePicker.js
    	src/core/Claroline/CoreBundle/Resources/views/Resource/dynatree_resource.json.twig

commit 847c77b847853ae78e31e828b53401e436ff01bd
Merge: cb47e7a 80285bb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 14:27:34 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/Entity/Resource/AbstractResource.php
    	src/core/Claroline/CoreBundle/Entity/Resource/ResourceInstance.php
    	src/core/Claroline/CoreBundle/Resources/public/js/jquery/claroline/claroFilePicker.js
    	src/core/Claroline/CoreBundle/Resources/views/Resource/dynatree_resource.json.twig

commit 572f3b5731170ce5dfad3f35ade14a722fe59ac4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 13:56:47 2012 +0200

    filepicker: alert when a private res is added to a ws

commit cb47e7abc91f41c85387b9e2eb9e8e05874f2610
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 13:56:47 2012 +0200

    filepicker: alert when a private res is added to a ws

commit f7982490dff8e14de1e95fa97e87745fa220aeaf
Merge: 239981a 8c62009
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 18 13:55:13 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/FileController.php
    	src/core/Claroline/CoreBundle/Entity/Resource/AbstractResource.php
    	src/core/Claroline/CoreBundle/Entity/Resource/File.php
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceControllerTest.php

commit 80285bb5a7635b06109ec8459c1959e7c00fefb9
Merge: d1988e2 634577b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 18 13:55:13 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/FileController.php
    	src/core/Claroline/CoreBundle/Entity/Resource/AbstractResource.php
    	src/core/Claroline/CoreBundle/Entity/Resource/File.php
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceControllerTest.php

commit 239981aa10c59b46a8c514684111ec12d39dd1ba
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 18 13:34:25 2012 +0200

    Code cleaning and refactoring (4.1 : Entity)

commit d1988e2fb8f68716128c8e6730f6aebee53ae732
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 18 13:34:25 2012 +0200

    Code cleaning and refactoring (4.1 : Entity)

commit 0e8b66d60ff97df1296dbb2f91419805ba311b8f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 13:11:37 2012 +0200

    sharable change to "share_type"

commit d0417e22c75149227de3d8830fc041cd6c9a36de
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 13:11:37 2012 +0200

    sharable change to "share_type"

commit 5f035f579eea24681a987e5b617a798f04836e45
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 11:29:46 2012 +0200

    isSharable in the JSON response node + fix entities booleans fields

commit 6aedb14c6f14c09f309751c7b5e58de6cfa55c1d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 11:29:46 2012 +0200

    isSharable in the JSON response node + fix entities booleans fields

commit f58e7333a1236d1dce9657d15ae839c658a1f9eb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 10:51:39 2012 +0200

    var_dump removed

commit f48c80a0698043f783ad7f0cc34bf1978c425776
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 10:51:39 2012 +0200

    var_dump removed

commit c60bd4da74127e23ecbf3b9e83cc13ce3ffe36cf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 10:51:12 2012 +0200

    fix the sharable property (missplaced partenthesis and wrong method)

commit 08b9523ab214f913130eb9e5f64dbab4d3bf4bfa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 10:51:12 2012 +0200

    fix the sharable property (missplaced partenthesis and wrong method)

commit 23c589f949be43bd1fa7188f1240691447b6325e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 10:15:36 2012 +0200

    sharable property displayed at the form creation

commit 72fe3da80991dac7a1b63f8ae76612c2b4662e79
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 10:15:36 2012 +0200

    sharable property displayed at the form creation

commit 8757d524fb8af9c0a669cce456d190e18bf2d646
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 08:59:33 2012 +0200

    assets:install web --symlink for factory_install_dev

commit 7890860554d1e1356804218eacba2921e1495898
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 08:59:33 2012 +0200

    assets:install web --symlink for factory_install_dev

commit b541fb1a7c1d0d3d0e094566a4b0b5ed80c24f8a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 08:53:18 2012 +0200

    fix ResourceInstanceRepository getListableChildren method

commit c6117db37a94f2b2b655adb994e45584b044db7b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 18 08:53:18 2012 +0200

    fix ResourceInstanceRepository getListableChildren method

commit 8c620090a5480a60a3e36a9861f6d06856d60575
Merge: ea75e49 e53e8d8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 15:25:29 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/Resources/config/services/services.yml
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceControllerTest.php

commit 634577b6573f2c52e2ab0d5d5aae6b9d8bedb485
Merge: c07a57c c8b8c0d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 15:25:29 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/ResourceController.php
    	src/core/Claroline/CoreBundle/Resources/config/services/services.yml
    	src/core/Claroline/CoreBundle/Tests/Controller/ResourceControllerTest.php

commit ea75e49521cdafa4627af454e61bf2a9e2024eb6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 14:58:44 2012 +0200

    Players are now Controllers instead of Managers

commit c07a57cffc442bbc122ef90602ef18ffc0d6556e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 14:34:12 2012 +0200

    Move MimeType to AbstractResource and remove MimeType entity

commit 6a614e63f613ec8d9c0b53e49441332a7a6ead6a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 14:34:12 2012 +0200

    Move MimeType to AbstractResource and remove MimeType entity

commit e53e8d8eca7310f35869952bcc205ab8283fa48a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 15 14:20:26 2012 +0200

    Code cleaning and refactoring (3 : DependencyInjection)

commit c8b8c0dba36bb04dbf34559e512f94729fd6851a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 15 14:20:26 2012 +0200

    Code cleaning and refactoring (3 : DependencyInjection)

commit 2367dea54e0f8daa71d5372527a3256dbfc95ae1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 15 11:45:42 2012 +0200

    Adding web/HtmlPage dir to .gitignore

commit 1b163fb24c84de1f367be5467d64726b3089a7f2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 11:42:25 2012 +0200

    removes some unused variables

commit c568267775736c7c17b6ba7cc2abc517c0fd6ce3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 11:42:25 2012 +0200

    removes some unused variables

commit 8d5b2f798bfa2c19c32dd328cc41202e3e5c0eee
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 11:38:44 2012 +0200

    removes some unused variables

commit e4ed61b9605cbcc5f2e771ec4a63b6fa5c4e5013
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 11:38:44 2012 +0200

    removes some unused variables

commit d9664a812896803e1eecb747b42add24ebde7d05
Merge: 0bc3ee3 cd9528b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 11:15:40 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 799fbd0684de1f689b66ced25ed374edb7e46f75
Merge: ccfa26c 9b1a8f0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 11:15:40 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 0bc3ee3140187e7e68d298d534e10f02500b3285
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 11:14:42 2012 +0200

    adds a todo

commit ccfa26ce774827cce815715a190b1f8ef9229a0b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 11:14:42 2012 +0200

    adds a todo

commit 93340107783c91c57086a9ec90a425483e57057b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 11:13:09 2012 +0200

    new ResourceControllerInterface

commit bb8773c7d8dc7a6bbca4c60be044d78a00369879
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 11:13:09 2012 +0200

    new ResourceControllerInterface

commit cd9528b82b7b9b06749e9a954f9dfd9f909755dd
Merge: 5fe7557 2943e79
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 15 11:11:11 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 9b1a8f02005f09e3a31a04b47b33d27259705b8b
Merge: fdbc9fa 8d5943c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 15 11:11:11 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 862975505f4a575333ef59313ca5fafd62003f3b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 11:01:28 2012 +0200

    removes every resourcemanager and uses controllers instead

commit 13e946f20cdc7de23ef021e02f11c6770413b27f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 11:01:28 2012 +0200

    removes every resourcemanager and uses controllers instead

commit 5fe7557ccfa33907e8836741e0dbb27216658b85
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 15 10:11:14 2012 +0200

    Removing unused 'file' and 'directory' routing files

commit fdbc9fa1156eef0b590f5d1636420c2f96883a69
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 15 10:11:14 2012 +0200

    Removing unused 'file' and 'directory' routing files

commit 803b7bc2a80b838b2497d0f9b0f101399602718e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 15 10:01:06 2012 +0200

    Code cleaning and refactoring (2 : DataFixtures dir)

commit 00557950d8209c4be4b7b4e9c354468b6b64bf2e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jun 15 10:01:06 2012 +0200

    Code cleaning and refactoring (2 : DataFixtures dir)

commit a50b90337f42fb13cd2b0086a5c737b21611423f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 09:50:56 2012 +0200

    fix uses

commit f95b3ea9ba8b0cbb1aebccac1eb9a8b1f53f3fae
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 15 09:49:29 2012 +0200

    removes forum manager, it's now a controller

commit 2943e79b3c5f8264ceb9454df460d49a77af8baf
Merge: ef9583b 975e42f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 14 16:16:55 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 8d5943c303cc29343092e55daef36cbbe03e8297
Merge: c3fed88 83d1839
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 14 16:16:55 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c3fed88f8eb533845ca0db8ff955d3ae727831e1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 14 16:15:57 2012 +0200

    Adds a forum bundle for testing purpose

commit ef9583bee0449a1f5ff1ab07e663a0bdb2a5e6d5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 14 15:27:28 2012 +0200

    skips a test

commit cc33c4488099b3a5422ffb666e18a5a71e3f7520
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 14 15:27:28 2012 +0200

    skips a test

commit a2ae13b097b138d09fd02f70ebd22b6473804069
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 14 15:21:58 2012 +0200

    Adds a user to abstract resource + resource type fix

commit 8390dd1da5378e517447b764fb4569f15d41ca1e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 14 15:21:58 2012 +0200

    Adds a user to abstract resource + resource type fix

commit 975e42fc5e3b5b6e1522924c6739142b831d8ff2
Merge: 292d62b 3daf669
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 14 13:33:54 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php
    	src/core/Claroline/CoreBundle/Resources/config/routing/workspace.yml
    	src/core/Claroline/CoreBundle/Resources/public/js/jquery/claroline/claroFilePicker.js
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/index.js
    	src/core/Claroline/CoreBundle/Resources/views/Resource/index.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Text/edit.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Text/form_page.html.twig

commit 83d18398fcaa88cc942cef1f1e840f42bccd2443
Merge: 4e41937 df72f8c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 14 13:33:54 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php
    	src/core/Claroline/CoreBundle/Resources/config/routing/workspace.yml
    	src/core/Claroline/CoreBundle/Resources/public/js/jquery/claroline/claroFilePicker.js
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/index.js
    	src/core/Claroline/CoreBundle/Resources/views/Resource/index.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Text/edit.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Text/form_page.html.twig

commit 292d62bd331e6ec3ea7afb71f1382e84e35d91bc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 14 13:07:08 2012 +0200

    Code cleaning and refactoring (1 : Command/Controller dirs)

commit 4e41937560e3556622ff1e0234069975478a411f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jun 14 13:07:08 2012 +0200

    Code cleaning and refactoring (1 : Command/Controller dirs)

commit b34b2d44b2049b4d30e092bb17f06ecf08adc2dc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 14 11:41:37 2012 +0200

    rename a controller

commit faf63293c4166d9e222464b932f3f51b156b83e8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 14 11:41:37 2012 +0200

    rename a controller

commit 14928483d13ac7e6824d484c515873044e5eaa5c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 14 11:17:23 2012 +0200

    service & controller not mandatory anymore for claroline resource plugin

commit 03d179d5528b205207d9842f408f54073e2cd951
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 14 11:17:23 2012 +0200

    service & controller not mandatory anymore for claroline resource plugin

commit dbbbcc282e6b859c01e6ab68252e3a4a09d35dea
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 14 09:57:15 2012 +0200

    Changes resourceType to abstractResource relation

commit 7facbcff84bce6e7729b1f1325ee29ce4ea59828
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 14 09:57:15 2012 +0200

    Changes resourceType to abstractResource relation

commit dddf8f6466d49b17f8378b48420498aab2a194fd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 13 14:35:57 2012 +0200

    adds "not done yet" comments for resourceController

commit 80cc11ac73fafb6dc90af3c2576e9e20d2c42973
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 13 14:35:57 2012 +0200

    adds "not done yet" comments for resourceController

commit 3daf669aa83f9dafd70d0ece1062e742a5519a2b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 13 14:12:23 2012 +0200

    removes ResourceManager service

commit df72f8cb425a175a2633eaa6d278c3be2ad8cbd2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 13 14:12:23 2012 +0200

    removes ResourceManager service

commit 3cb9db01af5598a7895de12911b73127726b0d22
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 13 13:57:44 2012 +0200

    adds documentation for resource managers & controller and refactor parameters/route names

commit 3a90e2b9ecc73801cf5b26d2629731083fad0dc6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 13 13:57:44 2012 +0200

    adds documentation for resource managers & controller and refactor parameters/route names

commit 7cad3e6475796e7fed5502fc2bebdee03291df6f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 12 12:58:44 2012 +0200

    fix resource controller test

commit 5103d7369dd1541e4cfd49d6c860b21377a657e2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 12 12:58:44 2012 +0200

    fix resource controller test

commit cb2166d9665ba9f66206b0650db6200ad39a1948
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 12 11:47:01 2012 +0200

    refactor workspaces template name

commit da2f2cb86483cdcd5c43afbdf7f075e8a4e02287
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 12 11:47:01 2012 +0200

    refactor workspaces template name

commit b29e9ed604eff983c8a00a24e12f967283579e5e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 12 11:31:58 2012 +0200

    refactor WorkspaceController

commit d0b1dfaee81d6d1687172c12b024ae42ca000050
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 12 11:31:58 2012 +0200

    refactor WorkspaceController

commit 35f0a588ee7caf58ce1fc208b8913a7ff8438a62
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 11 13:47:25 2012 +0200

    early diff system for texts

commit 9165a2125ea21078f62cbb8510058cc0a0b2a964
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 11 13:47:25 2012 +0200

    early diff system for texts

commit 0af75cf6c7a983b4abbf04ce6b7299af88e39199
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 8 15:34:23 2012 +0200

    more code cleaning

commit 746ff9996264ade3edc5b5784060fb1336723cd9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 8 15:34:23 2012 +0200

    more code cleaning

commit 46826cb4820e981ac9a09a94bfe32aee2286af00
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 8 11:04:46 2012 +0200

    more code cleaning

commit 3782edc5d488f95e3e8bca29396662a7b669a89f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 8 11:04:46 2012 +0200

    more code cleaning

commit 89be441cb0421e4d4f2f126320ce62b9025f58e4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 8 09:43:16 2012 +0200

    clean some code

commit cf1b55b16b8ab14d1e5527c2d99a1b16b5ea2eb4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 8 09:43:16 2012 +0200

    clean some code

commit e0ad74db96b820a8900f1d48eed450afef96783d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 7 17:17:27 2012 +0200

    revision listing for resources Text

commit 25794e2a1df5475f20c8f5d78fd8cc7e16d850d9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 7 17:17:27 2012 +0200

    revision listing for resources Text

commit 8cf769f4338e030b11f84391705c4afb328012f8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 7 09:12:27 2012 +0200

    testEditByRefAction for textManagerTest

commit 2c07e238185b4b57368e35f1b7a05cb3e5d2ede7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Jun 7 09:12:27 2012 +0200

    testEditByRefAction for textManagerTest

commit 9463644103e44d449d403957cc46e221d691e230
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 17:57:12 2012 +0200

    testDefaultAction for textManager

commit e168ad308fef0eaed36e58ba50afa2f09a1dee89
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 17:57:12 2012 +0200

    testDefaultAction for textManager

commit 418ec95779e52cf985d71f5dc8fef719978414f3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 17:19:38 2012 +0200

    adds TODO: remove type from defaultResourceAction

commit 4d5dc11dfc176744b54c632bc361d9e8e52d933b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 17:19:38 2012 +0200

    adds TODO: remove type from defaultResourceAction

commit 79675ce6212ef71b97817839a611b5626a69f8bf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 17:03:56 2012 +0200

    some fixes and TextManagerTest testAdd() method

commit 02e8c15cea753444c72fa6fb28d3cbefae633982
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 17:03:56 2012 +0200

    some fixes and TextManagerTest testAdd() method

commit ac755b2fb9566ebcaa5db20b67dbc00bc8cb15aa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 16:24:11 2012 +0200

    text revisions

commit d1fb217200c3dda971fcb13ef9c05f39727e83e4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 16:24:11 2012 +0200

    text revisions

commit c6b52e3dc1c58a095bd6168375ba5b8741cedd8a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 15:52:52 2012 +0200

    user for texts revision

commit 966395aae0ceddeceee7b6977551c240b1dfb3d6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 15:52:52 2012 +0200

    user for texts revision

commit a9b122716c31aabb4ff1ad89927c7d6df32fee09
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 15:41:23 2012 +0200

    refactor text storage

commit 4d55f63cb67f3fbaafcae3491e371d7f76edc6e9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 15:41:23 2012 +0200

    refactor text storage

commit 9e7255797cebce6c9ae6db3d766d79bb5302f543
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 13:56:57 2012 +0200

    editAction for text (not complete yet)

commit 7c384badd048c0b0db8d29f03def21fcbfa6349f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 13:56:57 2012 +0200

    editAction for text (not complete yet)

commit 17916effbd474d0ff07bfd8b3c187cd3f940c6af
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 11:02:04 2012 +0200

    defaultAction for textManager

commit 63637282dae61f73d2f2084a7430ece73de72cfa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 11:02:04 2012 +0200

    defaultAction for textManager

commit 9cecdb84ab4b58481875a4dbc95c80850c93a34e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 10:36:17 2012 +0200

    text can be added

commit 56c0013e4d2ca04d8f3460fed3c597f786c1b551
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 10:36:17 2012 +0200

    text can be added

commit 1d48567942c3332e4b4f61c114ea5704e57fa7e4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 10:36:06 2012 +0200

    skip validator test

commit 46766e59d72c6bb6e2ab733b1a6c9bf616ec30ca
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 10:36:06 2012 +0200

    skip validator test

commit ba9d39c5c3838bd0dc00af786c476e77a68c4c09
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 10:21:48 2012 +0200

    tyniMCE form

commit 601383294ab5dbdc13cfd713b768ff1767399a67
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Jun 6 10:21:48 2012 +0200

    tyniMCE form

commit d10ff3279ed3bfe081f954888e9a45e5c1a508db
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 17:34:07 2012 +0200

    tinyMCE editor as a form

commit 36a1605950078a84226efcb94891c5a276a615f1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 17:34:07 2012 +0200

    tinyMCE editor as a form

commit e5cbcd81fdab66ca61728209b41ae4250d29aabd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 16:35:25 2012 +0200

    put getForm() back in the Managers

commit 78f9e4fc11911bffe5f9473d4ce31f203e35bd6b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 16:35:25 2012 +0200

    put getForm() back in the Managers

commit 85c1d1b17e4edc51f1117963e97843d51431c288
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 16:09:02 2012 +0200

    refactor getForm() for resources: it's more flexible now~ more verbose too

commit 46fc0454a319dc9a803162a433fd534d81ca5d4a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 16:09:02 2012 +0200

    refactor getForm() for resources: it's more flexible now~ more verbose too

commit b49ec6c887344d080ca53dc5011ca6757139f4e2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 14:58:23 2012 +0200

    TextManager service

commit 081bff9840833866e01178dd60c3dd35448fbab4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 14:58:23 2012 +0200

    TextManager service

commit aac0dc97d948443d41dbdab33007e5eda4250e6e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 14:47:58 2012 +0200

    TinyMCE added

commit b08ae11905fd3bb4a6cae798ff2fea04320988fd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 14:47:58 2012 +0200

    TinyMCE added

commit d428239404ac837104e202a73ce6f00c236a9f9e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 14:36:35 2012 +0200

    Text Entity

commit 1065c1352636009c11b70125363f987212101d41
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 14:36:35 2012 +0200

    Text Entity

commit 7b85a7fd2a237556f519308b3f752551cedc63c2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 14:19:12 2012 +0200

    textType fixtures

commit ba8d49727a8255232b48ca74ada058e40a96f41b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 14:19:12 2012 +0200

    textType fixtures

commit b8ba5735358b63adb8bbe62e0ee7dc10e262df52
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 14:13:21 2012 +0200

    update table schema

commit 84f1186e6b94b8d21810efe040b762d2578020fa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 14:13:21 2012 +0200

    update table schema

commit 6188b7756ee25a6de9ad038f0d245f1a68d9c63b
Merge: 5d44a56 e4fb93b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 09:31:42 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6e6b3c5fd70c5eac4fad89b0da42b2886467e1a7
Merge: 3b00128 e88bb0b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 09:31:42 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 5d44a56b7e23a2f80912dec0da09af9ed066708f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 09:29:31 2012 +0200

    linker class beginning

commit 3b00128bf5eec4ca2dc490243504961f2d4fba9d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Jun 5 09:29:31 2012 +0200

    linker class beginning

commit 4bcc2198ff004ba8b35a81e0ec522fc259c1e2fc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 15:17:15 2012 +0200

    refactor findPlayerServ

commit ef60871a7a61ea6f0dffaaedc61759a605aea4e6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 15:17:15 2012 +0200

    refactor findPlayerServ

commit 8b8d23abe0d3e9b479484640e418aa77859ba2b5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 14:57:50 2012 +0200

    getJsonPlayerListAction()

commit b1ffe2be3f16e11ed0037bcbedfdfecf306cf142
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 14:57:50 2012 +0200

    getJsonPlayerListAction()

commit 82ac970c01546ab13e5a53f87680076863c6a6c3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 14:19:24 2012 +0200

    getPlayerName method for players

commit 1da2322e8a49c2e9349b86ff193f5445ab114786
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 14:19:24 2012 +0200

    getPlayerName method for players

commit deead75488f22822b7c925313b15c42576d29b4d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 14:06:33 2012 +0200

    add LoadMimeData for some tests

commit a2a8e78826db2951091ccdb4fa2aa9592f163300
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 14:06:33 2012 +0200

    add LoadMimeData for some tests

commit 8dcfc5e201ed7d404f9328c96e7cf3d478673623
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 13:49:22 2012 +0200

    fix FileManager

commit 6354a885c48e9ff6bdb8b34c4f703a5a6cef9ce2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 13:49:22 2012 +0200

    fix FileManager

commit 4bcab889558f3b6dd56cd279876fe05841feba00
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 13:41:59 2012 +0200

    uses the new Mime entity

commit 2ca7cca6646ed46b9e684a96ef3abf98f3810893
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 13:41:59 2012 +0200

    uses the new Mime entity

commit 72949030a01516f84d3b85ae1bf702a24ca4825a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 13:01:43 2012 +0200

    add Mime table + fixtures

commit 08e4bf74aa746689c1962cc58597dbd2206beef0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 13:01:43 2012 +0200

    add Mime table + fixtures

commit e4fb93b8380cc17015aca7d2eae989777e0c1ba9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 4 11:48:23 2012 +0200

    Moving resource files to Resources/doc directory

commit e88bb0b7dbef096c9517ca3e733487e5afdbc476
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 4 11:48:23 2012 +0200

    Moving resource files to Resources/doc directory

commit 67a235aec4ed7d3485ea57448f52c24d08cd9b8b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jun 4 11:39:11 2012 +0200

    Upgrading to Symfony 2.0.15 (bundles "vendor/bundles/Symfony/Doctrine*" can be locally deleted)

commit c133d5bc06f87023d052729c333abe68fa396069
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 10:57:24 2012 +0200

    OpenAction(plugin indexAction) needs workspaceId parameter

commit 06fb215a1059d6559d9c748bf27b8c336f0588a0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 10:57:24 2012 +0200

    OpenAction(plugin indexAction) needs workspaceId parameter

commit ed800b50073127d9958903aa5b2d2501a36f9095
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 10:10:57 2012 +0200

    fix pluginn uninstallation

commit 1fd25981e0f6cfc03232e576e17b6aca6dd2692e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 10:10:57 2012 +0200

    fix pluginn uninstallation

commit a63e9abb4020e9db87b8158ef86c10c082c8667e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 09:47:21 2012 +0200

    move ResourceType from ResourceInstance to AbstractResource (+some license changes)

commit a4e113b726cc0728ef64a9400c9cdc4a9099c60a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Jun 4 09:47:21 2012 +0200

    move ResourceType from ResourceInstance to AbstractResource (+some license changes)

commit 9e150a84f852f420365d978a751acdfe1128388b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 14:42:35 2012 +0200

    use mime instead of extension for openAction

commit 3379b2b8b0e2ca407e2fe324d10a86ca0990815c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 14:42:35 2012 +0200

    use mime instead of extension for openAction

commit 109ba5bbdfc0e96fb2b7de8ead7a08bc764f7aa6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 14:28:33 2012 +0200

    move mime to Resource/File

commit a261cb4e1a4e023ca634e7cba1123497ca697353
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 14:28:33 2012 +0200

    move mime to Resource/File

commit 719e69c46649feefcea3b270a7ac7ea16a222bf9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 11:47:36 2012 +0200

    fix ResourceTest

commit d017804b1625fa60696295e523625e5e8f4f86a2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 11:47:36 2012 +0200

    fix ResourceTest

commit 1c2141fa2e4ea553cccb6e7d92b26bf67968cdcd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 11:24:00 2012 +0200

    should fix abstractRoleSubjectTest

commit 8dbc4ae7503852e33477db03c775e4938fca36df
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 11:24:00 2012 +0200

    should fix abstractRoleSubjectTest

commit b6dbebcc05672de4d4b42db53d283d82387197fb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 11:19:49 2012 +0200

    fix ResourceExtenderTest

commit b5a1ce3e3f426d2266de6d19eb5436e4db2edf9e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 11:19:49 2012 +0200

    fix ResourceExtenderTest

commit d7d7ba0c0600004046d60e69a810cc57fa03e819
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 11:17:34 2012 +0200

    set sharable to false by default

commit 2a4c3de0de70e4cb28bf8a5a10371ded165ca6a6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 11:17:34 2012 +0200

    set sharable to false by default

commit 88a450fc069471b3bd90e7708024db306fd06c98
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 10:47:21 2012 +0200

    add is sharable field to abstractResource

commit 0cede64e0abbfb66a639e359f0da29cd7c12d445
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 10:47:21 2012 +0200

    add is sharable field to abstractResource

commit f7c0eef7dd2c8d6f862b7cafdc5a076e5d1a96c3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 10:32:16 2012 +0200

    links have a type (but it's not a foreign key)

commit f9e6c16105a47dd42eec1bf8e970f2ef4d366747
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 10:32:16 2012 +0200

    links have a type (but it's not a foreign key)

commit 7fc404b05e6173526d1218cf3a33c86e8325fb48
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 09:59:31 2012 +0200

    update CommonChecker

commit bed539ed956f59394b37b4d56053feef53d1a568
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 09:59:31 2012 +0200

    update CommonChecker

commit c0e33a9f0483fc2e839b573007fd3df8afee608d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 09:30:57 2012 +0200

    licenses added to file form

commit eeddcbf12e2680913e8a181c81fd4875fd058ad2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Jun 1 09:30:57 2012 +0200

    licenses added to file form

commit f2a4175754eee169e5d3dd858fa5417843082d4d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 17:31:31 2012 +0200

    controller method wich can give the JSON license list

commit 8a4780fdb3a22d8d54a466ff0869aa37a63758d8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 17:31:31 2012 +0200

    controller method wich can give the JSON license list

commit a27eca585a4aa8610a81c0751177f8cf2ea0ebd8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 17:31:16 2012 +0200

    license field in resource table

commit 2f2d148fc07f6aa93415ec27d05b5be4fe35f820
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 17:31:16 2012 +0200

    license field in resource table

commit 95139b7d56cf0156e8acf91de5ef97464a10fd19
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 16:58:41 2012 +0200

    some license fixtures

commit 4e404943dc8006fc16231449878db83cb52ce192
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 16:58:41 2012 +0200

    some license fixtures

commit 867e87411b8dbd25f15674ffa5583a960d0f0f35
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 16:22:39 2012 +0200

    License Entity

commit a1dcd58741aaa0aa55f6c8515f60390d4597d58b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 16:22:39 2012 +0200

    License Entity

commit d85dcaf25449b7b8b20f2e0b1a7247cb302860ee
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 15:13:45 2012 +0200

    cleaning databasewriter

commit b02ea10ea2880f9d54848768dd68bf2580b22a5f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 15:13:45 2012 +0200

    cleaning databasewriter

commit 3765c4d6d3923a2319e715fcc8687e34431a061e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 14:56:59 2012 +0200

    adds a condition for the commonChecker

commit f8156e80bc7ae5d8056b0f6b09b28ee8cd88da04
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 14:56:59 2012 +0200

    adds a condition for the commonChecker

commit cae7730f9ce66423c3a194e41acc706e893a5248
Merge: d1b57ab 06d35bf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 14:17:27 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit f16d746edfef889574db665ad7721cab202d11e1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 14:16:33 2012 +0200

    refactor openAction for ResourceController

commit d1b57aba8b2b4e0f93985ab43f07fde3ab417ab3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 14:16:33 2012 +0200

    refactor openAction for ResourceController

commit a591b96e478e378e28d16d68755fb8c1f2754daa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 14:15:07 2012 +0200

    skip installer test

commit 5af4944ca0f6c9b58980b093fd2cb73c97fe7f50
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 14:15:07 2012 +0200

    skip installer test

commit f1dc524d2810500bd422d1651569334353ee2ccc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 12:04:09 2012 +0200

    refactor openAction

commit e58e8efe6db59172fb7aae52252182c22c291307
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 12:04:09 2012 +0200

    refactor openAction

commit e5722840779f37eafb8f3bed9dc521f7be6e43fb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 11:14:01 2012 +0200

    link default action & some fixes

commit 8691941a894b466347cf8ee2c6fcd22e1fb71479
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 11:14:01 2012 +0200

    link default action & some fixes

commit b564c04ee0e40185cd04a22c1bde0d8f47538312
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 10:50:19 2012 +0200

    checkstyle

commit 2e6d242f7c4fbd8bf0601fe74b554168ac52a5a1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 10:50:19 2012 +0200

    checkstyle

commit f6f9d4891a6e541781cca2113193b4b0093b5679
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 10:45:46 2012 +0200

    add link entity

commit db6eb403763828038dd3ba31b79eb77cea1309b5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 31 10:45:46 2012 +0200

    add link entity

commit 3ebc80c47eceb4ebeecc735dbb972dfc9bd19375
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 16:49:19 2012 +0200

    update HTMLPageBundle

commit 9ef15219915dbc018548a88950b143060b86bff4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 16:48:58 2012 +0200

    update services .yml file

commit d2730ab68a8142ecf3eb9913e254afda6b964bc2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 16:48:58 2012 +0200

    update services .yml file

commit 050224e765f31322d137eacc0083323279547c40
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 16:48:22 2012 +0200

    update the plugin installation: a new field (extends) can be declared. Removing a plugin won't always remove every resources attached to it.

commit 152b52753b966f1ca344e9184bb2931efb8de19c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 16:48:22 2012 +0200

    update the plugin installation: a new field (extends) can be declared. Removing a plugin won't always remove every resources attached to it.

commit e8102b01ef2104e59d57f7d358d72f682b4bd5b9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 16:46:26 2012 +0200

    update database (new field in resource type)

commit 800b4e8730ec74802c4718b297853108ca2f7ff1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 16:46:26 2012 +0200

    update database (new field in resource type)

commit 16fae5ff2a9eb5bb06b91ffbb8fb0833fcef58c0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 16:46:00 2012 +0200

    new getId() method for Entity\Plugin

commit bf24ecd48e5b6fbf1a6509a909272ea696005dc5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 16:46:00 2012 +0200

    new getId() method for Entity\Plugin

commit d9466f3b29710dcda72379a3d4f9051c67e2b0ef
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 16:45:31 2012 +0200

    ResourceType can have a parent

commit 0918fa88c7051fdd817ec3a3b55c7df2dfd12435
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 16:45:31 2012 +0200

    ResourceType can have a parent

commit a3bd3975add6cae3acf2fdf9cfe70fcc77826bd5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 13:40:19 2012 +0200

    resource manager readme

commit 309efffec3a53a455d5ae1cab087df508cc8635a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 13:40:07 2012 +0200

    add todo refactor openAction for resourceController

commit 01e79cdd252f7a83da604154159c1bedfe7fc2ab
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 13:40:07 2012 +0200

    add todo refactor openAction for resourceController

commit a33cf22a3ccf77c0d47c2b87fd4b19c5bcc1b74f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 13:21:10 2012 +0200

    on delete set null for resource type id in resourceinstance table

commit 0b439b4ab204ac54655ad9b015be8b4c24f8180f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 13:21:10 2012 +0200

    on delete set null for resource type id in resourceinstance table

commit 498db0aaa90bd93fe1ec1045ec63ed1805548b8e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 12:52:33 2012 +0200

    fix commonchecker expected location

commit c3d013576fb8f53390ae9a49cd0eb799116ab3ac
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 12:52:33 2012 +0200

    fix commonchecker expected location

commit cdfadc48b9269c299d6c3fa94976f4563c720ebc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 10:32:10 2012 +0200

    refactor HTMLPageBundle

commit 502b78fc727afec366bf22d1c28688a3a154baad
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 10:31:41 2012 +0200

    class is not mandatory anymore when a new resourcre type is defined

commit b45e49512e7971813fccccddf62fdbc50cbace07
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 10:31:41 2012 +0200

    class is not mandatory anymore when a new resourcre type is defined

commit 419e27839a3ff74488f73ec3d3599b3c889ed863
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 10:17:19 2012 +0200

    Resource extender only adds something in the discriminatormap if there is sthg in the class field

commit 25949a7590e8966669818abdbb28354d5947968b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 30 10:17:19 2012 +0200

    Resource extender only adds something in the discriminatormap if there is sthg in the class field

commit 4339c5fb27b06a50240abf5fc2ec0acc73004f10
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 29 17:15:47 2012 +0200

    Remove ResourceManager from FileManager

commit 640a15c1f54559a00dcb9c0343566906a8732536
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 29 17:15:47 2012 +0200

    Remove ResourceManager from FileManager

commit b14202c9f30de95fffc45ceec48c44df1f49248e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 29 17:15:32 2012 +0200

    remove ResourceManager from file.yml

commit f2307d38dfa2e8d7a907e6e5bfd04b9b5974f77a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 29 17:15:32 2012 +0200

    remove ResourceManager from file.yml

commit 6b62defb8930a57e62da5a08157552dc59bb4941
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 29 15:30:08 2012 +0200

    mime type added to resource instance

commit e0c58e84ec2e61e94d79dc0c5cc70bfe6768ee74
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 29 15:30:08 2012 +0200

    mime type added to resource instance

commit dd7ff28ad937e40c285dc5f9756c35264ff66afc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 29 15:06:56 2012 +0200

    plugin player system (not tested with phpunit and only works with files extension

commit 25ba35ea95a9353a1c4259cc76cbaa900ce89b7b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 29 15:06:56 2012 +0200

    plugin player system (not tested with phpunit and only works with files extension

commit 438e76b3d9e6fea64aac3c64e05ab9d55806d4d3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 29 15:06:36 2012 +0200

    getMetaType method for ResourceType

commit 8c6f0ef0b52264ebf239453cb5b163034334e6b8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 29 15:06:36 2012 +0200

    getMetaType method for ResourceType

commit 47cd81aa5c72008c08ca7070e80923d0a50aba2e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 29 10:49:42 2012 +0200

    MetaType Entity

commit aa9be9dfd2b81ddcec4c79edf84c30ef1800be03
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 29 10:49:42 2012 +0200

    MetaType Entity

commit 819e17062b2fcdd3fb7c3b519af15da0bf4342e3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 29 09:45:15 2012 +0200

    add meta type table

commit 34d1e2baf397685723bf0cb05944ccfd86e4b5b9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 29 09:45:15 2012 +0200

    add meta type table

commit 9b20c8dd3a1800fa1879012d1295f7e19bf84ce7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 25 13:23:15 2012 +0200

    refactor resource/index.js: resource manager has 2 trees (source & destination). D&d not fully operational

commit e7c0d64b4f649be985e27dfaf23a17810e6bc057
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 25 13:23:15 2012 +0200

    refactor resource/index.js: resource manager has 2 trees (source & destination). D&d not fully operational

commit 5280710237265d6166ea8718c4de2bd0623808aa
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 25 09:35:17 2012 +0200

    license table added

commit a2dcea5e44d09c69aa060fc5a94d06208cc3801a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 25 09:35:17 2012 +0200

    license table added

commit 5801d5a13bddaecee9e2a4a2f132d849d58c5c87
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 24 17:42:59 2012 +0200

    getResourcesReferenceAction fix

commit 24eabfe36e6ee188d88c8809a9a204847419e15a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 24 17:42:59 2012 +0200

    getResourcesReferenceAction fix

commit 66a8be2b12518d1e93091d94d386fa7d9fa4e62f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 24 17:41:01 2012 +0200

    add getResourcesReferenceAction (not test yet)

commit aa34e23d23d0de4445b7fafa63fde492b7eaf921
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 24 17:41:01 2012 +0200

    add getResourcesReferenceAction (not test yet)

commit 2a214a69c3d840d2f382215bd144dbd870475515
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 24 17:38:08 2012 +0200

    recursive suppression

commit 3f6bb8aeac8e7d9559b03486246d7ebbef24b94c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 24 17:38:08 2012 +0200

    recursive suppression

commit 06d35bfcc9869878caa33909fea9ddf55687b3cd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 24 17:08:01 2012 +0200

    Remove code coverage option from build config (+ make phpdoc quiet)

commit 83c999e62950f775fda487399ac5f4b336dfeda7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 17:28:00 2012 +0200

    add Workspace\Creator.php flush(); (don't know why it was still removed)

commit b4c960d8bb1a0597dec90b7a6744e42cb65e1c10
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 17:28:00 2012 +0200

    add Workspace\Creator.php flush(); (don't know why it was still removed)

commit 162d699ca73f0446e067deaba102c1c6aa62d1e8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 16:54:11 2012 +0200

    fix resourceController defaultClickAction

commit 5c827f1d5c43b2444726d0ccf93356545ad80399
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 16:54:11 2012 +0200

    fix resourceController defaultClickAction

commit fa1dda8f29652208dc4a876ca3c8ebb6a606b2e3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 16:46:25 2012 +0200

    update htmlElement Manager

commit 8831f0aefc6cc98f9e8df929e4ce27a3b045502e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 16:39:14 2012 +0200

    rename resourceId parameter with idResource for resource editAction

commit 93aae5f5f1550abb04ffe243b0da82af2dfe0251
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 16:39:14 2012 +0200

    rename resourceId parameter with idResource for resource editAction

commit 304a9885877efc0ca9c85af698f7bc372eae3ef6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 16:28:00 2012 +0200

    Revert "put the Workspace\Creator.php flush() back;"

    This reverts commit 65506b16668725d043aa8277295f3cb7a960122f.

commit 4f0ddd50f5d536d7848759457064b1311764b1ae
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 16:28:00 2012 +0200

    Revert "put the Workspace\Creator.php flush() back;"

    This reverts commit 65506b16668725d043aa8277295f3cb7a960122f.

commit 56b068a921b1f4d66bf66f845b36d552ac8c4d81
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 16:25:37 2012 +0200

    put the Workspace\Creator.php flush() back;

commit 65506b16668725d043aa8277295f3cb7a960122f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 16:25:37 2012 +0200

    put the Workspace\Creator.php flush() back;

commit e06f8ebbd1355241a532fc4b960f8b39d72a5473
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 15:50:32 2012 +0200

    remove a Workspace\Creator.php flush();

commit 674348399b8e25675afbdb8c16c5de3bf2346a5b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 15:50:32 2012 +0200

    remove a Workspace\Creator.php flush();

commit 28b309d821c66defa5e1eee87d9b25c3a47c491a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 15:31:55 2012 +0200

    remove workspaceControllerTest comments

commit e6facf0c118310cfdfc4ae303d2c42ef8d2fae90
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 15:31:55 2012 +0200

    remove workspaceControllerTest comments

commit 613983384d19e27bfce80c66a2e584f99ec46ab8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 15:15:22 2012 +0200

    add verbose option for phpunit in build.xml

commit a96c72fecd299c925032746a67d1fb3f9c7df0c2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 15:14:10 2012 +0200

    resources copy by copy fixed (including test)

commit 9eeffc202da3fdf92f8873aded5ab5f3f8853dca
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 15:14:10 2012 +0200

    resources copy by copy fixed (including test)

commit 2195aa5b5b3a95ade304ed2605300946008fc92d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 14:25:48 2012 +0200

    can add the root to a workspace with the resource picker

commit be6964c03a6ff032024360dcd3f615755eb33fa8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 14:25:48 2012 +0200

    can add the root to a workspace with the resource picker

commit 75ca3a8e1435ce9a69642c99b97659daf1b46b16
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 13:48:19 2012 +0200

    rename idWorkspace from claro_resource_edit with workspaceId

commit 05e544a0ca36485f034cc993e80febda4db00e8d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 13:48:19 2012 +0200

    rename idWorkspace from claro_resource_edit with workspaceId

commit 0c993a8a5b1e16e01a04e8286154d21eecc5bc78
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 13:43:31 2012 +0200

    rename idRepository from claro_resource_edit with idWorkspace

commit 61e4a8761cce5433a2a3cdac5ae13acd9e5c98a8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 13:43:31 2012 +0200

    rename idRepository from claro_resource_edit with idWorkspace

commit bd79d16f53679d31a220c82ae4e69fedbfa65271
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 13:36:55 2012 +0200

    rename repositoryId from claro_resource_JSON_node with workspaceId

commit 7f0cd1b74092b82e1b76e60a090db95568f6bc73
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 13:36:55 2012 +0200

    rename repositoryId from claro_resource_JSON_node with workspaceId

commit 1cadc55196f185786079837e94d2a9779cb0e0dd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 13:26:40 2012 +0200

    can remove resources from workspaces with the resource picker

commit 4a5d5732840b6526c060d6e1363a860908b74738
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 13:26:40 2012 +0200

    can remove resources from workspaces with the resource picker

commit 07875d88282139289cf8cd4d489fd58c515ca069
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 11:52:22 2012 +0200

    directories can be copied by copy in workspaces

commit 11cb16ad7ef19772719308adbb2791c57b146b61
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 11:52:22 2012 +0200

    directories can be copied by copy in workspaces

commit b495cc55e2658f77ee2498781945a52b140e8bcf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 11:06:37 2012 +0200

    can copy a non directory resource in a workspace

commit d3fcf15f20d448de30739f6664663656f66ac853
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 11:06:37 2012 +0200

    can copy a non directory resource in a workspace

commit 3b57dd1323f5d35360d3b5c412a6c4845b59c6bb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 10:49:30 2012 +0200

    remove the old resourceInstance when a resource is copied (uncomment a line)

commit 449b974804461ccec673bfd8f46e4f95b9ea7e79
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 10:49:30 2012 +0200

    remove the old resourceInstance when a resource is copied (uncomment a line)

commit e4e5d8d4925447bc11cbe53ed693697f434594c3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 10:46:51 2012 +0200

    resources can be copied in a workspace when editAction is called

commit 4a3a684d4fd0da698c16b4a557a00684d4af4f57
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 10:46:51 2012 +0200

    resources can be copied in a workspace when editAction is called

commit d8b6f9efa4f6e646d8688a306c5fd981e624f635
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 10:06:41 2012 +0200

    resource instance counter is displayed properly in the resource picker

commit 93a0fe040a23a742c5419d8ece1660caf2dd665f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 10:06:41 2012 +0200

    resource instance counter is displayed properly in the resource picker

commit 5eb6455f70e15651eb49c6f76e80c38975d92549
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 09:47:54 2012 +0200

    fix workspace_list.json.twig

commit 8830d61e5d69e1d0a96c466788c8b3a7bf5435b5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 09:47:54 2012 +0200

    fix workspace_list.json.twig

commit ac59084a64035e91a268cdb7684b8a7883046e42
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 09:15:50 2012 +0200

    fix delete action for resources in personnalWorkspaces

commit 90a641d0f90f2b8ef80f97e5afe77762a71f554f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 23 09:15:50 2012 +0200

    fix delete action for resources in personnalWorkspaces

commit 1271c04a0f60c6f1dbfd5ec84f1498ed84251b9e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 16:50:41 2012 +0200

    skip a resourceController test

commit 4a0f373870a6ef993b958e4fa6e46d1bd6db9cf4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 16:50:41 2012 +0200

    skip a resourceController test

commit 45a4ae9dc977c6b211ad4524d74808f98e02fe31
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 16:47:10 2012 +0200

    remove unused variable

commit 1a45f04a1b4df990287f990c7c3a209ec8269d28
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 16:47:10 2012 +0200

    remove unused variable

commit de94fe637b100327a30a2523e1bb8ff75fca7538
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 16:46:43 2012 +0200

    fix workspace/Configuration.php

commit 6cf8801f48c34613bc3cb772be99b930fcab2362
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 16:46:43 2012 +0200

    fix workspace/Configuration.php

commit 71036220ff2ea0a15d9cfc36cd2bb76710a572fe
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 16:28:03 2012 +0200

    fix drag & drop for resource manager

commit 8df513158aab0c36f339705d6b5ab135bf3836d8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 16:28:03 2012 +0200

    fix drag & drop for resource manager

commit 087facb6fb5f003c206af10c71bd0979798aa219
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 16:25:00 2012 +0200

    resource manager can delete resources

commit e1c4a5353024d782c2aadb81ade88f2c1f420ebd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 16:25:00 2012 +0200

    resource manager can delete resources

commit 2e8fa1c998ba1f9779f5a91910d2f368eb5feed5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 16:16:40 2012 +0200

    fix resourceManager javascript tree loading

commit ab9a2790f74278e2400342d01af743097975d730
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 16:16:40 2012 +0200

    fix resourceManager javascript tree loading

commit 61f04ca4c89e32e31c5b9660a06d18e4efcfa69c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 15:14:38 2012 +0200

    fixed ResourceController addAction for XmlHttpRequest

commit 2c68687ba22867c410c3a77aa32b419e682697c4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 15:14:38 2012 +0200

    fixed ResourceController addAction for XmlHttpRequest

commit 5e0b014c88171fc59c4d20f55a4bfa521106a02f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 15:09:28 2012 +0200

    fix abstractRoleSubjectTest: /!\ every test is succesfull or skipped  /!\

commit a0fa45bc1869bdfc31d1b4e46c972c49852247a2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 15:09:28 2012 +0200

    fix abstractRoleSubjectTest: /!\ every test is succesfull or skipped  /!\

commit 5286d939a36a712f5dd411b18514d714ce4fb1d0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 14:58:03 2012 +0200

    fix registrationControllerTest

commit 7ba8a86ccfd79d7fcac82b3f558da7b8f6183409
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 14:58:03 2012 +0200

    fix registrationControllerTest

commit 72a9975712fbabb5ea0be19ee8b718f0d2ff9c8a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 14:56:29 2012 +0200

    fix administrationControllerTest

commit 7f5c28bd881a2e6b7996d9dfa758ca0aa0e25ec7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 14:56:29 2012 +0200

    fix administrationControllerTest

commit 840bce49001474171e6fb509731041b3f7425b2c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 14:50:15 2012 +0200

    fix workspace controller test

commit bdff1e758ee0aed86f8d6fc9e01d0be4b501e218
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 14:50:15 2012 +0200

    fix workspace controller test

commit 60d7537652fba1e759f791ae2e559acdf2c38b22
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 11:30:50 2012 +0200

    fix directoryControllerTest

commit 9abd47be51f40fb9b6888140a93c0a58b8e1d9e4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 11:30:50 2012 +0200

    fix directoryControllerTest

commit 4254d748f3660502f26c72df6da2fa4b744b3a27
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 11:15:12 2012 +0200

    fix resource controller test except "by copy" tests

commit e1ecea0e4f7e219e61a9fce33cd61d4a0cbfafda
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 11:15:12 2012 +0200

    fix resource controller test except "by copy" tests

commit 9a6177e17b0c41aa4debcc142e9f0b3f254941e1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 10:56:08 2012 +0200

    skip resourceControllerTest "byCopy" tests

commit 0e46d41376f1961fc8d852e759ecac0212219a36
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 10:56:08 2012 +0200

    skip resourceControllerTest "byCopy" tests

commit d880a9e0f4d9875fbe271662bf0017874b046db8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 10:53:01 2012 +0200

    remove php fatal errors from phpunit test suite

commit bae69c377c7b6d7ac19956ac00e659f8c6a95e4f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 10:53:01 2012 +0200

    remove php fatal errors from phpunit test suite

commit 9dc033633a67c3b02e52feddf794e80868f25952
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 10:14:07 2012 +0200

    basic removal of resources from workspaces

commit 1ae98014736f3aec25c7e9f71224ff819d537a73
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 22 10:14:07 2012 +0200

    basic removal of resources from workspaces

commit bc38c1168226b5f4ea3269dfd6a991b1b57083c1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 15:58:53 2012 +0200

    remove parenthesis

commit 704403c18b242e6f464f85cb1d70865b5c974bbb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 15:58:53 2012 +0200

    remove parenthesis

commit 3212f4137c921a166d693e526e6d2c6d9ac7d89b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 15:48:54 2012 +0200

    resource instance counter added to resource

commit 1a8712a029511f6cd50f090fa68dcfb8b3d31f02
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 15:48:54 2012 +0200

    resource instance counter added to resource

commit d8095893d386995cdf426ed53c5c3f7cf8257107
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 15:07:25 2012 +0200

    tree resources can be added to workspace

commit a75e09780ab548ff6c4ba751da94f13ddd4fdb01
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 15:07:25 2012 +0200

    tree resources can be added to workspace

commit 2ebbbbdf97785d72b4e9cd117bec8592ee9c00f3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 14:01:50 2012 +0200

    non "tree" resource can be added to workspace

commit c0e88b5095875d6a814f7f3ed727218fe1e90cf2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 14:01:50 2012 +0200

    non "tree" resource can be added to workspace

commit 89b7fbbf0467b07c0dc749baa7f4ec9192e6d33e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 13:34:29 2012 +0200

    fix getJSONResourceNodeAction if $id!=0

commit 83c94113d9ad6b0acd959dd7ede3b90d1af13bd1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 13:34:29 2012 +0200

    fix getJSONResourceNodeAction if $id!=0

commit b64d5df5b29afeee34b6391031f77ee7eac328a2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 13:25:02 2012 +0200

    fix getJSONResourceNodeAction if $id == 0

commit 2f08a822b71ab1300daaf67482aa6951cf4aea66
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 13:25:02 2012 +0200

    fix getJSONResourceNodeAction if $id == 0

commit af51aa9322947f59335841ce30e0baf32d01143d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 13:24:36 2012 +0200

    set instanceAmount to 0 no matter what

commit e328b93a573714d348174b308796ea27ac7e3712
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 13:24:36 2012 +0200

    set instanceAmount to 0 no matter what

commit 46fa36999fda994037ffc2866e59bde30577b59d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 13:08:09 2012 +0200

    resources added to workspace are visible

commit adff404f7b734ac7d27a3d53e5bc4da0cfe2772d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 13:08:09 2012 +0200

    resources added to workspace are visible

commit ee007bdd8c76524b020b0c3df2cb47f220bf1b1c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 12:54:21 2012 +0200

    skip resourceExtenderTest (phpunit is able to run without php fatal error)

commit 95272bad5679782c14e24a57276a301e037211c1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 12:54:21 2012 +0200

    skip resourceExtenderTest (phpunit is able to run without php fatal error)

commit d31f4763c2f4a0dfb20a5a7ecb6687d6db383d45
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 12:53:43 2012 +0200

    fix resourceController openAction

commit 91827df09ccd9af1a58e1f454aed5e0ce2deee23
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 12:53:43 2012 +0200

    fix resourceController openAction

commit 855030ae6a577bd419b1cd78992196f404881231
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 12:53:14 2012 +0200

    fix workspace\CreatorTest

commit b41231afc081dc07b35725b8e25f76bf824b3976
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 12:53:14 2012 +0200

    fix workspace\CreatorTest

commit f68749bc2dc07231b4afc11fdd09d81403326a17
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 11:15:52 2012 +0200

    comment a setUser in ResourceManager

commit 8170fb893128eb59611bcb53d44a3b90ad065911
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 11:15:52 2012 +0200

    comment a setUser in ResourceManager

commit 0145d032607bae7a034c4081b69d878f44998c74
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 11:14:03 2012 +0200

    instance of directory cna be removed

commit 3354a551b61cb0c3693720668419b6c5ed0fdde2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 11:14:03 2012 +0200

    instance of directory cna be removed

commit fca22ef608b4ffa7f0377bc3795ea6811fa4cce7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:57:41 2012 +0200

    skip Tests/Entity/ResourceTest

commit 65ff2933a5efcceaf5add517f526a3875e0b4135
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:57:41 2012 +0200

    skip Tests/Entity/ResourceTest

commit 07b0cab49e5560720f6df2c9888d8b292ac74181
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:46:09 2012 +0200

    comment removeFromWorkspaceAction

commit db89969dee88bf60b0fddfcb65bdddafd4b6a46d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:46:09 2012 +0200

    comment removeFromWorkspaceAction

commit d2afa37622b10b0b4ed13200e43504b45dca8a5a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:45:30 2012 +0200

    comment addToWorkspaceAction

commit 34145cc5d5a964b838028d16f970cd32cc2bc515
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:45:30 2012 +0200

    comment addToWorkspaceAction

commit b2638220f7dc1ae0013eb9b70f37b6e0a368c000
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:34:30 2012 +0200

    remove some var_dump

commit 5357b46bc5e46285f2c56a7f94055660c2aced0c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:34:30 2012 +0200

    remove some var_dump

commit 8cdb02546a0e7e1bb37342fa763497d68498a1c0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:32:09 2012 +0200

    directories can be added to other directories

commit ed0d1a8e88da2f1bd54640e8344f9128b9a3e14b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:32:09 2012 +0200

    directories can be added to other directories

commit ceacc0e542c39b7ee0c3b9a11902c40e573a0a72
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:23:39 2012 +0200

    change the directory by a resourceInstance

commit 3b4c58cc97861078269bdb2d47c5dfcd328953bf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:23:39 2012 +0200

    change the directory by a resourceInstance

commit 416e9b8b82c3e165d9760e98ecde50b2c9826143
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:19:44 2012 +0200

    fix directoryManager default action

commit 1319df43d3aa7b9625ff2b70c5a1176d82d90120
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:19:44 2012 +0200

    fix directoryManager default action

commit bdce43153f592c7a63ad27c69c2004ffd390abe6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:08:53 2012 +0200

    resource instance acl

commit 6e05ad4d146b3b10a392ae0195d1466cb49141ae
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:08:53 2012 +0200

    resource instance acl

commit 71aaf9a4237705859600a82214a300376b3a88b0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:03:25 2012 +0200

    files can be added to the root directory (everything else still broken)

commit 97a14b7111e0b8d8c7558af192bc51ac6d29c27d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 10:03:25 2012 +0200

    files can be added to the root directory (everything else still broken)

commit 59b7a973ae26a9d5d21266d7d89c9716a9910cdb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 09:59:14 2012 +0200

    root directories "addable" (everything else still broken)

commit 07b7f40752907322f6e3d90c3095893f6f342db2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 21 09:59:14 2012 +0200

    root directories "addable" (everything else still broken)

commit 745668efdab1e1671a51a73f576a41e2853c30ba
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 14:37:42 2012 +0200

    move name from ResourceInstance to AbstractResource

commit e70b1dd2e20b7eb07318b41a3762580fba010463
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 14:37:42 2012 +0200

    move name from ResourceInstance to AbstractResource

commit e5f7c5b995220ab8e05bb5f67c6e4daf24d0cc2d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 14:25:15 2012 +0200

    Entity\Resource\xxx fixed

commit 67e1a0a0dafbb3a376263643455fe15408bf9913
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 14:25:15 2012 +0200

    Entity\Resource\xxx fixed

commit a6f5672fd93a36072f6da1cea8fb98c620478f3a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 14:25:06 2012 +0200

    resource controller indexAction fixed

commit 70c5fba7221024b8de07ff5664d6025afe86f662
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 14:25:06 2012 +0200

    resource controller indexAction fixed

commit c8c7781d8b0f32bc9dc7f6a53ec77c551ffdcaaf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 14:23:57 2012 +0200

    fix loadManyUsersData

commit 76a0a75d2d048cab0f84afdd0fa1615662502abd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 14:23:57 2012 +0200

    fix loadManyUsersData

commit 3f0f0f4f83e828a03da6c2afd456903b2ee3491c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 14:20:47 2012 +0200

    fix claroline:user:create

commit 636248798458f7a6fe894cdd858e1d9ff59331db
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 14:20:47 2012 +0200

    fix claroline:user:create

commit 1215f0d4dc66b22240c026fd097124ed79cf0a77
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 14:19:35 2012 +0200

    resourceInstanceRepository

commit ccaa7b6bbc063c82a84275d30e15e06c8b020a9b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 14:19:35 2012 +0200

    resourceInstanceRepository

commit 9e76f983fd29e5485c4244bb4fca521bd950962b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 14:19:17 2012 +0200

    fix resourceinstance table

commit 97391b72ea0a5db9abb9255b861cce3e79fa54b7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 14:19:17 2012 +0200

    fix resourceinstance table

commit dd87e1fb660a4a2e45bfeb4a75af5e1d9f3d60a9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 13:34:50 2012 +0200

    foreign key (for the personnal repository) added for users (it's a temporary fix)

commit 21468af63eb8c3071c2b330868f336053a5e7352
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 13:34:50 2012 +0200

    foreign key (for the personnal repository) added for users (it's a temporary fix)

commit b9861355d265c47585242a138e0e88b12fcf47bc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 11:40:23 2012 +0200

    users created by an admin also have their own workspace

commit 834104840d1b841d79f7bd757b185ea1449b08e5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 11:40:23 2012 +0200

    users created by an admin also have their own workspace

commit 7bfba5938ab1be14c936292ae3d4c2c9f710132f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 11:35:17 2012 +0200

    var_dump removed

commit d100cf5d98ef00bfedc5703d76d3d64aa9d31cb9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 11:35:17 2012 +0200

    var_dump removed

commit 1903deb026c29dab8da90a1473a15cfd1354ff07
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 11:33:50 2012 +0200

    reposiotories removed and replaced by workspaces (everything still broken)

commit c8fffc90ab063632440f52149f361e452b26f02a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 11:33:50 2012 +0200

    reposiotories removed and replaced by workspaces (everything still broken)

commit 8b5304e669fbb9c4cd205bc2fbab9b4b19689e61
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 10:50:09 2012 +0200

    fix resource instance (* missing & assert not blank unneeded)

commit 0e3234559b7709d296d2dd4fcf03f41d53afe80d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 10:50:09 2012 +0200

    fix resource instance (* missing & assert not blank unneeded)

commit 50ce6598b42d8a712fbc0b767e6c56d50211aef2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 10:01:47 2012 +0200

    refactor database resource management system (everything is currently broken)

commit 1c4b677d5268438707926a91910468645bc289e6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 18 10:01:47 2012 +0200

    refactor database resource management system (everything is currently broken)

commit ef5fa3a862d5ed98faa583e6f4136cbd2254871b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 15:03:45 2012 +0200

    update dynatree_resource.json.twig

commit 88e324c33686bf7ddc67f6c39ea0c94a7dcc212b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 15:03:45 2012 +0200

    update dynatree_resource.json.twig

commit c100e6e63c4d2098880e71e7a2b794db5f505d2b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 15:03:19 2012 +0200

    rename getInstance()

commit 9e1da60ae45b7da205d72cf857b997049b62ee5d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 15:03:19 2012 +0200

    rename getInstance()

commit e1bf9a7d3d1de173a40493265b0ae672da91b44a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 14:48:45 2012 +0200

    refactor AbstractResourceRepository + add the count_instance field to the AbstractResource table

commit a4fd3bb994048d4148e399a7e2641409b8cdc5de
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 14:48:45 2012 +0200

    refactor AbstractResourceRepository + add the count_instance field to the AbstractResource table

commit 29a4560c8245c16bbe7d29500be1b0e43ffd5742
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 14:48:30 2012 +0200

    change a wrong variable name

commit cf2b0af3e5113de5540899eb6f8285abbbce7161
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 14:48:30 2012 +0200

    change a wrong variable name

commit f0b140ae9ca898120996af36979039447647e2c1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 14:24:03 2012 +0200

    fix ResourceInstance (altough it's unused)

commit 7d63d6c827d37d94fcb10bc01bcbb4d1b3e580fb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 14:24:03 2012 +0200

    fix ResourceInstance (altough it's unused)

commit 92084aa76adc47ae7f89965b899d809be60a2b94
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 11:22:35 2012 +0200

    claroline:files:clean command output something in the console

commit 8effc554beb7474cf42e376cee05b80596573d46
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 11:22:35 2012 +0200

    claroline:files:clean command output something in the console

commit 817077244bc56d7e4d7cb18da0c98a871a3b4d45
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 11:19:47 2012 +0200

    factory_install_dev fires the claroline:files:clean command

commit b800a7430dfb7102a80cd7593a5da6bc7d356141
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 11:06:30 2012 +0200

    remove commented useless code

commit edec6e0a8086d7aef5674825e31e7768ededf277
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 11:06:30 2012 +0200

    remove commented useless code

commit f0eaa35a959b06426ed80aa6dd7c49a9efd0a660
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 10:58:14 2012 +0200

    fix a bug (and a test): resource couldn't be created from the php interface (the repository was null)

commit b7fd3056a19ea425333354fe463c698fb81ecb26
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 10:58:14 2012 +0200

    fix a bug (and a test): resource couldn't be created from the php interface (the repository was null)

commit 8f91047b67d5bd50cdc2d0c7d1487fc4adb8968f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 10:39:41 2012 +0200

    copying a resource doesn't set his parent to null anymore (line removed)

commit 9d8eef8372c0ab5fb86132e691fcfc809e631be1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 10:39:41 2012 +0200

    copying a resource doesn't set his parent to null anymore (line removed)

commit e4c3d269995a709fcc1212c492ffc2168c79b76e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 10:37:14 2012 +0200

    refacor getJSONResourceNode action and AbstractResourceRepository: DQL queries changed

commit 31fdcb6363599184659dd05fd8824fc426a519ee
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 10:37:14 2012 +0200

    refacor getJSONResourceNode action and AbstractResourceRepository: DQL queries changed

commit a80ec71151f3059d8108817969fdcb2a6e13cba5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 09:38:55 2012 +0200

    copy a resource by reference also adds a reference for each children

commit 5698f1b247277ed6c51ab49585d838e1280fdd3a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 09:38:55 2012 +0200

    copy a resource by reference also adds a reference for each children

commit 946827df55793b85af491bb12731d3437fef0540
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 09:33:42 2012 +0200

    by reference is checked by default

commit 5a8f79ceae8a2601dbbb5207ddc1e76e28170bf6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 09:33:42 2012 +0200

    by reference is checked by default

commit 79c1154371dcd04b2b6961dbec03de4ba006ae26
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 09:32:05 2012 +0200

    remove duplicatas in claro_resource_instance table

commit 5650c3c8653152102681b2ce3debad042ded65b7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 09:32:05 2012 +0200

    remove duplicatas in claro_resource_instance table

commit 09f9d22a40b1b27c155131a98ae273b18799fcad
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 09:20:51 2012 +0200

    edit action is able to copy a resource (still buggy)

commit c4f5fbc429b6ac9c3a4a246963adf2c3fb4bdc49
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 16 09:20:51 2012 +0200

    edit action is able to copy a resource (still buggy)

commit 34fc88de215511602531b33939ef719db435e750
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 15 17:15:33 2012 +0200

    resourceInstance repository

commit f5d3f2e4791d1e298ce66b793d93c5ade46bdc75
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 15 17:15:33 2012 +0200

    resourceInstance repository

commit 20b6d2ebf50c507af253aa9dd0dd26b6fdbd4e68
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 15 17:15:16 2012 +0200

    resourceInstance entity

commit 00fdbd89dadf4edba44598c47e8e714bf081a0d9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 15 17:15:16 2012 +0200

    resourceInstance entity

commit ddaddb871dc5919778a06f6afef426c15eae896f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 15 16:03:09 2012 +0200

    rename claro_resource_repository table

commit 0d262813437cfd407acc0cf0df70d78e0a79691c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 15 16:03:09 2012 +0200

    rename claro_resource_repository table

commit fa18ef91e77b18a563a8090ff6a66c7c9dd84247
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 15 15:03:35 2012 +0200

    add the idRepository parameter to claro_resource_add_resource an remove globals from the filepicker

commit 2e0c111edab7d2b7937e3b27959a7ab5f89b8040
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 15 15:03:35 2012 +0200

    add the idRepository parameter to claro_resource_add_resource an remove globals from the filepicker

commit 30b26a2eb1aee1da27a7ae6ef0ce4aed27537327
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 15 11:09:34 2012 +0200

    filepicker and file explorer work with a repository id

commit b7487da1b6b47bdb82cbe1ba0152d8024d8d8228
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 15 11:09:34 2012 +0200

    filepicker and file explorer work with a repository id

commit 781efa4c13c87a9d3e21bafb03b09b5970961834
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 15 09:50:54 2012 +0200

    hide cfp_dialog for the form picker

commit 98e3344f8ed7938c0644dbf8830f2f11d3168d58
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 15 09:50:54 2012 +0200

    hide cfp_dialog for the form picker

commit 3d938754bdd5512efb7a52b2ce5493f05e08c0ae
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 15 09:45:04 2012 +0200

    file picker tree refresh is now working

commit 23272f6263aee1872dcd2fa735ce1100b8bca603
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 15 09:45:04 2012 +0200

    file picker tree refresh is now working

commit c8542bd72abe8c24b42c89594d515a735663905d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 17:14:43 2012 +0200

    color code for the file picker (red = copy and green = reference)

commit 8614f62d8d0fe0c169306c3a5eb09fa9e2771264
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 17:14:43 2012 +0200

    color code for the file picker (red = copy and green = reference)

commit 304e9a03c9112f61944c58200259ff144d18cebe
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 16:53:56 2012 +0200

    workspace repositories shown in the filepicker

commit ca4ee57fb11f1a3751037eee03a53eb22bda13ad
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 16:53:56 2012 +0200

    workspace repositories shown in the filepicker

commit d4bb7d4f7f794c36d92deeec39a402c0a3f150fc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 15:54:09 2012 +0200

    add the option parameter for getJSONResourceNodeAction

commit f935e07a61500e08849320f105ede488a95ea2e7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 15:54:09 2012 +0200

    add the option parameter for getJSONResourceNodeAction

commit e29913bf5aedfddf6372464a73875a5621a46cf3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 15:34:17 2012 +0200

    every children added to the workspace repository when a folder is copied

commit 0e8b6248fb3c237d1908d5e875b3ec7da51aa8a5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 15:34:17 2012 +0200

    every children added to the workspace repository when a folder is copied

commit d87f6e46c034ed6a85b3b964eaa8edbdc31914ff
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 14:13:28 2012 +0200

    the workspace list is displayed in the file picker

commit 0b70bff468452241db754e29475bd5c8d6980e8b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 14:13:28 2012 +0200

    the workspace list is displayed in the file picker

commit 523a2075e9c47a014270699ef4e6ad24401a36da
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 13:51:36 2012 +0200

    file picker can get a workspace list JSON response

commit 14c7be7b166299f44bdcf08b5fed523bf4fc1bd4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 13:51:36 2012 +0200

    file picker can get a workspace list JSON response

commit b56570f1057241c52031eee4a568fa09c7528e40
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 12:11:42 2012 +0200

    refactor showResourceFormAction

commit 90e5ca8ec2d19be4b32d58a4325aee6d959bbb8d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 12:11:42 2012 +0200

    refactor showResourceFormAction

commit aae338f29e77ace4c54ad13e487806e685eff64a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 11:18:22 2012 +0200

    checkstyle

commit 29004b6a90f22b173e7d30d04f52ddce8ab7cf2f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 11:18:22 2012 +0200

    checkstyle

commit f2e07784b644acd9bf2c0aaa7dc05cfef35cab3d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 11:04:41 2012 +0200

    tests for resources copies added

commit bb96a40a81112d60453a4b1f7255603a12609e51
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 11:04:41 2012 +0200

    tests for resources copies added

commit a2dac3a31ef31ca2c10c696fcedbd7b5a366e633
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 10:02:02 2012 +0200

    acl for workspace copies added

commit 46709214a9a3242dcec592d41aeefe90fa00a0a1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 10:02:02 2012 +0200

    acl for workspace copies added

commit 303a66f7aa494033ea95c5ec74a1ccc4e7e2e0ea
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 09:53:42 2012 +0200

    repository fix

commit 534817b054c2b03584a8177abbf55a8c02599282
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 09:53:42 2012 +0200

    repository fix

commit d81cf722b7faf1f776c87300165c868845d0ec1d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 09:50:11 2012 +0200

    directories can be copied and removed properly (still need acl+tests+repository fix

commit 98b0798d31fb3c6d019d5f168bd8ccfee1b6c1ed
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 14 09:50:11 2012 +0200

    directories can be copied and removed properly (still need acl+tests+repository fix

commit 7183c48e22b387129cb288959629e62d7a9ea98a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 15:03:46 2012 +0200

    copy directory persist & flush

commit 9615ca1af5661213c088283afee4e47e4de1f4b5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 15:03:46 2012 +0200

    copy directory persist & flush

commit 60d5ccf225621e65217d56306dcd461effb07e72
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 14:58:21 2012 +0200

    directories can be copied (not tested yet)

commit 6434da172ca446916ce12216801ac306efb0d593
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 14:58:21 2012 +0200

    directories can be copied (not tested yet)

commit 60c01267141c889d66b398ebc6ca8758306ee7ef
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 14:28:24 2012 +0200

    Repository class removeResource function fix

commit 99c7d14a4620a3b14394f124a7b9e088ebfcf6d0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 14:28:24 2012 +0200

    Repository class removeResource function fix

commit 94e6ec0fb4b244167a91a9a1b82ccb6656c151d5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 14:08:45 2012 +0200

    repository added for users created with claroline:user:create command

commit 32c46dec4f62298507d5f0fcd264a11d8b0048fe
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 14:08:45 2012 +0200

    repository added for users created with claroline:user:create command

commit ccacb069adcc2dcdd00c82f3014866f0466acfb8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 13:41:34 2012 +0200

    remove claro_workspace_resource table

commit 7c7fd1375fa90b4c130912a4108fea294057a739
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 13:41:34 2012 +0200

    remove claro_workspace_resource table

commit 6232e87d38d6042c40e95846afb7215ecb7d8c2c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 13:32:45 2012 +0200

    resources now added to repositories instead of ws/users

commit 78b8e53b8c73f0459bc1f6cf1cbc9d80e5bf8a83
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 13:32:45 2012 +0200

    resources now added to repositories instead of ws/users

commit 7e332c39c2fa369309b9253340e5815cb41c7b88
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 12:11:00 2012 +0200

    getRepositoryListableRootResource function

commit e306f70f4f59adbdbf98ae2b3a5e3f25b85cd1ac
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 12:11:00 2012 +0200

    getRepositoryListableRootResource function

commit d12b13ddb54dda636763fd3f47cbe0e49bd99a41
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 11:59:20 2012 +0200

    repository class fix

commit 5b9ba28a9148d80b8fe2ce7eef2e6bb28dc7deb3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 11:59:20 2012 +0200

    repository class fix

commit fe8472b733a91b189c5f92848db4a696418def5b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 10:27:55 2012 +0200

    workspace and user creation also create a repository

commit 94cb880a423145b4235f1a549293a090d8ed9133
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 10:27:55 2012 +0200

    workspace and user creation also create a repository

commit 7148833d64c5dc6ca01c187fbbb2dd00d27f87df
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 10:00:27 2012 +0200

    add use ArrayCollection for Repository class

commit 2c33f6c56310a5443c0828841698379fd9e1ec8a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 10:00:27 2012 +0200

    add use ArrayCollection for Repository class

commit 7b17cba0b7e03efdf6614b3d015688319a677a3e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 09:38:08 2012 +0200

    remove the TooManyFields rule for PHPMD

commit 388e5d1208db03f6022d4e0d26e6ae67ba8890a1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 09:26:31 2012 +0200

    one to one relation between repository and user/workspace

commit ba4a9a02a622c6e94a1090782edb8ba48b3900d0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 09:26:31 2012 +0200

    one to one relation between repository and user/workspace

commit 0d1ff85457720def6def6fc5d1b693317ebbf13b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 09:19:40 2012 +0200

    Repository class

commit 70b7d0e6b709584ca75a1b36a91dd2cbc546c1bb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 11 09:19:40 2012 +0200

    Repository class

commit db4117c5930d5330f92598608324b15efe34b82c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 10 17:34:51 2012 +0200

    add a repository table

commit 0207237a63305ef15aee23364d368f0462b3fc24
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 10 17:34:51 2012 +0200

    add a repository table

commit b4ef2f08558bb997f612181e138f5f27dda331d9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 10 10:49:49 2012 +0200

    Files can be copied in a directory

commit 9f7a15716f88ff7c8d4701a44f787adcf9833ed4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 10 10:49:49 2012 +0200

    Files can be copied in a directory

commit a0bbe9bfb1c4916203c80b65d8a520c55b7c7662
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 10 10:06:04 2012 +0200

    AbstractResource has a "copy" field

commit a79c73ef2f53009e8ca7167e699e9d33ec140118
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 10 10:06:04 2012 +0200

    AbstractResource has a "copy" field

commit 4682a0411181b0294b83e3206f17dd459db9132a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 10 09:30:06 2012 +0200

     add resource by reference(done) or by copy(not done yet) to workspace option

commit 6cc807fdfcefc39fd39a9a3721d3ab34dbdaf0ff
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu May 10 09:30:06 2012 +0200

     add resource by reference(done) or by copy(not done yet) to workspace option

commit 71bf33b259d8a8cbb50d5f99c193fcdcb6e8b465
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 17:03:15 2012 +0200

    HTMLPageManager implements resource interface

commit 1c1367452f03ae07851f70cc308ad0ba2c043d1b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 17:00:20 2012 +0200

    delete method for HTMLPageManager

commit efd1e3603e7fc34947bf2e1eb476317966d4a8cd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 16:57:44 2012 +0200

    clean upload directory cleans test/files directory

commit 4be326211eb7b2367f7dd0268f97cc2d0630d499
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 16:57:44 2012 +0200

    clean upload directory cleans test/files directory

commit 586e6f314d70744d6fbd969a4555cbf6ade397f8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 16:08:25 2012 +0200

    fix a bug due to the wrong variable name

commit cd3b21342e98568e91be79bf5ce18902f9afa777
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 16:07:49 2012 +0200

    clean upload directory command cleans web/HTMLPage

commit 9f68f2b0e735d9417bf358c9dd02f29217c21924
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 16:07:49 2012 +0200

    clean upload directory command cleans web/HTMLPage

commit ffb8713039c50f317c70c41439b4336650e59514
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 15:49:19 2012 +0200

    checkstyle

commit 0fcc2cd04d0e22e014d6bb573762587ba30f05c2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 15:48:27 2012 +0200

    checkstyle

commit 4674d1bcda7c6a91c297ac353fd44844fcb75a39
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 15:41:36 2012 +0200

    refactor thumbnail generator extension checking

commit d640616d7652ee098ccd31dacd7bf44228c59d46
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 15:41:36 2012 +0200

    refactor thumbnail generator extension checking

commit 6d6b3809e20af0fd9f8b5dd221fa55af0e95ce73
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 15:34:43 2012 +0200

    html page resource redirection

commit 095c078abe61dbfb98db2a644282e9d708dee4c7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 15:09:23 2012 +0200

    add a HTMLPage directory

commit 4073982c526e01d08f8448dc0f01a002511f272f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 13:42:08 2012 +0200

    database fix

commit 4c06996fce3b456427800ffabb5ea0d02dd5c7a7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 13:36:22 2012 +0200

    index field for HTMLElement Resource

commit ee0e323c5d522165ce1aab22114d153898d11922
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 13:28:56 2012 +0200

    unzip html page in it's own directory

commit 4c035ecb206fcd92b4ce09f8a264bf712f6326db
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 12:00:05 2012 +0200

    move the entitymanager in getJSONResourceNodeAction

commit 64c15c87b587bc35d4b680a2623c602b9df324ea
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 12:00:05 2012 +0200

    move the entitymanager in getJSONResourceNodeAction

commit b6a6331c0961b2fe98ceaa80e015e5c302d8c19c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 11:57:47 2012 +0200

    getUserListableRootResource function (ResourceType repository)

commit a9f8c64794a89894f73265249cd3de13602a4e25
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 11:57:47 2012 +0200

    getUserListableRootResource function (ResourceType repository)

commit cb2bbcab8c7bba51e2fe8179fe117ddedee50598
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 11:43:47 2012 +0200

    unzip and rename html page element

commit abd566e0e7978db1242530e1caa1d3dd5e03e1d5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 11:40:14 2012 +0200

    adds the clean claroline files command

commit 28930b28302ccbe9ac42ce9a766e98e7ef9b409b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 11:40:14 2012 +0200

    adds the clean claroline files command

commit c9216d69f5ae164c47c6480c82add472216a8521
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 09:37:52 2012 +0200

    addResourceAction: check if the resource is not null

commit 38bed11c613842cc3eaf06654a692c2ff5d970e3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 9 09:37:52 2012 +0200

    addResourceAction: check if the resource is not null

commit 27e8f2b126faa0c2742c81696b971f7d7555a27b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 17:29:17 2012 +0200

    comment the thumbnail function

commit dc87e2e4c16b06dad60f0a17bd6ea85963d5daf0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 17:29:17 2012 +0200

    comment the thumbnail function

commit 3346363f4ba32361b67dd456f0167d7ac68fa226
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 17:24:27 2012 +0200

    html page plugin form

commit 1ddcd871ce02e85ab4951bdd68d19de29aaa0d28
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 17:05:30 2012 +0200

    htmlpage resource bundle structure

commit e926903a275bf6691cce10506b10db04c821664d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 16:50:39 2012 +0200

    add a foreign key

commit 738546ccf9326b04fb9dae020d5b555de20157c0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 16:50:39 2012 +0200

    add a foreign key

commit a2072898748582050684aeaeec71adab9d072659
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 16:31:05 2012 +0200

    pluginDependencyInjection class

commit f879f2a6021187635a261f7d2b2c7e8561cd91e3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 16:31:05 2012 +0200

    pluginDependencyInjection class

commit 58cc01f44f12a1c862ea7456dd8f20a6de00b9d4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 15:23:52 2012 +0200

    changes a method name

commit 36c4476a366518bcc8639da335559a302e0c1bf7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 15:23:52 2012 +0200

    changes a method name

commit a2d23f643988a5a275a30af81e33724e4926cd0b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 15:14:24 2012 +0200

    increase the cyclomatic complexity treshold to 10

commit c4a55e9881015a8e60ec100050dc8edb4f8c49e5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 15:14:24 2012 +0200

    increase the cyclomatic complexity treshold to 10

commit 81b6449d4d40dbd0ffe0bfaab42b53f97339b66a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 15:06:08 2012 +0200

    mp4 & mov thumbnail

commit 944da46964d7b38ab1edfa501a057098234792ef
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 15:06:08 2012 +0200

    mp4 & mov thumbnail

commit a6203c4a11016e497784d670313546f4086d4bfd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 12:12:29 2012 +0200

    check styles

commit 87d54daef1fb65421e24e78055e6c832bcf91126
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 12:12:29 2012 +0200

    check styles

commit 743ea34f6c5dd74f22c3aff08c1c4631dcd39b34
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 11:59:25 2012 +0200

    constant width and height

commit 6a13ab8465b61cf48adf967369b6e2354dbfc154
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 11:59:25 2012 +0200

    constant width and height

commit 203fdc8108090b1388e5e6445422ae4139b0063a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 11:53:58 2012 +0200

    claroline:thumbnail:create command added

commit a67b14674983b19c96fb33a50c660093fda658a2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 11:53:58 2012 +0200

    claroline:thumbnail:create command added

commit f7513f835c01b151d0cff8c529ff2e892ca92d1b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 10:24:02 2012 +0200

    test fixing

commit b5530b71b67f9a537a6846c8a0e4729fd6f2709c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 10:24:02 2012 +0200

    test fixing

commit cf954812b7c67d79c01d7977d0738915fa962c10
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 10:06:30 2012 +0200

    remove thumbnail generator var_dump

commit 671cd7c004455e8bcb433aa8c79b15ec943e7be0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 10:06:30 2012 +0200

    remove thumbnail generator var_dump

commit 0f1aad9cef37f6e15e9671da08a0b232365fb641
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 09:45:35 2012 +0200

    thumbnail generator service added

commit 36c390069659846b2f4e6ceec9b78a6c21f97a07
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue May 8 09:45:35 2012 +0200

    thumbnail generator service added

commit 7f2e0b614e3b59ff170b70079aa07bb002419664
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 7 17:31:54 2012 +0200

    change the hash_name field size

commit c269a97809b2537d643134113f73f96aa24a158b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 7 17:31:54 2012 +0200

    change the hash_name field size

commit 1a8ccdfba3ad3ef407ee6feca7a01784020652b6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 7 17:20:21 2012 +0200

    add the file extension after guid

commit 77712a8853042e5384b603f605bf13153eaddc67
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 7 17:20:21 2012 +0200

    add the file extension after guid

commit 5aea926906eee4b80188ec5b7d70f5ebdca05647
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 7 13:54:41 2012 +0200

    workspace resources access tests added

commit dc832efa098b6ecd3f7f9b4d042b7b950778df51
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 7 13:54:41 2012 +0200

    workspace resources access tests added

commit 62446b0364c9e74bc45aedcb8382bf9cccc1cf81
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 7 11:32:48 2012 +0200

    fix merge

commit 228204aa80c49feacf5e53cd3bbb2af81dd8749a
Merge: 7b4b658 cd257e5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 7 11:31:18 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	app/autoload.php
    	src/core/Claroline/CoreBundle/Tests/WorkspaceSecurityTest.php

commit a3175b37ca6501b2d4f7421180fd5b49fb6ee31a
Merge: 12fab70 67d45bb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 7 11:31:18 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	app/autoload.php
    	src/core/Claroline/CoreBundle/Tests/WorkspaceSecurityTest.php

commit 7b4b658e9d8e459e616f38cf834567de8854deb9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 7 11:29:51 2012 +0200

    displaying the resource owner in workspace_show and resource/directory/index

commit 12fab7020d21d71339568bc3425a718cd70bb0be
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 7 11:29:51 2012 +0200

    displaying the resource owner in workspace_show and resource/directory/index

commit cd257e5a07c11b8a04478c0f2b01627fc434295c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 7 11:24:56 2012 +0200

    Unskipping/fixing tests

commit 67d45bbb1678bb4913af16c5891b077f5a1fe9a7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 7 11:24:56 2012 +0200

    Unskipping/fixing tests

commit a6c76acc95494de783333bf0b326d7928cf5c648
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 7 11:08:16 2012 +0200

    resource manager acls tests + some code cleaning

commit 0fef9c7a513ec43b0933ad3b921d2b52158eb472
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon May 7 11:08:16 2012 +0200

    resource manager acls tests + some code cleaning

commit bfc3dab1c3d15931714337bef8167587cf8fccb9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 7 09:24:25 2012 +0200

    Upgrading to Symfony 2.0.13 (+ dependencies update)

commit e2bde333043cc8b5d5f520d04ae471e61b523b96
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon May 7 08:56:47 2012 +0200

    Fixing autoloader initialization

commit 2c9945dc2d38b114c6c87b8d02fb44c3aec23306
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 15:26:12 2012 +0200

    resources manager view updated due to the new acl

commit cc3ad31c6d144dc3762e4958c77486e0b01e71bd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 15:26:12 2012 +0200

    resources manager view updated due to the new acl

commit d96704eb69b94e9b67511c039364d2b55a7caffc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 14:53:04 2012 +0200

    add acl on resources

commit 9153486b0d53a3aefe81f47aa86e31e3d9bf711b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 14:53:04 2012 +0200

    add acl on resources

commit cb3b180fecb53bfca6fbc7cde9af757c9081b8b2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 13:33:28 2012 +0200

    refactor workspace message table

commit 362092cb6c02f71131a0dc3346dd2b2461e525f8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 13:33:28 2012 +0200

    refactor workspace message table

commit eebb66313f6e2b2f23358fc1185fb86729c6a201
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 13:06:53 2012 +0200

    add a creation date for workspace messages

commit 1acba0f2f06fa89e543ddf6be610cb405cd286f8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 13:06:53 2012 +0200

    add a creation date for workspace messages

commit 5ce98ba448e691b6929f372757e5bcb40e5f1385
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 13:01:17 2012 +0200

    create new table claro_workspace_message and remove table ext_translation functions

commit 54c502b00bf7aafe16cf25047ff4680923d2bd88
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 13:01:17 2012 +0200

    create new table claro_workspace_message and remove table ext_translation functions

commit 862335f93a0ed08f684d8ea0b17ad8e0db84d762
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 11:53:41 2012 +0200

    remove ext_translation table

commit 236358a71333052b0c08c9840092bcd78b08ed5a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 11:53:41 2012 +0200

    remove ext_translation table

commit fa7fea7147e4506fe3340856401712047ea41a17
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 11:48:39 2012 +0200

    fixed javascript import in resource/index.html

commit ec59a628579bc39b376e847913182113baceb9ae
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 11:48:39 2012 +0200

    fixed javascript import in resource/index.html

commit 20e54aa8fa2b922cb1ee7be2caaf431869b57d7d
Merge: 8a6644c bf85fd2
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Fri May 4 11:38:59 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 8a6644c2ffbff9d77d156895850067b73828834c
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Fri May 4 11:36:51 2012 +0200

    Set APC prefix specific to Claroline application

commit 24174bb5f0e822b37b68404c0bbcae34c84dc479
Merge: 4da5ebc ce827a3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 11:16:23 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	app/autoload.php
    	src/core/Claroline/CoreBundle/Resources/public/js/jquery/claroline/claroFilePicker.js
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/index.js
    	src/core/Claroline/CoreBundle/Resources/views/Resource/index.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Workspace/workspace_show.html.twig

commit b7b2e9e844fead21956da8b230326562dc608af7
Merge: 8b031bd bf85fd2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 11:16:23 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	app/autoload.php
    	src/core/Claroline/CoreBundle/Resources/public/js/jquery/claroline/claroFilePicker.js
    	src/core/Claroline/CoreBundle/Resources/public/js/resource/index.js
    	src/core/Claroline/CoreBundle/Resources/views/Resource/index.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/Workspace/workspace_show.html.twig

commit ce827a3e41473588b6daadeb36657458c91bc375
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri May 4 10:59:50 2012 +0200

    Reorganizing html/js

commit bf85fd24bd278e52a2e08c5569a434f4166b7f30
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri May 4 10:59:50 2012 +0200

    Reorganizing html/js

commit 4da5ebc4521a5e59f8c0dcafd65122790b70d2d4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 10:30:59 2012 +0200

    resource type translations

commit 8b031bd0dec693b1b2d5ec80168edda797db7593
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri May 4 10:30:59 2012 +0200

    resource type translations

commit e3e89ee4c63ef101db8b58dd47cddb8e5ae03750
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 3 16:57:21 2012 +0200

    Adding contextMenu-medialize jquery plugin

commit f93df98e9619f803bfcd70106fa2ddab3fcbe32b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 3 16:57:21 2012 +0200

    Adding contextMenu-medialize jquery plugin

commit 1ac4bb0609914180e982bc354ebd1fc5af3f0f65
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 3 16:32:41 2012 +0200

    Removing contextMenu-rod directory

commit 7e718b4cbe7d2752ed03934c9c2f1c5f3132181e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 3 16:32:41 2012 +0200

    Removing contextMenu-rod directory

commit faf4b859ac82c0f0cc720d5e32cc35dcf3ac6d73
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 3 15:49:01 2012 +0200

    Removing jstree directory

commit bcf42d61ba79aecdf8bcd60f9d0951a9cb0c86db
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 3 15:49:01 2012 +0200

    Removing jstree directory

commit 1cc96632148a9aa01a7f9b9b5d08fc787fd313c5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 3 15:14:48 2012 +0200

    Removing unused js file

commit 3c58ee5b4d559ef7e4c5abea139a127a932d3d70
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 3 15:14:48 2012 +0200

    Removing unused js file

commit 5607a000bc66619966b237d87134c6380782bd75
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 3 15:12:46 2012 +0200

    Adding require statement for UniversalClassLoader (in case bootstrap.cache is not present)

commit 0f41e4a3693635b719562940b3b42b8bc68c88f1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 3 15:05:51 2012 +0200

    Removing dojo from public resources

commit fe9228a5f5a8c3f28de1993ef36a08bf113c3173
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 3 15:05:51 2012 +0200

    Removing dojo from public resources

commit 4641436f01ac14d0ff053b38acf9379771929e41
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu May 3 15:00:41 2012 +0200

    Adding .gitempty files to app/cache and app/logs

commit 3897b38e168dcc03796334e1d54a69661e6f2cf9
Merge: 24c8038 7514935
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Wed May 2 16:21:42 2012 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 9782be2bbc09aafdd9ec177df970df2dd406a472
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 2 15:43:25 2012 +0200

    test fixed

commit 751493574f169e7445e4968336bfde4a8bab59ae
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 2 15:43:25 2012 +0200

    test fixed

commit 622df697d2636544460042969f3e365cefe59dda
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 2 12:07:17 2012 +0200

    the js root resource cannot be removed

commit 116c589387b3bce740b025d0d96937bf9b14c5bb
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 2 12:07:17 2012 +0200

    the js root resource cannot be removed

commit 24c80387c720e1e0eecd20b0f326bd189a39442b
Author: Emmanuel Gervy <emmanuel.gervy@claroline.net>
Date:   Wed May 2 11:47:52 2012 +0200

    Changed method to check if APC is loaded (previous one was not working) and fixed loading of ApcUniversalClassloader (missing "use")

commit a0ccd3b7826293f29a7f632de2924693246d10b1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 2 11:00:00 2012 +0200

    addSlashes method for JSON js response

commit e66e01cdf760cc2ff4079a80862cea089f12b5ec
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 2 11:00:00 2012 +0200

    addSlashes method for JSON js response

commit 798fbd7e02e8768a7b5d08be398a0412e9538477
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 2 09:59:18 2012 +0200

    some resource manager js fixes

commit 510bfabcfc7cd764c3aa6f62358e2905edfb8a77
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed May 2 09:59:18 2012 +0200

    some resource manager js fixes

commit 4371b2a2d5d34f264fd75bedb858791e7e675429
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 30 16:41:47 2012 +0200

    modal window resource manager

commit d20694c9050a1f5c0bef5d5d1acff5628f9db14a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 30 16:41:47 2012 +0200

    modal window resource manager

commit 8f33581aa3212cd1dcdc7b79372cdcf860d78824
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 30 14:00:17 2012 +0200

    test fixes

commit d4c51afd837afba09895260e450d1161f2dcd0d0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 30 14:00:17 2012 +0200

    test fixes

commit b417086fe5d653d91d191a9609b1b83a98c5fc30
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 30 11:44:15 2012 +0200

    twitter bootstrap

commit f7178098d521d5e56454f7e6d04d65d8d1045eb8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Apr 30 11:44:15 2012 +0200

    twitter bootstrap

commit 8304224a9a14ddf7c600d4776b717eb9113d7025
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 26 16:24:22 2012 +0200

    Resource can't have a blank name anymore

commit bec9663f5a39b61c106076c8e9133a8c2241a852
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 26 16:24:22 2012 +0200

    Resource can't have a blank name anymore

commit b37d19c289a13e442679d9296ea5f4b7fdf93164
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 26 10:48:34 2012 +0200

    file picker refactored

commit 0374561f92e414699c8ebef7339ad892a41e00d7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 26 10:48:34 2012 +0200

    file picker refactored

commit d2683d63d3035ae9db1ad04bc5e43c1d851a6f4d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 25 16:01:31 2012 +0200

    virtual resource root added for resource manager

commit 9d4039f9828c97a2a1ec5e04bcae67b32a07ca6f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 25 16:01:31 2012 +0200

    virtual resource root added for resource manager

commit c80a2173907477fd125ca0807a60997c66b6199e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 25 14:08:17 2012 +0200

    javascript workspace user management refactored

commit 1fe8a3152667285c0f8dd5375b888db58a4e1a40
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 25 14:08:17 2012 +0200

    javascript workspace user management refactored

commit ff1eb84c84007666956de29eff64607f2090ee5b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 25 08:57:55 2012 +0200

    javascript file picker

commit f794446750890ef8c9a3c36a2e09aef1a4774d2b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Apr 25 08:57:55 2012 +0200

    javascript file picker

commit 89aa2a59ebfd001462e6e782408767ffc23fc60a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 24 09:01:47 2012 +0200

    tests fixed and dojo removed

commit 46b60542e08a105756a48fa9f59298f654a4114d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 24 09:01:47 2012 +0200

    tests fixed and dojo removed

commit 7f7b0b3b7daef5e27c908e04106eab62944e7f72
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 17 13:52:43 2012 +0200

    refactor resource manager

commit dee4f4240d1e8b2fc527d2fb547b6512595d7fc0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 17 13:52:43 2012 +0200

    refactor resource manager

commit 81d4da1b4a6c609fd6775f4c979cbd8a0126d1ea
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 13 14:52:13 2012 +0200

    resource js dojo fixes

commit 009a29648e1ff454097ed6d5edfba57a022f607d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Apr 13 14:52:13 2012 +0200

    resource js dojo fixes

commit e2340061a5b435f18971f4936e3f560829f9011a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 12 09:22:27 2012 +0200

    resources can be added and removed from workspace

commit cf0354c5d7143285f7d8489fa83857e758adc266
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Apr 12 09:22:27 2012 +0200

    resources can be added and removed from workspace

commit a4078257a3be31f070ce7a2576ef2bf77e5c2975
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 10 09:09:59 2012 +0200

    ajax resource manager

commit ccf5469009988c5f5938890cb3a927e8ab7812ea
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 10 09:09:59 2012 +0200

    ajax resource manager

commit b2f5f5c8572ebb860b63fa4bd4210ecc1954089d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 3 09:52:57 2012 +0200

    dojo workspace management dialog boxes done

commit 893b98f0c12e961840e33562fba6a77f5c7a0c95
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Apr 3 09:52:57 2012 +0200

    dojo workspace management dialog boxes done

commit ed1fb920ddb88f70e97c9d9f84f5c1a8ec982c34
Merge: c70cc59 39ae4f9
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 30 10:31:48 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 6ca3c1c213ad061e7df229bd140edd6ed30b8339
Merge: 7bf83aa a5678e3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 30 10:31:48 2012 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c70cc59a17caab6fd75f984841fc2b39d990d3bd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 30 10:30:51 2012 +0200

    uses dojo instead of jquery: js tests still not working

commit 7bf83aae12b42d8e1aeb6a6506625ce5857deb12
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 30 10:30:51 2012 +0200

    uses dojo instead of jquery: js tests still not working

commit 39ae4f9f064de9b82dc759d4b2785c200336b490
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 28 09:34:22 2012 +0200

    Fixing resource creation test

commit a5678e345384f799debef738b8929e59529def05
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 28 09:34:22 2012 +0200

    Fixing resource creation test

commit 6ee26fd5fd7e78f3239b54f62475e7307e84ec5e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 27 15:36:28 2012 +0200

    Fixing style/md violations

commit 25608ff2b42439bfa7538a9e42b65ff16ba11f56
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 27 15:36:28 2012 +0200

    Fixing style/md violations

commit 4b64c8099b4c52b51c6fe2d5ca0c199bd0bcb8c9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 27 15:25:00 2012 +0200

    Unskipping resource-related tests

commit 53d344053df7139f984300d4ea84b8942ab64ea4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 27 15:25:00 2012 +0200

    Unskipping resource-related tests

commit 486abad25eb95345627185a94c2e214e48ad9174
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 27 15:13:48 2012 +0200

    Making resource entity abstract

commit 23e181cd139f64ee66d18d30e613d9f4f852563a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 27 15:13:48 2012 +0200

    Making resource entity abstract

commit 21a23b8efd035ee7dbf3737f37190cde878dea3b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 27 14:55:33 2012 +0200

    Allowing plugins to declare specific resource types

commit 25a9e6326bdbc13566e4a4bb2a25ae0543e26d72
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 27 14:55:33 2012 +0200

    Allowing plugins to declare specific resource types

commit e951aaa26538d3185d1f0504b923c5fcf1f9c5c7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 23 12:04:35 2012 +0100

    adds tests for the directory resource (+ remove documentbundle)

commit 23f4a0618e322c6532a12db2194fe671126556d2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 23 12:04:35 2012 +0100

    adds tests for the directory resource (+ remove documentbundle)

commit 706fe27d1694189f59768fe13ebc5a6df99ad360
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 22 13:30:58 2012 +0100

    directories can be removed

commit 6e374609369978b482c6b17f746e08632cc5e7d1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 22 13:30:58 2012 +0100

    directories can be removed

commit 847bebbfe183ad94f84237cdff31f81324b90626
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 22 11:16:30 2012 +0100

    files can be removed

commit ecdd39b3b16fcb47ba20247c7a84e559c9a662e1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 22 11:16:30 2012 +0100

    files can be removed

commit 3d06d0d01a33c7e1c04923386987f0876bc14e85
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 22 11:09:06 2012 +0100

    indent

commit 75c097a29a0111584a8caeb6867956b4369cabae
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 22 11:09:06 2012 +0100

    indent

commit f9f8af5b38bb6886470cb3cf35d3f814145e6c1c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 22 11:06:39 2012 +0100

    1-N relation between workepace and resources

commit 53825e070d8a48b27fd18f1557db21299893b9af
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 22 11:06:39 2012 +0100

    1-N relation between workepace and resources

commit 76fb2fb2f0c619228350cfe89d32920cfa6cd39a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 22 10:53:05 2012 +0100

    merge the resource manager

commit cb867c38b2623b530a354a3c0db347618e2014e0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 22 10:53:05 2012 +0100

    merge the resource manager

commit 4a5158162a41905bbcd651bf47d45f1fd6dfba8d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 21 14:07:26 2012 +0100

    Removing selenium stuffs until cis is properly configured

commit 68d499954d50e0cb1f7215fa2f7af390c89f6728
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 21 14:07:26 2012 +0100

    Removing selenium stuffs until cis is properly configured

commit 3cef45a3b0d405a3f8814a142717a2e27715768c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 21 13:43:24 2012 +0100

    Fixing phpunit build config again + checkstyle violations

commit 78098e7309190d88fc3bc95bc460d18e0a2e8f69
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 21 13:43:24 2012 +0100

    Fixing phpunit build config again + checkstyle violations

commit 579f5a7dd933e3573ac08a1916ef51d9e45f3a1a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 21 12:03:55 2012 +0100

    Fixing phpunit build configuration

commit 1a239dee2cf37d7b3a95ac2229e5c7218aede765
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 21 11:42:13 2012 +0100

    Renaming RequestListener to LocaleSetter

commit 466ddb4fcab21cb98ee00f5db187df8c9b269937
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 21 11:42:13 2012 +0100

    Renaming RequestListener to LocaleSetter

commit 7140440bb656f336b2fcbc66df08e3ea71a2b184
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 21 11:41:12 2012 +0100

    Removing extendable annotation (resource discriminator map hard-coded)

commit f5632db07371ef491c95e17759dfb5ff28b75937
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 21 11:41:12 2012 +0100

    Removing extendable annotation (resource discriminator map hard-coded)

commit 99877d1dbdd9936e851289c5be943f52a42bed5d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 21 09:09:04 2012 +0100

    Upgrading to Symfony 2.0.12

commit 2c092aea8c773a5d65c569d721765243b590a211
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 21 08:54:40 2012 +0100

    Moving user creation test to admin controller test case

commit 939a3243168069d3b9c86738aa1c273f5170c151
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Mar 21 08:54:40 2012 +0100

    Moving user creation test to admin controller test case

commit a62eeb652fdf31c77607dcd48933e1090dcbce31
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 20 17:03:12 2012 +0100

    Renaming workspace 'ajax' templates

commit c364b21430cb4cbd5e437936e2087db06da5dd01
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 20 17:03:12 2012 +0100

    Renaming workspace 'ajax' templates

commit b96a62d38c3763c6f074e1fc70295379938cf360
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 20 16:50:21 2012 +0100

    Fixing checkstyle violation

commit 718610de306128d223e57ff0fc66f6e7162bc5be
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 20 16:50:21 2012 +0100

    Fixing checkstyle violation

commit ec1ee457436edb87683ccf95c6d331e145b69d51
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 20 16:18:20 2012 +0100

    Locking FOSJsRoutingBundle dependency

commit e2e8dd03c39663bcab19d90b4cb8bdd9ae3ab7fb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 20 16:15:23 2012 +0100

    Refactoring admin controller config-related tests

commit cdc80ec7394d861cb835d8e347ba3fc6be3e4a6c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 20 16:15:23 2012 +0100

    Refactoring admin controller config-related tests

commit 358ecfb22cb2e3e638ffbc6a6ed02de8e20e6b5e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 20 15:16:54 2012 +0100

    Excluding selenium test cases from phpunit configuration

commit 830158e918a5c33f60277daf95010e6813b4465a
Merge: 6a327e3 02078dd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 20 14:16:43 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/public/css/main.css
    	src/core/Claroline/CoreBundle/Resources/views/Workspace/workspace_user_list.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/common_layout.html.twig

commit b2647ce1b536dbbd93020e3ab1167dcd6317c6da
Merge: 0540823 9c91e82
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 20 14:16:43 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Resources/public/css/main.css
    	src/core/Claroline/CoreBundle/Resources/views/Workspace/workspace_user_list.html.twig
    	src/core/Claroline/CoreBundle/Resources/views/common_layout.html.twig

commit 6a327e364353bce0864deaa7797f4b64e6ff95cc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 20 11:59:54 2012 +0100

    Cleaning jquery directory + small user management refactoring

commit 05408238c76920902a5fefcefe1aecdf491d0d51
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 20 11:59:54 2012 +0100

    Cleaning jquery directory + small user management refactoring

commit fb1d3b3abf80065f36d6bba8ace15b62cc6fa948
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 20 11:35:15 2012 +0100

    Adding a selenium/sauce labs test case (pending)

commit cfc3a28787b116df730a8a417cc9f920aabfb478
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 20 11:35:15 2012 +0100

    Adding a selenium/sauce labs test case (pending)

commit 02078dda370b1b5a7bf65b6acc801f0b000572a2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 16 14:15:45 2012 +0100

    -groups can be removed from workspace
    -files are now considered as resources
    -resource class reworked
    -tests about resources and files refactored
    -some code cleaning

commit 9c91e82ca7db089d1f686663a53f7168ccf29e81
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Mar 16 14:15:45 2012 +0100

    -groups can be removed from workspace
    -files are now considered as resources
    -resource class reworked
    -tests about resources and files refactored
    -some code cleaning

commit 3eed7351670b59c1d4ec669c357a4269d92b9f73
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 14 15:22:05 2012 +0100

    adds jquery mobile and groups can be removed from workspaces

commit ca5767898590e790f68bddd7ab6798cf5ed637f4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 14 15:22:05 2012 +0100

    adds jquery mobile and groups can be removed from workspaces

commit f0703cf0d6ad717ac1ab86bad86e275637d7a85c
Merge: 9766244 8758ba0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 14 09:54:26 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit bb2a32ae0f580c9e82a7f9a15e1112c1f4ab88b5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 14 09:47:40 2012 +0100

    groups can be added to workspace

commit 9766244116d30a7ccb9aa02d9599461658db8a3f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Mar 14 09:47:40 2012 +0100

    groups can be added to workspace

commit e779b5a2a9dffe0f013ebec8c9d24775ab0c1943
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 13 17:28:35 2012 +0100

    generic search for workspace users

commit b3b5d6a5289c5e94622f0e44cd42797bb1147bcc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 13 17:28:35 2012 +0100

    generic search for workspace users

commit 8758ba05d38b893c3415170acfc84d0a8708258e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 13 16:52:06 2012 +0100

    Increasing max nesting level value (tmp fix)

commit 01ef05a7f82c31d8baaefde8999f4d58b96a7fbd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 13 11:57:22 2012 +0100

    search users function added for workspace (+tests)

commit 5b9e552ebf83b1ae53be7612086e3dd19f4f05af
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 13 11:57:22 2012 +0100

    search users function added for workspace (+tests)

commit bc5e95f86bf46d135e1c8c4e650e70716287a00e
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 12 13:31:45 2012 +0100

    workspace management: users be added and removed with ajax requests

commit b53131c486b0ae232176a0b16e3b95e7c0842cf0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 12 13:31:45 2012 +0100

    workspace management: users be added and removed with ajax requests

commit fdd895db1c635cf821d6673428017970286bfb08
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 8 15:57:45 2012 +0100

    fix workspace ajax request

commit 38e52823acb449f493a0a60f8badcdfed4de6a1a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 8 15:57:45 2012 +0100

    fix workspace ajax request

commit eb24d4ba51c96419465005355915e778757bc21a
Merge: f793886 da28b49
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 8 15:27:51 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Controller/WorkspaceControllerTest.php

commit 196394a7352c1767ff08a94fb4172e95dd465598
Merge: d3c4ec5 00fe3d2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 8 15:27:51 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Controller/WorkspaceControllerTest.php

commit f793886069d0664ffd16b201a0f637aeaac2b7c1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 8 15:26:15 2012 +0100

    merge

commit d3c4ec5b641ff4af1f62c6d3ee85806a68fcebfc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 8 15:26:15 2012 +0100

    merge

commit d0b9c8a9dafbb122bea0c236b7fe6939b6ffcfe0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 8 15:13:30 2012 +0100

    create a large amount of user + ajax workspace management

commit ac257d80ee79f9eae8cf78c21b061985c103f8f2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 8 15:13:30 2012 +0100

    create a large amount of user + ajax workspace management

commit 00fe3d2e451c917f1c26f09d0793a1ef4b72f565
Merge: af41d69 82e9304
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 6 17:25:23 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Controller/WorkspaceControllerTest.php

commit da28b49eebea8d1991add64de3a66d13c790f78b
Merge: 42a0b39 365d612
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 6 17:25:23 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Tests/Controller/WorkspaceControllerTest.php

commit af41d69afba28aca1b372cc823e0095fb04ac8a6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 6 16:29:23 2012 +0100

    Making user entity serializable (bug fix)

commit 42a0b393342cc9fed2f6a06f0dce072978621c35
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Mar 6 16:29:23 2012 +0100

    Making user entity serializable (bug fix)

commit 365d6128a9273713c13223b64be8fcb36c5ed657
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 6 14:23:30 2012 +0100

    start to use jquery

commit 82e9304ad8a531439c417398a268185c237d3aac
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 6 14:23:30 2012 +0100

    start to use jquery

commit 7f92c535b38e50ef0344f1187571a54e5d2c1776
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 6 11:57:47 2012 +0100

    workspace user management added

commit 830cbc1d2b99b2952da382fc22db888e6412920c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 6 11:57:47 2012 +0100

    workspace user management added

commit fa0b333996506bf8a857456e745f043551a5d8b2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 6 10:57:40 2012 +0100

    refactor xxx.html.twig names

commit 8dd778ee9f02d1669686e4a3f5d216c87239b44b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 6 10:57:40 2012 +0100

    refactor xxx.html.twig names

commit b4ac9a39c942baab951b0a8703b1a41eb5428a6b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 6 09:36:21 2012 +0100

    workspaces: tests and user interface started + a few errors corrected

commit 5e8c664b44e3d992c6d1bbcea15354acc9fbfef1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Mar 6 09:36:21 2012 +0100

    workspaces: tests and user interface started + a few errors corrected

commit d1e47e0afb646eca927547e3602452c49f596260
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 5 09:00:34 2012 +0100

    change the files stubs directory

commit ba98d7264a1a42ad16fa7045062d492b620b8d9a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Mar 5 09:00:34 2012 +0100

    change the files stubs directory

commit dd3bce288c48d356587e94106d2a45c3e5be5a83
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 1 17:30:59 2012 +0100

    cleaning AdministrationControllerTest

commit b4d910bc99c99b645ae7edbb74680dee4cd9fec7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 1 17:30:59 2012 +0100

    cleaning AdministrationControllerTest

commit 0f4e4148babb438ab9d5f6f1b1afe2a6aabe0a6b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 1 17:21:21 2012 +0100

    file manager service added and tested

commit 899711a7e683f9219b8d477dd8e0702ff1c3380c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Mar 1 17:21:21 2012 +0100

    file manager service added and tested

commit b1808f9ad40e99c2ac74b84a8a26a1b8cdfe19f0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 29 13:02:04 2012 +0100

    Refactoring translations

commit 3fa1f17f7c7d2a2ce5908854b7a3b86e7fcd2538
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 29 13:02:04 2012 +0100

    Refactoring translations

commit 363a459997da4ec2e47440f5bc81d5b5e5fb8253
Merge: 5aecb63 574f2b2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 28 15:56:27 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 9eead706d7baf87e7355e92a1f03f16b8e553a0a
Merge: 4f81518 ecbb362
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 28 15:56:27 2012 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 5aecb637ede0bbc1a744f12dc684a39518a18c19
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 28 15:53:43 2012 +0100

    platform settings form is now working and tested

commit 4f81518affeb0e76f4e68b4343f959b65aa9702d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 28 15:53:43 2012 +0100

    platform settings form is now working and tested

commit 574f2b2778fedcd78e60b1201f4142d9beff277d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 28 15:45:02 2012 +0100

    Upgrading to Symfony 2.0.11 (+ dependencies update)

commit b5d2e087e68ee832d12640aae8d2fd43639e86bc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 28 15:37:46 2012 +0100

    Removing doctrine extensions wrong version tag

commit ecbb362db889552cbdaa1296db2799c36d8fedaa
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 28 14:41:58 2012 +0100

    Removing unused variables and test duplicates

commit 98430789a018fbc6bfb29288745b1eccccada400
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 28 14:41:58 2012 +0100

    Removing unused variables and test duplicates

commit 183a63108d9c66360bfc28cc067a39a91b75065b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 27 14:49:48 2012 +0100

    add a form about the application settings

commit d94418f1f82fec83f1e036d13f89ac0462bc0f61
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 27 14:49:48 2012 +0100

    add a form about the application settings

commit c2dd97f1524ef108131ab8ba15c89c0c43f9c486
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 24 14:12:33 2012 +0100

    close a <div> tag

commit d34d039d3721a7ff57a63e6b559b64a74379ebbd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 24 14:12:33 2012 +0100

    close a <div> tag

commit 06f3763b4e6e293ed3de29b0692429947813c963
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 24 13:59:22 2012 +0100

    should fix the infinite loop twig bug when rendering the user list

commit df26fe2014b4e3e2ecc469e95d8d28873b296b2c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 24 13:59:22 2012 +0100

    should fix the infinite loop twig bug when rendering the user list

commit 743c2d3b8f597b199a7b518dbc127cb992eaa8c8
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 24 13:56:29 2012 +0100

    should fix an infinite loop twig bug when rendering the user list on linux
    system

commit 25074652db808518347c9a97b6b78d8d49150ad4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 24 13:56:29 2012 +0100

    should fix an infinite loop twig bug when rendering the user list on linux
    system

commit 466af0edaade5b0e98338ec80e87da04f71329c0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 24 13:02:36 2012 +0100

    fix a bug wich happened in the testing suite because of fixtures.

commit e058df92a3959975649c8134e3cad0fa1e6d9863
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 24 13:02:36 2012 +0100

    fix a bug wich happened in the testing suite because of fixtures.

commit 7376bd2a12ce7a25638774bf7e67b2f263d33630
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 24 10:25:43 2012 +0100

    Indent fixes. Groups role are now displayed properly

commit e0079a8ff3d3cd6275ad84ab00c912a6a1107412
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 24 10:25:43 2012 +0100

    Indent fixes. Groups role are now displayed properly

commit 66596e8b3e715f42f1acd95d6a00e59a46acfa8d
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 24 09:59:56 2012 +0100

    user cannot delete themselves anymore

commit c479f3967d45623e60bcf3f0c4ddcc60084e7855
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 24 09:59:56 2012 +0100

    user cannot delete themselves anymore

commit 149e888cd9ebc05dc21a4f20bc01332ccea4bed4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 24 09:51:09 2012 +0100

    adds some group settings (no tests yet)

commit cbee043392e95aa85fa94e486b28ff775f5993e4
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 24 09:51:09 2012 +0100

    adds some group settings (no tests yet)

commit 267ad685aceab179909e06b1f659ca47aeb1e542
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 23 16:07:43 2012 +0100

    tests about groups management added

commit 0410fc93a433647587abf569377fef1939125afc
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 23 16:07:43 2012 +0100

    tests about groups management added

commit 25eab82fd457b94c6c3f5916f99947e25c041b2d
Merge: 15c7d14 ad885c2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 23 13:45:16 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/plugin/tool/Claroline/DocumentBundle/Resources/views/Document/show_directory.html.twig
    	src/plugin/tool/Claroline/DocumentBundle/Tests/Controller/DocumentControllerTest.php

commit d67bcfed69b84bff33047ac0b9d55577cd338002
Merge: 3580d98 4a6e32f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 23 13:45:16 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/plugin/tool/Claroline/DocumentBundle/Resources/views/Document/show_directory.html.twig
    	src/plugin/tool/Claroline/DocumentBundle/Tests/Controller/DocumentControllerTest.php

commit 15c7d146e9a553219fcb5d05e2ac531e868297e1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 23 13:40:47 2012 +0100

    groups can be created and filled with users

commit 3580d98c294cbf295efa81876f8dbba3dcb8e014
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 23 13:40:47 2012 +0100

    groups can be created and filled with users

commit ad885c23a284ce2568449243fabe063d7dcbbca8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 23 11:36:06 2012 +0100

    Removing unused variables

commit 4a6e32ffab926b3c6f85be64228ae73ac76b7fdb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 23 11:36:06 2012 +0100

    Removing unused variables

commit 28acbf09069a328285c98f3e37f38fea0f8dedb7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 23 11:33:24 2012 +0100

    Fixing document controller and associated tests

commit 13394a1d5974e4335e62cc567501b12b12f89fda
Merge: 3a5e281 754a263
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 22 17:11:16 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 0730f5433546d452cc98f0e36f1b87932f0c16d1
Merge: ce65a6f 2679773
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 22 17:11:16 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 2679773cd9d63f1814abae0de13d41cc00c56c85
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 22 16:07:55 2012 +0100

    should fix the rmdir bug on linux when a tmp folder is removed

commit 754a263c590ce705141355ad0e31d5bfd4c5cd16
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 22 16:07:55 2012 +0100

    should fix the rmdir bug on linux when a tmp folder is removed

commit 3a5e281317285c6dc6c3176ec4646f2b7c0e902f
Merge: b5dce6a 5062a6c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 22 14:18:16 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit ce65a6f5adee7fc585f07240764025518c4395e2
Merge: f40508c be68736
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 22 14:18:16 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit b5dce6a59f172ff29cdf2b42f6a99fcdc6dc0e2b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 22 14:17:14 2012 +0100

    Workspace controller refactoring (draft)

commit f40508c4e1f90d61ac1a6a99fd73b8937ff26861
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 22 14:17:14 2012 +0100

    Workspace controller refactoring (draft)

commit be68736e4ff5f0fc9fee17a27101081016b998a2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 22 13:36:19 2012 +0100

    fix indent

commit 5062a6c30ad3af3aa1a889b441c3a47640d6d5f7
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 22 13:36:19 2012 +0100

    fix indent

commit f383d5b6fdaa5fd65f217e20c56f91c52c7ded94
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 22 13:26:09 2012 +0100

    Add the files/tmp folder. This will fix a crash when you upload a zip
    file.

commit 29217fed7b1b346d25961e2b054a7cc98a3eeeb3
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 22 13:26:09 2012 +0100

    Add the files/tmp folder. This will fix a crash when you upload a zip
    file.

commit 40ce27e0024cd5fd9a68ab6178c16740b2ad2b6b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 22 11:28:49 2012 +0100

    fixes a few errors during the tests (document & user)

commit cda7e3f4fe5aef6c09a917445f794296e0f4372f
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 22 11:28:49 2012 +0100

    fixes a few errors during the tests (document & user)

commit ce913dad9ec7b53ebdf1fa00e4a4b9baa464ed4a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 22 10:54:43 2012 +0100

    adds many tests about the users management

commit 70d6161d638a74f1e67d8029c33c1927e547c736
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Wed Feb 22 10:54:43 2012 +0100

    adds many tests about the users management

commit 53c75dfc8f2d35ebb4426595c16e7400dab46c64
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 21 17:18:18 2012 +0100

    Adding a workspace repository

commit 6e6b933f73a69b927856e6d9de75d99bff8ce0c3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 21 17:18:18 2012 +0100

    Adding a workspace repository

commit 612031f055b68a6851e2ec6d2576e424364b8eb5
Merge: b99870b 1b6e3a5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 21 15:37:01 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Listener/UserPasswordEncoder.php

commit 488368551c17f4fab192d5dd29a88b07925d1f78
Merge: b50e5c3 b5c56fd
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 21 15:37:01 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Listener/UserPasswordEncoder.php

commit b99870b64d7c7c8bd3371865b5a1773e2cae9af6
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 21 15:30:34 2012 +0100

    upload zip is now working and a userController was added (users can be
    updated, created, listed and suppressed)

commit b50e5c3ce4ecbd55bbd7611e07a23cb1ac92a25c
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 21 15:30:34 2012 +0100

    upload zip is now working and a userController was added (users can be
    updated, created, listed and suppressed)

commit b5c56fdb2eb4a8504d5080ae07929077ca6c53e3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 21 11:41:37 2012 +0100

    Using flash message instead of template variable

commit 1b6e3a54dd697a4d4252251d094717fb4cf0f9a9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 21 11:41:37 2012 +0100

    Using flash message instead of template variable

commit d15fcab78d7323b3ea0c5a3391bec7bf32fc2ba3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 21 11:35:44 2012 +0100

    Moving flash messages position and style

commit b8c13d8de274b25ad19ebeaddde80622ca343db7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 21 11:35:44 2012 +0100

    Moving flash messages position and style

commit 51d210f70f783b2aeac83475fac06d06c23ec99f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 21 10:03:11 2012 +0100

    Fixing wrong service call

commit 9207f677c0f19303979003b4d2fb1975239a625a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 21 10:03:11 2012 +0100

    Fixing wrong service call

commit bfbfcbc9b91c6de82e66c39188063a6b64981c29
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 21 09:54:35 2012 +0100

    Adding an update method for user password encoding

commit 472bea19c564a08b7b9bdc52cf0b086a2c74e226
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 21 09:54:35 2012 +0100

    Adding an update method for user password encoding

commit 8db04a96cf6a894e5e7f79822aabebdd4f970a04
Merge: e773243 58f6919
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 20 13:42:18 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/RegistrationController.php

commit 8f7012ce431566e8c186f396cc1a6c12c533edfe
Merge: 617e899 07daef2
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 20 13:42:18 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CoreBundle/Controller/RegistrationController.php

commit e773243ba1d3c6ea12774dcf777b20339f165d63
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 20 13:38:30 2012 +0100

    user can now edit their profile

commit 617e8999e70ab6eb2b774dc016c681976e62eebf
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 20 13:38:30 2012 +0100

    user can now edit their profile

commit 07daef222e637e8eb5ecfd115b03253bdc01f2ed
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 20 10:51:46 2012 +0100

    Making controllers extend symfony controller class (avoid injection of all services for each single action)

commit 58f69193ea9a4e1551c8c25a1138843a98e83ed4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 20 10:51:46 2012 +0100

    Making controllers extend symfony controller class (avoid injection of all services for each single action)

commit 386ce5fafe72c57a5843d103c841b2ff60944879
Merge: 7f130eb aef2748
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 20 09:28:01 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 33c2af2e55e73208af3fdf00033d7477a25d0282
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 20 09:27:28 2012 +0100

    zip upload is now working and addition of the user edition form

commit ead1837f32a9feb540a09dc0c4f6a42af9987003
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Mon Feb 20 09:27:28 2012 +0100

    zip upload is now working and addition of the user edition form

commit e6103814cb5c140e3239b0b2e9be09cc9581ca66
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 20 09:24:53 2012 +0100

    Creating dedicated files/services to handle platform config (avoid cache issues)

commit 7f130eb7398046f3fbf5105de0bec25b47c83283
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 20 09:24:53 2012 +0100

    Creating dedicated files/services to handle platform config (avoid cache issues)

commit 2570cf366f5a54d39f7ab588a1f889ab9cc1dff1
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Fri Feb 17 10:18:30 2012 +0100

    directories can be uploaded from a zip file.

commit aef2748c204313fd39e575adc5e6742daa460161
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 16 13:51:59 2012 +0100

    fixes PHPUNIT loadData crash

commit 65691fd4c865b6137a88ecd14d5dcabc8b59fe68
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 16 13:24:15 2012 +0100

    support zip download from a directory

commit a030ad06aaeb77ee42f43947c5b367e32d264eaf
Merge: b23295f c2aaf6b
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 16 10:32:17 2012 +0100

    merge

    Conflicts:
    	src/plugin/tool/Claroline/DocumentBundle/Controller/DocumentController.php
    	src/plugin/tool/Claroline/DocumentBundle/Resources/views/Document/list.html.twig
    	src/plugin/tool/Claroline/DocumentBundle/Tests/Controller/DocumentControllerTest.php

commit b23295fadde9467f4dbe6a363d171f67c30f2e20
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Thu Feb 16 10:08:03 2012 +0100

    directory support

commit 77a0fed8e29bf3abe5675c28c87e665fc31281b7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 15 10:03:53 2012 +0100

    Adding a workspace creator taking params from config (wizard service draft)

commit aeba72f76d46115483a3b374f9f6ccb781b40077
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 15 10:03:53 2012 +0100

    Adding a workspace creator taking params from config (wizard service draft)

commit e9d6b4fc940c5f831849549ae0ce029de7133c99
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 14 11:50:47 2012 +0100

    Reorganizing core bundle (topic-related classes moved to library dir)

commit c2aaf6b92a41a2d124f169a00ba3e23bc405161f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 14 11:50:47 2012 +0100

    Reorganizing core bundle (topic-related classes moved to library dir)

commit 4f4295c6a6ee8e8c30c6d88fdc7398e61eb1f5b0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 14 09:45:08 2012 +0100

    Removing acl entities (useless)

commit 541b57dc4f207b005d1c41debbcfd8550886b1ae
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 14 09:45:08 2012 +0100

    Removing acl entities (useless)

commit c98a1104b3c3dd5a96586f9d3059c656a55dad9f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 14 09:39:15 2012 +0100

    Removing unused private field rule from phpmd config

commit 08cb4369b8c6f745c6c2f9ebca9508d3ed15f960
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 14 09:37:28 2012 +0100

    Implementing base workspace types and roles

commit d5ba79c1e4ce0a48430125d1fd296d0770d998dd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 14 09:37:28 2012 +0100

    Implementing base workspace types and roles

commit 93042930d0837672fd531ba0aa3a92e7790a58b4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 10 09:54:03 2012 +0100

    Fixing exception namespace

commit 12a023fccbd75e3b6a0dab805c20217a68c7a40c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Feb 10 09:54:03 2012 +0100

    Fixing exception namespace

commit 498a0c41ba387ae94593f7af9f6a055a783f85cf
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 8 15:14:21 2012 +0100

    Changing extendable listener service configuration for consistency

commit 140496f32178307e00647dbe47c9af2897b7fc7c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 8 15:14:21 2012 +0100

    Changing extendable listener service configuration for consistency

commit 665cfcd6a3741753d0d20d8d3a0055a7f2ad7615
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 8 14:26:37 2012 +0100

    Using a listener for user password encoding (user manager removed)

commit 733977fb00cada7722cf5095fae09f03fa10e1d7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 8 14:26:37 2012 +0100

    Using a listener for user password encoding (user manager removed)

commit d1315ed4c133c32537830fc9bdfdf1819b461735
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 8 11:06:46 2012 +0100

    Adding plugin directories to code coverage

commit b67ac2181f6b0f901d9e45fdf8b12e2a29a33ffb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 8 10:49:46 2012 +0100

    Updating readme (file/test directories permissions)

commit f10d7e754856ab802345840022fb674f47eac55e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 8 10:45:44 2012 +0100

    Removing a comment

commit 1f6b1376bd0c24469caf52a68410e45ec4e19bf1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 8 10:41:27 2012 +0100

    Fixing and refactoring document controller test

commit 95adfe92c57a2fbc1d15f0e14f21453de1fb2972
Merge: c468c54 d6af42d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 8 09:17:10 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit ce9e73f8e13418346331ab010f5e13607bbb83c7
Merge: f09ff18 c4d7347
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 8 09:17:10 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit c468c54fd63e912d0764a82eb7bb019d87772f0d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 8 09:15:48 2012 +0100

    Removing role manager

commit f09ff180db85d7d84daefbefac2323193d9bbce7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Feb 8 09:15:48 2012 +0100

    Removing role manager

commit c4d7347a979ce9af500db119bb66ada1717e13a5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 7 16:53:13 2012 +0100

    fix a bug due to too many parenthesis

commit 5083716b4c48a1ea2fecd927d73399b6ea1d6f60
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 7 16:52:19 2012 +0100

    include plugin tests in test suite

commit d6af42d1faaabae37ac7e0b736249aa738847aaf
Merge: 9f62c3f dc501d0
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 7 16:13:34 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 8a8a96e86d99747245f03a6d9d33292d100ac5e4
Merge: f33f595 91ffdb5
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 7 16:13:34 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 9f62c3f892cdbb7a4e0b45f2303f0e20043d0c4a
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 7 16:05:17 2012 +0100

    Add a document bundle.

commit f33f59569cd0507241c4d0461c10033de597e459
Author: Nicolas Godfraind <nicolas.godfraind@gmail.com>
Date:   Tue Feb 7 16:05:17 2012 +0100

    Add a document bundle.

commit 79e9dc528f56b6346a53feb3dbdf581cac23d65f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 7 14:12:23 2012 +0100

    Making platform roles read-only

commit 35a9563d7260f148ba24868145b35145aac9ca68
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 7 14:12:23 2012 +0100

    Making platform roles read-only

commit e70037669f8e8be591c249c1b6e410ed17791913
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 7 11:54:14 2012 +0100

    Changing tests setUp() method visibility to protected

commit cc8c8a187c0c3804dd0e70d459c54464e1738f89
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 7 11:54:14 2012 +0100

    Changing tests setUp() method visibility to protected

commit ea7287438213b0bb54481458c5d67ec0584e9195
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 7 11:36:34 2012 +0100

    Upgrading to Symfony 2.0.10 (+ dependencies update)

commit 1d1f1b07611363415abcbf0247abbe963cefe293
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 7 11:36:34 2012 +0100

    Upgrading to Symfony 2.0.10 (+ dependencies update)

commit dc501d06f9792d4825cf83fa11b552919f437d6d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 7 11:17:43 2012 +0100

    Implementing user/group roles management methods

commit 91ffdb5a32bf99d4ad6df153391fdf78bc57a961
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Feb 7 11:17:43 2012 +0100

    Implementing user/group roles management methods

commit afc788f6637a96f3989d269e71fd8499b316f5cd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 6 09:15:06 2012 +0100

    Adding 'append' option to fixtures command (no db purging)

commit 40c73c905872b70ee1bd52aa3f3c1348ef834501
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Feb 6 09:15:06 2012 +0100

    Adding 'append' option to fixtures command (no db purging)

commit 9e300af9d248710afc8395b7733146e98a8f3786
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Feb 2 13:59:37 2012 +0100

    Fixing plugin config paths

commit d01508949e882dfe8f317ff4ee1964c9ae8a3de0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jan 31 17:22:48 2012 +0100

    Adding uml diagram (dia format) to Resources/doc

commit 3d5843d56a1d662b93157519f4f7070d204075da
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jan 31 17:22:48 2012 +0100

    Adding uml diagram (dia format) to Resources/doc

commit 4d2a6325fdac776d79a8f616b86149816fd762a4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jan 31 10:00:39 2012 +0100

    Adding a group entity

commit 87a27b893f84a1e8f745b546cca7b74c02fff1c1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jan 31 10:00:39 2012 +0100

    Adding a group entity

commit be818d82b53eead17f4553caeaf9127036c3fb74
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 27 13:24:06 2012 +0100

    Adding a voter which always grants access to admin users

commit 43caa51ccde98a5654f6c1152a2bd924acf59e9d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 27 13:24:06 2012 +0100

    Adding a voter which always grants access to admin users

commit 91c5917ed0ca658ff81daad0c8a6910b33b93998
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 27 10:22:16 2012 +0100

    Taking role hierarchy into account in user entity methods

commit 185f3825b6de615932596ca235d7904b1446c80e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 27 10:22:16 2012 +0100

    Taking role hierarchy into account in user entity methods

commit f1caa04b723500eab57aff984d29c64cde79289b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 26 12:16:23 2012 +0100

    Using fixtures references in functional test cases

commit 7cd181c2502aed80b5afad4223c39022e36ee39b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 26 12:16:23 2012 +0100

    Using fixtures references in functional test cases

commit 2bf24a9a9e6763f5dadf1d95edc62ab9dcd7080c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 26 10:18:49 2012 +0100

    Adding a fixture for platform roles hierarchy

commit a5c34a66a0caeb59ccee8dde39be4161e0a24cb6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 26 10:18:49 2012 +0100

    Adding a fixture for platform roles hierarchy

commit 3394d00084b1cff95727164e498d2cd085e25c76
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 26 10:16:55 2012 +0100

    Using nested set to allow Role hierarchies

commit 0a9de824c569fcc81313ab9bc6b4e03789717782
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 26 10:16:55 2012 +0100

    Using nested set to allow Role hierarchies

commit 1d7f9b7b5a835a6c9c72b7bcc0634656d8016ca3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 26 10:06:34 2012 +0100

    Adding prod fixtures loading option to the install process

commit ab3297fc56cc558d1d30fb362e49a0cc3af0bf7a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 26 10:06:34 2012 +0100

    Adding prod fixtures loading option to the install process

commit ad430de6889a46fa79217f2cca4a31ae9f3969dc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 26 09:42:05 2012 +0100

    Modifying doctrine extensions version tags

commit ca18a434d9512b0867626772c62974f68d3c1f63
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 25 13:23:44 2012 +0100

    Removing useless join table

commit 60bd8c943f4cafcf9f855183f67bd34c97eadf68
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 25 13:23:44 2012 +0100

    Removing useless join table

commit 53987baa489aee79a22eafb5c90c9eb0cf424b5f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 25 11:26:31 2012 +0100

    Adding user fixture loading to FunctionalTestCase (+ functional tests refactoring)

commit 13d19e2c4f6605bb320e85e75af61c1d00255d68
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 25 11:26:31 2012 +0100

    Adding user fixture loading to FunctionalTestCase (+ functional tests refactoring)

commit 1a00529188360c50e3f926f410f6f21a3ee413d5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 25 10:28:45 2012 +0100

    Fixing code analysis target paths

commit e7f9aa071eb29c4cdae9f01c86e00bef2e8a7073
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 25 10:16:43 2012 +0100

    Using roles for workspace users management (draft)

commit 19e4ab0017b22c9e835df8329604f3f644abbecd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jan 25 10:16:43 2012 +0100

    Using roles for workspace users management (draft)

commit 99ff462afd484ed5e35e64e0853bbb48a38334ef
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 13:47:27 2012 +0100

    Fixing checkstyle violations

commit a8ddabb40c17e7a4669eadaf2c81c0dca779ef9f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 13:47:27 2012 +0100

    Fixing checkstyle violations

commit c8942c5bbd33ed75fe38f9030e3397a27ebb0529
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 13:45:34 2012 +0100

    Adding a script to launch code analysis tools locally

commit edd72eb2a2dec79970d202827b76965d8e4358f4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 11:47:01 2012 +0100

    Fixing a namespace error

commit 93f2d0f573bfe037e8d6e4e206cd52c8afb83b9e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 11:47:01 2012 +0100

    Fixing a namespace error

commit 2c23dbaae4d9106332dbe55f0ec50f8aea65501b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 11:38:39 2012 +0100

    Using a container parameter to store stub plugin dir path in test environment

commit 1dfa8d2a9eb1d88ce6f5cc76901cd2c95c77fa34
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 11:38:39 2012 +0100

    Using a container parameter to store stub plugin dir path in test environment

commit 068b0165dc48f96aee3b68a196abf744fb69b2ab
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 11:22:26 2012 +0100

    Reorganizing templates

commit bc54763ed54421deac56dbfc3ef7f41c8455fff5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 11:22:26 2012 +0100

    Reorganizing templates

commit 0c20366d5e666dd13f0a5e20d9a067e0d0ec9dbc
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 11:04:48 2012 +0100

    Reorganizing exceptions

commit 6fcba07f7f84cd7218aaf38d4e7e22169bc90d32
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 11:04:48 2012 +0100

    Reorganizing exceptions

commit a0332e651625a2690124b6d011117ee0d58ddee1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 10:13:02 2012 +0100

    Organizing translations by domain, not by bundle

commit b6df435f470d82a2ab23559eba480a552cd5ea7c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 10:13:02 2012 +0100

    Organizing translations by domain, not by bundle

commit 370a553ad56937e4cb8a81ac548d932f6b1b85ab
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 09:40:06 2012 +0100

    Moving security-related elements to Security directory

commit 766df61bd5321774a9951b7d7c6cc79847b4ca8a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 09:40:06 2012 +0100

    Moving security-related elements to Security directory

commit 365ae847942e7c6cbe66c7c49c560fff03e43315
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 09:06:50 2012 +0100

    Moving plugin bundle types to Plugin directory

commit b2e7c8d6c3afd73c8572933db406fe4b3644e624
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 23 09:06:50 2012 +0100

    Moving plugin bundle types to Plugin directory

commit bb99fe9c1ac9c6e92b888f771e7f1bccb73048b9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 20 17:31:07 2012 +0100

    Moving history browser to Browsing/HistoryBrowser

commit 35f9be377a20a1e3270cba41adf6f806621c6059
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 20 17:31:07 2012 +0100

    Moving history browser to Browsing/HistoryBrowser

commit 2c3773d954f566f9edd1481844b7dca8c40dd266
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 20 17:12:58 2012 +0100

    Merging and renaming controllers/listeners services files

commit d43ec0b8ab543174b2324f48b223d90a3565f779
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 20 17:12:58 2012 +0100

    Merging and renaming controllers/listeners services files

commit 3ad49c4a6bfb9ba72ff738834a428c4472c79f44
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 20 16:31:55 2012 +0100

    Merging and refactoring installation process

commit 6d2c36c3b0f1b728561b17e8b22e7b180ca091ac
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 20 16:31:55 2012 +0100

    Merging and refactoring installation process

commit fd3dac8d7bf1b0578092e7afe9f81a7e0010678a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 19 15:44:49 2012 +0100

    Modifying stub namespace case

commit 2b81add37b02edb7e384b49875f2d20338abf165
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 19 15:44:49 2012 +0100

    Modifying stub namespace case

commit d57a36bddd3f0e0dd113389494bee5e20bae14a9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 19 14:07:09 2012 +0100

    Merging core bundles (raw)

commit b426c34cb11e5b58d998ae29bbd8c67076d3c8cd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 19 14:07:09 2012 +0100

    Merging core bundles (raw)

commit 274fdfc2c122ae564b006ef35390e469fba52641
Author: clarophil <philippe@claroline.net>
Date:   Tue Jan 17 16:41:34 2012 +0100

    add permission in toolInstanceManager

commit aa528c117558b28e253ecefba24db590233356c0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Jan 17 13:18:17 2012 +0100

    Finalizing context history browser (tests + config option)

commit 07b7c48997a9feab601d9531573fb2cab13c628b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 16 12:24:29 2012 +0100

    Upgrading to Symfony 2.0.9 (+ vendors update)

commit 94734c0a890031567943cd2ef69eb990a156309b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 16 11:36:15 2012 +0100

    Workspace/Desktop reorganization (draft)

commit bf69f1953bc76c4f6b0dfae8986532746637e8da
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 16 10:38:16 2012 +0100

    Adding a context history browser (draft)

commit 3defb037d5be77cdf4dd3049a566cccbc5ec25f2
Merge: adee78b c4087eb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 16 10:31:09 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/WorkspaceBundle/Resources/config/services.yml

commit adee78bca04fa4730433b9aa9214b6c7f6c5121f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 16 10:26:21 2012 +0100

    Pre-merge

commit c4087eb3288cf6af7aaccaba092c6d27c018b2fc
Author: clarophil <philippe@claroline.net>
Date:   Mon Jan 16 08:50:52 2012 +0100

    add method for toolInstance in workspace entity

commit 535eacb077597d710b4bb3ffc581ad9187373f94
Author: clarophil <philippe@claroline.net>
Date:   Mon Jan 16 08:49:38 2012 +0100

    ToolInstanceManager as service

commit 53605f7137a635145633b1a8a6041d3ed7882a7a
Merge: 8ed00fc b7aa9f1
Author: clarophil <philippe@claroline.net>
Date:   Sun Jan 15 18:04:53 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 8ed00fc30326af549108f57876ba68a83e5a7775
Author: clarophil <philippe@claroline.net>
Date:   Sun Jan 15 17:54:48 2012 +0100

    ToolInstance entity, ToolInstanceManager for workspace and test

commit b7aa9f131a3a3c2ac5bbbb06cc3082983644792c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 13 16:01:44 2012 +0100

    Fixing typo in UserManagerTest namespace

commit 1e33f47f2748464a15eac077af2c443eb19da6a2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 13 15:46:27 2012 +0100

    Coding conventions

commit 85363390b2a22fcf55200dc685b97c65aba11f30
Merge: 04da982 bb8b8f6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jan 13 15:39:54 2012 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 04da982b9d462bbaed8cf3513f5d1a121eaa2045
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 12 11:34:41 2012 +0100

    Adding a service for workspace users management

commit 0c17cbc9d0471b140f077ee2ce99ecb858ec3300
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 12 10:55:18 2012 +0100

    Adding a getRight method to the right manager

commit 28aab3003a443a6f228f9339624ad628dbae5624
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jan 9 13:57:12 2012 +0100

    Fixing namespace error

commit bb8b8f6f51344a994841a26ead7bfd8ee198b3d8
Author: clarophil <philippe@claroline.net>
Date:   Mon Jan 9 12:14:02 2012 +0100

    Use ApcUniversalLoader if APC exists

commit d07caf5cfbef3825d79e0301b0b4552d5df8f501
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 5 16:06:54 2012 +0100

    Fixing style/pmd violations

commit 074ca0d4ed04dfe0544513e150c3a8fc0397961c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 5 15:37:18 2012 +0100

    Making exceptions specific (compatibility with phpunit 3.6) and more detailed

commit a5e3345bd3bb74c641012e8b7ddf3e2f1770b4d9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 5 14:36:44 2012 +0100

    Removing the service directory for consistency

commit ad5d32e28b4c9233b180ed98e8b2ed1f7c75089e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 5 14:34:43 2012 +0100

    Using realpath() function for web dir path

commit daff3871dbca2f1048c6ea5d831344565c8b8502
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 5 10:19:51 2012 +0100

    Using absolute path for assets:install command

commit 8e8e45f5317ff8a78ea248d050b6de90016025d6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 5 09:53:37 2012 +0100

    Removing unused variable

commit fd4b5984b59c29ca7b7e7e33d4a11bd1f9324705
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 5 09:42:04 2012 +0100

    Upgrading to Symfony 2.0.8 (+ vendors upgrade)

commit 9a704855e81225d609f06605f07afb8c6b4c13df
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jan 5 09:22:04 2012 +0100

    Adding an user registration controller (+ self registration config option)

commit addaa98d2ee36807e9ef06da0a540d4b71c6cee0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Dec 23 17:10:00 2011 +0100

    Fixing checkstyle violations

commit eb228549148774d08fb63b0bbd1f7d8adcdee768
Author: hudson <stephane.klein@claroline.net>
Date:   Fri Dec 23 11:15:11 2011 +0100

    Upgrading to Symfony 2.0.7 (+ vendors update)

commit 6b1bcc24ebd027a71d60548a252be9c18083a549
Author: hudson <stephane.klein@claroline.net>
Date:   Fri Dec 23 10:50:24 2011 +0100

    Removing generated bootstrap files and adding them to .gitignore

commit 6271f466607a88ae99f8da7496977767e618639c
Author: hudson <stephane.klein@claroline.net>
Date:   Fri Dec 23 10:33:02 2011 +0100

    Moving all the local configuration files in a dedicated (writable) directory

commit 6ddd1aad3ff129d05acb2699187d43d9cadaeeef
Author: hudson <stephane.klein@claroline.net>
Date:   Fri Dec 23 10:17:22 2011 +0100

    Using yaml format for the parameters config file an moving it to app/config/local directory

commit 6f43188213bfe3e5962f1afe48ab4a32b85a72b0
Author: hudson <stephane.klein@claroline.net>
Date:   Fri Dec 23 09:37:15 2011 +0100

    SensioDistributionBundle unregistered (as it hardcodes the path to the parameters config file) but kept in deps (for its build_bootstrap script)

commit 73a455ae0adc324a5ccde67d5e7478a7afc6ae6a
Author: hudson <stephane.klein@claroline.net>
Date:   Fri Dec 23 09:24:17 2011 +0100

    Adding a command to create an user

commit 6649352297917edec20b7b9e0c8c02342487ed79
Author: hudson <stephane.klein@claroline.net>
Date:   Fri Dec 23 09:20:10 2011 +0100

    Removing web/bundles directory ; assets installation added to the install process

commit 59b83a4f752a55a71b150efd03b02c2ef908f1e4
Author: hudson <stephane.klein@claroline.net>
Date:   Fri Dec 23 09:05:01 2011 +0100

    New development orientation : no more applications, home/desktop/admin moved into the core, one component handling every workspace type

commit e32ebfcc1406b0db77d169b50e85405792decd2e
Merge: 23b3c0a eed69e2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 13 10:48:35 2011 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 23b3c0abecf145ee95ab7d762375e94794faf2e9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 13 10:45:52 2011 +0100

    Renaming NotepadBundle to ArticleBundle + various tool-related adds

commit 1f25b786e3f877914cafd534b18a03f1946e21ea
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Dec 9 15:27:33 2011 +0100

    Adding Text entity as immediate Resource sub-type

commit 6c665027bc188e264883172ae90e77a393cf4556
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Dec 8 14:44:27 2011 +0100

    Moving ResourceManager to Manager directory

commit eccdd9aed44d8cacc72c29d9efb3c6e426165200
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Dec 8 14:23:41 2011 +0100

    Making resource entity extendable and timestampable

commit e4c7dd65af65d66499f16230beffae526131f214
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Dec 7 11:12:20 2011 +0100

    Adding permissions infos in README.md

commit eed69e252cbe1d7faf57c6bbb2bffa70e0e443cb
Merge: 513c524 f024c96
Author: Systho <systho@gmail.com>
Date:   Wed Dec 7 11:11:08 2011 +0100

    Merge

commit 513c524c20e7aac23e24ca8ce96539377d76cfcb
Author: Systho <systho@gmail.com>
Date:   Wed Dec 7 10:58:24 2011 +0100

    fixing code violations and removed useless statement in factory_install_dev

commit f024c96fb47e4cc68d8a0fecb5ff7191cd01c388
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Dec 7 10:12:35 2011 +0100

    Updated README.md

commit 3b3a418a9d98ac8bcd990f5738fa14e87e6d452d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 6 17:09:19 2011 +0100

    Fixing checkstyle violation

commit 86a5291c69cd96fd605241075e0952f00c7ffa2e
Merge: ccf1c29 7859f53
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 6 16:42:53 2011 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit ccf1c29e7b2966acd0d62bd1b0e15eab6a204313
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 6 16:40:52 2011 +0100

    Removing a placeholder + slight changes to gitignore and parameters.ini.dist

commit 7859f5324e4c8d3e9322297feb3bf19cb45e24cb
Author: Systho <systho@gmail.com>
Date:   Tue Dec 6 15:51:42 2011 +0100

    fixing ci problem, (forgot to define root path)

commit 6e05b86f51d09562b0b14701e967a8d4215de145
Merge: 806b1e5 5e79195
Author: Systho <systho@gmail.com>
Date:   Tue Dec 6 15:02:44 2011 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 806b1e58b1c17d04b4be507dd85e808f6672230c
Author: Systho <systho@gmail.com>
Date:   Tue Dec 6 15:02:08 2011 +0100

    checking duplicate prefix only for different bundles. Removing old factory scripts, creating new ones (one for CI Server, one for devs)

commit c7fa220cc06f8bc2438f8cae729a25e1aa952188
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 6 13:39:31 2011 +0100

    Reducing AbstractPluginCommand method complexity

commit 5e79195cfad69a8ed351cec9582e952e09c8efc7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 6 12:54:38 2011 +0100

    Upgrading to Symfony 2.0.6 (+ vendors update)

commit 1b1025b666136b526c048925ca783adf18f4573c
Merge: 722b767 f9772a9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 6 12:35:30 2011 +0100

    Merge branch 'master' of github.com:claroline/Claroline

commit 722b767ef6f6276214a9cfd0caf2534e8cda7672
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 6 12:34:04 2011 +0100

    Using instanceof operator instead of is_a function

commit 499e54e217365ce9b03df81018615934c053c22a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Dec 6 11:30:08 2011 +0100

    Fixing code duplication

commit f9772a9641104440ba12af2f109ccdf8bad790f1
Author: Systho <systho@gmail.com>
Date:   Tue Dec 6 11:23:38 2011 +0100

    remove useless 'use' statements

commit 4ad5ee19c57f167c1d9375b3bed5771acf9bebc8
Author: Systho <systho@gmail.com>
Date:   Tue Dec 6 11:21:06 2011 +0100

    Using a routing.php in order to test existence of routing.yml file

commit d1e1c027a5fd42a1730cdb00ef860617935fd479
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Dec 5 15:33:30 2011 +0100

    Fixing a regex bug

commit a716bf7dfbd6f1c558265f1d68a47ddc28645254
Merge: 3d9d848 5784ba6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Dec 5 11:54:46 2011 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/plugin/Claroline/DummyPluginBundle/Migrations/Version20110916130400.php

commit 3d9d8489bbbf1b4c3d5c829b369bfce81f659eea
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Dec 5 11:44:51 2011 +0100

    Plugin bundle refactoring (application/tool/extension dir separation, dedicated component for install, cleaner design)

commit 5784ba6eedad3720b31e2b001ccb1d8347620b20
Author: Systho <systho@gmail.com>
Date:   Tue Nov 29 17:19:29 2011 +0100

    using BundleMigration::addId() when possible in migrations.

commit 0c9aff23cca49917e0dffe1f9a96e3cc89bff05e
Author: Systho <systho@gmail.com>
Date:   Tue Nov 29 11:05:16 2011 +0100

    Fixing other violations and a bug in workspace controller

commit d085f79c7476766376c91ed212e3feb32d8f3b7d
Author: Systho <systho@gmail.com>
Date:   Tue Nov 29 10:33:02 2011 +0100

    fixing coding convention violations, removing delegator class as it will probably never be useful

commit 62d30af7f693f630cc88e67c9324a0cd9d425cdc
Author: Systho <systho@gmail.com>
Date:   Fri Nov 25 10:05:32 2011 +0100

    changing migrate('') to migrate('0') for uninstalling as it is specified in the documentation

commit 6bcf72ab913bc1f8826131397365a2d474bb79e8
Author: Systho <systho@gmail.com>
Date:   Tue Nov 22 18:09:31 2011 +0100

    Awesome refactoring of RightManager

commit d540c78cfbbbf1f4892d6edc94661270852d7128
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 14 14:45:24 2011 +0100

    Moving TransactionalTestCase to CommonBundle + bundle reorganization + checkstyle

commit 1ea5855e6b3e05dfb7cbf33a25aaec5cac76ac59
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 14 12:51:30 2011 +0100

    Removing unused code + checkstyle

commit e49d2b9ad3e1991630a0aedd1a45e05f576209bb
Merge: 11bdd21 13fbd81
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 14 12:02:08 2011 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 11bdd21d34dfb79fc5ff4d1190e203c405f0b6b0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 14 12:01:30 2011 +0100

    Adding some remaining methods to the right manager

commit 13fbd81276929ded41155cdc954c57aca9ce9d44
Author: Systho <systho@gmail.com>
Date:   Mon Nov 14 11:56:52 2011 +0100

    Introduced a TransactionalTestCase encapsulating all tests in a transaction thanks to the TransactionalTestClient

commit 58723d3dcd9fd844cae23948e79d59d8122cfcb4
Merge: dc2e12d 14b88fd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 14 08:39:38 2011 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit dc2e12db6dafd41d39718cb7ce877eacef52b1b2
Merge: 25ad2ee d2cb7f9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 14 08:38:27 2011 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

    Conflicts:
    	src/core/Claroline/SecurityBundle/Service/RightManager.php
    	src/core/Claroline/SecurityBundle/Tests/Service/RightManagerTest.php

commit 14b88fdf084555f299a1307cac029d02dd22e269
Author: Systho <systho@gmail.com>
Date:   Thu Nov 10 17:21:22 2011 +0100

    Called parent :: teardown() when it was missing

commit 25ad2eed793e7de9e7821bea6edd331c93f8b3d4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Nov 10 17:13:38 2011 +0100

    Adding methods for role's rights management

commit d2cb7f94266811865d58aa3c4cd0d882c6d5a3cc
Merge: d146743 007bceb
Author: Systho <systho@gmail.com>
Date:   Thu Nov 10 16:36:57 2011 +0100

    Merge branch 'master' of https://github.com/claroline/Claroline

commit d1467430ceb407cfb8fd16c7d8640deeeb61956f
Author: Systho <systho@gmail.com>
Date:   Thu Nov 10 16:35:57 2011 +0100

    Fixed automatic install process, fixed tests about Class-scope ACE

commit 007bceb99c1cdef809516322d9ad40c9c13f5fc2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Nov 8 10:47:23 2011 +0100

    Using proper aces deletion when deleting user permissions on an entity

commit 74954f59d6863cda1284638eba0300dc1ee72925
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Nov 8 10:26:19 2011 +0100

    Fixing checkstyle violations

commit 57588a9fafed89b3beaf991710282b7edab884dd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Nov 8 09:22:13 2011 +0100

    Unskipping workspace controller tests

commit 1596cf07fef92aa662aeabba0b11cc626c78780d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 7 10:49:48 2011 +0100

    Upgrading to Symfony 2.0.5 (+ additional vendors upgrade)

commit 44a9bdba184e9c5189d92e218c5bd31cce60a7e4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 7 10:29:15 2011 +0100

    Adding a basic resource bundle

commit ac01b686cc09311a77b057a4fb855c9568e5e96b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 7 10:28:26 2011 +0100

    Using the right manager to handle workspace ownership

commit 4919d47e3bd0555be0d9b02f94facac11a438167
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 7 10:26:17 2011 +0100

    Adding security bundle stub entities in test configuration

commit a09e9a3982d829d45550c04c62758b0f7d3ec6d0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 7 10:24:36 2011 +0100

    Adding an user repository

commit 90716ec2189c96685fa84ef39d96e2f66c29ed39
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Nov 7 10:23:17 2011 +0100

    Adding a right manager to handle entity permissions

commit 9871b729135c22f71393fbd449ce3a22c3758913
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Oct 24 11:02:46 2011 +0200

    Fixing path in RegisterBundle + style

commit 3a5c4ca2564a6812efcabb62b1259dbb75cec100
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Oct 21 09:03:22 2011 +0200

    Adding an installation order for core bundles (temporary)

commit e53c41a505d330f5814b452677e42172d0b43a61
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Oct 18 09:54:51 2011 +0200

    Renaming getPrefix() method to getRoutingPrefix() + changing application prefixes to get shorter/prettier urls

commit d55aa5f4369b2bb80167dd69f4a90c74feeef6f4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Oct 17 15:12:50 2011 +0200

    Moving the desktop features to a dedicated application

commit 1212c1878dbfe694a8f40e34d3ae4593f2a0089c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Oct 17 14:47:31 2011 +0200

    Skipping the last non-skipped test of WorkspaceControllerTest

commit 6532ca7d37ab669100bee6368ad63379539f5223
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Oct 17 14:26:17 2011 +0200

    Adding a connection target (+ tests + command-line utilities) mechanism : core template controller isn't aware of plugin config anymore

commit e68debcd80e3646fe763ed443cc01313ec00c311
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Oct 17 10:47:45 2011 +0200

    Fixing exception handling in ApplicationRepository

commit 74cf79e9817d96b76a06ec2f6dcc616900820224
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Oct 14 17:21:56 2011 +0200

    Fixing violations + removing unused code + dummy test on acl

commit ff4195817dafe631330c988d0cd64999e6c12e3f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Oct 14 16:37:08 2011 +0200

    Adding a platform index controller + command utilities + tests + basic home application

commit 3d878b802095ce45d3ba5eb29ec4dcddeee7559e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Oct 14 13:43:21 2011 +0200

    Adding foreign keys for tables using class table inheritance (not doing so leads to dead rows, see doctrine doc)

commit 1568a6d9414ea04b206531b5bc354c430593f896
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Oct 13 13:51:08 2011 +0200

    Adding an ApplicationManager and an ApplicationRepository (+ tests)

commit 7c1323bdb0a8ff87712b860bf2e9d5fdd0dad14a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Oct 12 13:41:48 2011 +0200

    Excluding migrations directories from code coverage.

commit 116940f5f288d2719d471d2135ccbbd2f528304d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Oct 12 11:41:35 2011 +0200

    Fixing checkstyle violations.

commit 313470cb8745cd9a02258877f10db9a2e98cca05
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Oct 12 11:25:10 2011 +0200

    Fixing ApplicationLauncherTest (data providers seem to be called *before* the setup)

commit efdb3f4912b44b1d6cd9ba734c68ca9d0fed4e8d
Merge: 7bd3ca8 e6aeea2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Oct 12 10:49:25 2011 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 7bd3ca8190e2dae262f6f84cbbfadee9f04a9323
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Oct 12 10:45:34 2011 +0200

    Adding a 'getIndexRoute' method to ClarolineApplication + tests

commit 487b265a9e5b3d61535397cbeee7007522726381
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Oct 12 10:43:11 2011 +0200

    Adding some more validation and tests for ApplicationLauncher.

commit e6aeea2d554d5c0db7086ebef1f944168876db58
Author: Systho <systho@gmail.com>
Date:   Tue Oct 11 13:39:54 2011 +0200

    First Test for Installer

commit bcdad7a3037e02750ed4c2fceb596d7671fdfce9
Merge: ef01612 bbfe09e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Oct 11 12:52:31 2011 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit bbfe09ec5859546dadf6f74b96e0dae1eda2ad90
Author: Systho <systho@gmail.com>
Date:   Tue Oct 11 12:51:15 2011 +0200

    Removing validwithmigrations tables even when test fails

commit ef016129276b714a821e6c6c4dce531ed199eaea
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Oct 11 10:45:11 2011 +0200

    Using joined inheritance for plugin type hierarchy (abstract root would need mapped super class strategy)

commit c43d5d821e2565ab1474ad1b9fab358c5215a456
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Oct 10 15:22:28 2011 +0200

    Modifying firewall rules - Using SecurityExtraBundle annotations

commit 06268a74adf35ed9b6922a1bad67664cf7f6dbb2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Oct 7 15:26:55 2011 +0200

    Fixing checkstyle violations

commit 2b3ccd2e437e73a7081d5e826eac31252cdaf862
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Oct 7 15:25:41 2011 +0200

    Unskipping invalid entities tests

commit 1b02ec1aeb8671bdb349ffa31076d0755a50b778
Author: Systho <systho@gmail.com>
Date:   Fri Oct 7 14:38:26 2011 +0200

    prefix must be generated in lowercase

commit afcf804f46f1dd12ad9434b53c0eb96d0e5d2bc8
Author: Systho <systho@gmail.com>
Date:   Fri Oct 7 14:26:03 2011 +0200

    Adding migrations for new entities used in tests

commit 22c5f8d1589b2a3dd61d785bc4991adeb1bf12bb
Author: Systho <systho@gmail.com>
Date:   Fri Oct 7 12:50:48 2011 +0200

    install scripts works better with absolute paths

commit ca77fe3c5fdc8ed4b7ae455cd301816d345d9fd6
Author: Systho <systho@gmail.com>
Date:   Fri Oct 7 12:46:21 2011 +0200

    adding a reset of the database in factory_install scripts

commit f34c0183cc6fff5a1f1bd45a15c9b36eea3eb4fd
Author: Systho <systho@gmail.com>
Date:   Fri Oct 7 12:25:34 2011 +0200

    removed claroline:reinstall command which was basically only running uninstall then install. Fixing a bug making the core installer installing plugins

commit 05e08a0c60b77f2ba223b5549807446e015a7a29
Merge: 8b0fba4 f1cf94c
Author: Systho <systho@gmail.com>
Date:   Fri Oct 7 10:34:45 2011 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit 8b0fba42488c0b4760f552e1116a8820506fd4e7
Author: Systho <systho@gmail.com>
Date:   Fri Oct 7 10:34:10 2011 +0200

    Add claroline:install, claroline:uninstall and claroline:reinstall commands.

    do not use doctrine:schema:update anymore. The claroline:install process now runs the migrations needed for every bundle.

    Signed-off-by: Systho <systho@gmail.com>

commit f1cf94cf022a9791354c21694c61c2d0d1f4d146
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Oct 6 09:06:18 2011 +0200

    Updating security pattern according to the routing prefix mechanism

commit 747c04f391a128b33d2292ea9a5a314ec5e62e4c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Oct 6 09:05:20 2011 +0200

    Fixing checkstyle violation

commit 5f09b60f090292abc6eaa3febfba553c27cde886
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Oct 6 09:02:39 2011 +0200

    Skipping two tests of WorkspaceControllerTest (incomprehensibly broken since the upgrade to 2.0.4)

commit 3174426f2fed7f2a2ab457a28cf29924c617caee
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Oct 6 09:00:33 2011 +0200

    Fixing error due to vfsstream upgrade (see https://github.com/mikey179/vfsStream/commit/90366a439ab83ef4e71b6aca4b2a7b4b791fb3ac)

commit a2174a5f00f658bd96c6bc2487cd97df44e15321
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Oct 6 08:59:29 2011 +0200

    Upgrading Symfony (2.0.4) and vendors

commit c75383e8eaa8e4468ff114429e95b0cc5b66164e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Oct 6 08:53:00 2011 +0200

    Updating the bin/vendors script to benefit from the new "lock" option

commit ec9d3498ba3557402817502b910ec76128a6bafa
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Oct 5 17:33:49 2011 +0200

    Fixing the PluginBundle AbstractCommand->resetCache() method (input arguments of plugin commands are not arguments for cache:clear, exceptions were thrown)

commit 76e44bd28ec85869462e6389bb4fb836e6ba5517
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Oct 5 09:08:28 2011 +0200

    Adding mapping conflict detection to the ExtendableListener + compatiblity tests with gedmo tree extension

commit 682a8a24b1b984766d6ace1f94326e76ff7881d0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Oct 4 09:40:11 2011 +0200

    Using mocked dependencies for some AuthenticationController tests

commit 1f40140b58ecb0b59ae1c413964fc67d80283094
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Oct 3 13:45:08 2011 +0200

    Removing the underscores from the stub plugin class names to avoid confusion : the symfony autoloader *cannot* load a class whose name has underscores, as it replaces these underscores by directory separators (previous stub classes with underscores could only be loaded because their file was required in a plugin validator step)

commit f3b281d171947abd7452d1a7c16c8eb049bde63f
Merge: 7762ee1 79760a8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Sep 23 17:21:16 2011 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 7762ee1d6c5322220db15248f9e964281c26759c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Sep 23 17:19:57 2011 +0200

    Adding some tests to AuthenticationControllerTest

commit 1e90a95bd8d2615143c5eaedc5ef4be4711f01bf
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Sep 23 17:01:51 2011 +0200

    Adding a test case for the role manager + removing unused custom role repository

commit 79760a87c1a4f9fcb71c9301e3a248662f4043cd
Author: Systho <systho@gmail.com>
Date:   Fri Sep 23 15:15:11 2011 +0200

    excluding non Claroline plugins from code coverage

commit a385f6164ad77e9900df7945ef5ed4d4e7e4745b
Author: Systho <systho@gmail.com>
Date:   Fri Sep 23 14:37:58 2011 +0200

    redifining which part of the codebase should be covered by tests

commit b32428c76efdb5cbdb53d33b4cc25156a4bfd8ab
Author: Systho <systho@gmail.com>
Date:   Fri Sep 23 14:14:46 2011 +0200

    Fixing pmd violations, excluding test resources from coverage

commit 19c6b09b78f258517fa0f26793174d4d3cde1d01
Merge: ce167dd 7eb42bb
Author: Systho <systho@gmail.com>
Date:   Fri Sep 23 13:57:31 2011 +0200

    Merge

commit ce167dd09c5c3d2b82c1c8a4f7bb1299ce4f2651
Author: Systho <systho@gmail.com>
Date:   Fri Sep 23 13:54:54 2011 +0200

    wrote back the calls to persist() in order for the metadata to be loaded

commit 7eb42bbcdef9c839ec20cbb75cb7ee9a77660592
Merge: ba377cb 94168e2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Sep 23 12:08:48 2011 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit ba377cbd99c7fc1bf466944bdfd2957ffd7ff427
Merge: 08f2c69 aaa5493
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Sep 23 12:08:31 2011 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	src/core/Claroline/CommonBundle/Service/ORM/DynamicInheritance/Listener/ExtendableListener.php
    	src/core/Claroline/CommonBundle/Tests/Service/ORM/DynamicInheritance/Listener/ExtendableListenerTest.php
    	src/core/Claroline/CommonBundle/Tests/Stub/Entity/Ancestor.php
    	src/core/Claroline/CommonBundle/Tests/Stub/Entity/FirstChild.php
    	src/core/Claroline/CommonBundle/Tests/Stub/Entity/FirstDescendant.php
    	src/core/Claroline/CommonBundle/Tests/Stub/Entity/SecondChild.php
    	src/core/Claroline/CommonBundle/Tests/Stub/Entity/SecondDescendant.php

commit 94168e2cef35a681879b45e860c70cd4bc0e5035
Author: Systho <systho@gmail.com>
Date:   Fri Sep 23 12:05:52 2011 +0200

    adding test for differenciating between selecting all instances of a kind or all instances of a kind AND its descendant kinds

commit 08f2c69fc158ce0e28083992e37d94dddf6d114a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Sep 23 11:24:40 2011 +0200

    Adding a test to ExtendableListenerTest

commit aaa54936f015db7f1051474289d22f49e6d2680b
Author: Systho <systho@gmail.com>
Date:   Fri Sep 23 11:16:47 2011 +0200

    Adding a remove:all command which is now used in the factory_install process, improving the dynamic inheritance mechanism and aadding tests to it

commit d975ed4256f056613515806c43fa1e8c7e897b1e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Sep 23 10:21:30 2011 +0200

    Adding a length attribute to the discriminator column when overriding metadata.

commit 19fed1175ecfc1a22059ec5b4ec3503f10714420
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Sep 22 17:22:09 2011 +0200

    Adding support for dynamic entity inheritance (first steps)

commit e9b7b425c95713ea2974977c2bc7a7f8706b6402
Author: Systho <systho@gmail.com>
Date:   Thu Sep 22 08:39:49 2011 +0200

    Fixing CodeSniffer Violations

commit 4593af2eae2d7ba340ff4ae74a1a662054c6f565
Author: Systho <systho@gmail.com>
Date:   Mon Sep 19 14:54:55 2011 +0200

    manually removing plugin after installation in ManagerTest because DDL is not transactional in MYSQL

commit 41a85d2adcd0a1756ad05c676a19f045c293dd01
Author: Systho <systho@gmail.com>
Date:   Mon Sep 19 14:45:51 2011 +0200

    Fixing Checkstyle & pmd, removed ShortMethodName check from pmd config

commit ba865231929740e0274d87c578dc35d17d29375f
Merge: c83bee2 867256d
Author: Systho <systho@gmail.com>
Date:   Mon Sep 19 14:09:58 2011 +0200

    Merge branch 'master' of https://github.com/claroline/Claroline

commit c83bee2e5ed99de0ee3119aa00197a3c0bfd81b3
Author: Systho <systho@gmail.com>
Date:   Mon Sep 19 14:08:07 2011 +0200

    Added migrations handling for plugins, they can now have their own tables and version

commit 867256ddcb007b94b36c1f2a264029cb4cc16582
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Sep 16 11:16:11 2011 +0200

    Adding getters to acl classes + fixing checkstyle violations.

commit 5dde25fc8ce95dca8b78677d2c055c85c2ea405b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Sep 13 11:39:29 2011 +0200

    Adding mapped entities for acl tables (deactivated)

commit 31053dc1ca708372e228f017c5b280a0780c9e40
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 12 15:03:17 2011 +0200

    Adding DoctrineMigrationsBundle.

commit faa8d1ad1eaff206b586e95805c51fdf1aa7459a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 12 09:14:03 2011 +0200

    Modifying PluginBundle Command classes to avoid resetCache() duplication.

commit 2042e12e78c115fd39a2328e75028ce7708c9f74
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 12 09:11:15 2011 +0200

    Adding a routing prefix to VendorX\DummyPluginBundle to avoid conflict with Claroline\DummyPluginBundle.

commit 357b4be059612b09e1701a44b9c56f14922d8133
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 12 08:18:40 2011 +0200

    Removing useless translation files.

commit 04ca6760e5e018e69ba5ba75cc62c9c5da625e29
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Sep 9 13:30:43 2011 +0200

    Fixing checkstyle warnings.

commit c207ff448df51da9b4d95d310f2944876a675a67
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Sep 9 13:12:42 2011 +0200

    Fixing checkstyle violations.

commit 7b6f173822ccebefdc07a0fe0c15106c13f23ed6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Sep 9 12:10:32 2011 +0200

    Adding a mandatory prefix mechanism for all plugin routes.

commit ab20149c120c71f9ee86ce15c1fc0a4b455a4046
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Sep 8 14:05:43 2011 +0200

    Enforcing naming convention for service controllers.

commit 8ab648e8c9e71395d38df3c060aa26d5fac450b2
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Sep 8 14:00:56 2011 +0200

    Removing useless service definition.

commit 37f7e216e80bb4e3bdebba3f8fd283f7d1ad348b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Sep 8 13:51:38 2011 +0200

    Defining WorkspaceController as a service.

commit 5daf4e7f69ed4ed9ec8abd3c69d774c0c688000a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Sep 8 13:49:53 2011 +0200

    Removing useless getAlias() methods.

commit 005a28eb0d736e2d36fe2833369e241aa963648c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Sep 7 17:28:07 2011 +0200

    Defining AuthenticationController as a service.

commit db6c34c5cd5629cf3faaf496c513789608db78c5
Merge: b6bde9f f03469e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Sep 7 14:07:45 2011 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit b6bde9f9361cf16adc36d305801aa41edebfbf54
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Sep 7 14:06:18 2011 +0200

    Fixing checkstyle violations.

commit f03469e2dd5d789c003e671ff429d24fcd087a8f
Merge: fa3ec45 347f5b9
Author: Systho <systho@gmail.com>
Date:   Wed Sep 7 13:47:34 2011 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit fa3ec45ffe0be19d4e5292e52c7f7a7768e26c69
Author: Systho <systho@gmail.com>
Date:   Wed Sep 7 13:47:21 2011 +0200

    disabling TooMAnyMethods rules because it counts private methods as well

commit 347f5b962ef0ff64caafb7cc2f9afd7a897551fb
Merge: 86456c4 8c98b99
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Sep 7 13:11:17 2011 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 86456c41a1bfe32cce1e9e9e562bd793b6028826
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Sep 7 13:05:32 2011 +0200

    Remove CoreBundle and GUIBundle. Create a CommonBundle gathering all the features which are shared between bundles (currently just the base layout templates and the the transactional testing client).

commit 8c98b9917b54ca81bb01a09cc5b8c6f39beab487
Author: Systho <systho@gmail.com>
Date:   Wed Sep 7 11:46:11 2011 +0200

    fixing errors due to previous commit (again)

commit 748d81c696709a6d56d4fad663601769c21f9598
Author: Systho <systho@gmail.com>
Date:   Wed Sep 7 11:12:45 2011 +0200

    fixing errors due to previous commit

commit 34be5a6046417d7383ac5582133aeaaf0db50366
Author: Systho <systho@gmail.com>
Date:   Wed Sep 7 10:56:47 2011 +0200

    fixing checkstyles violations, removing design rulesets from phpmd config (there will always be good reasons to bypass those rules)

commit 685c09d9a2f845e95e1f2b9ce1ba8a926c2f85fe
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Sep 7 10:33:21 2011 +0200

    Moved ApplicationLauncher widget in the plugin bundle.

commit 4b72251250425e1be8142d851ba7d645f019493c
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Sep 7 10:29:31 2011 +0200

    Cleaned some routing files.

commit d3de95038a22bb83b5e3e7973c2f276b13db9c10
Author: Systho <systho@gmail.com>
Date:   Wed Sep 7 09:44:41 2011 +0200

    Oups, bad-formed phpmd config file

commit 30d710eb1d057d6acbf199d2c9341f9897478618
Author: Systho <systho@gmail.com>
Date:   Wed Sep 7 09:16:15 2011 +0200

    Fixing some style issues, disabling bad phpmd rule concering control structure template

commit 54df7ccb3990afb712241eec153fbff4b7b3ef56
Merge: 78cce6f 77fd783
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Sep 7 09:00:43 2011 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 77fd783ffb2cb5fa2e53196c09897fcf486d76e0
Author: Systho <systho@gmail.com>
Date:   Tue Sep 6 17:59:35 2011 +0200

    Populating phpmd and phpcs rulesets

commit 78cce6f393743068078a95dd352cf41752291e29
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Sep 6 17:11:34 2011 +0200

    Removed a 'use' statement.

commit 33bb1781375544c7c67fe5db5ed3794fb1b7ec79
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Sep 6 17:10:42 2011 +0200

    Small CC fix.

commit 6145fbb0bec1770f848e2e21926d840e8b8f8b0d
Author: Phil <Phil@systho-desktop.vinci.be>
Date:   Tue Sep 6 16:27:49 2011 +0200

    Fixed some tests in order for them to pass on windows.
    Changed the PluginManager\FileHandler behavior to translate any DIRECTORY_SEPARATOR into slashes before dumping in yaml file

commit 88d4dcdb1531d9a74fd388bcbb7ff533aa133dc7
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Sep 6 11:47:43 2011 +0200

    Defining RegisterBundle's main controller as a service.

commit e166efbb4ef943e803160119cecfe6d55cd3e4ca
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Sep 6 10:04:11 2011 +0200

    Quoted "@*" expressions in service config files (plain '@' character illegal in yaml)

commit b6a54a2f2be58da141dbb1a6f3c7ce4fe2d7b2f6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Sep 5 14:26:49 2011 +0200

    PluginBundle refactoring (part 2) : delegate application/tool validation to dedicated services + cleaner separation in tests and stubs

commit f1bac93513f9b23af4edf87d7cedd5edcd33b9da
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Sep 2 15:13:31 2011 +0200

    Upgrading to Symfony 2.0.1

commit 12a140f5caac268db63701a6d63207fdd130195d
Merge: 82b6ff8 7e63045
Author: Systho <systho@gmail.com>
Date:   Fri Sep 2 13:55:06 2011 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 82b6ff89adf36710ac9d772003c7ace3b6c6f4a6
Author: Systho <systho@gmail.com>
Date:   Fri Sep 2 13:54:39 2011 +0200

    adding a placeholder in order for the tests to pass despite git, fixing a test : testInstallApplicationDoesntDuplicateExistingRole

commit 68457e22cf9dbb2b09d9db00f4a2a52e3aba5d18
Merge: 3b14d38 d23e7ea
Author: Systho <systho@gmail.com>
Date:   Fri Sep 2 13:38:43 2011 +0200

    merge

commit 7e63045f001e84c883cb3dd528f0809ace7c433e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Sep 2 13:31:32 2011 +0200

    Adding a placeholder in an empty stub plugin.

commit 3b14d382a5cab4ed84861e37f0152dba8835eb73
Author: Systho <systho@gmail.com>
Date:   Fri Sep 2 13:31:16 2011 +0200

    Removing unused local variables

commit d23e7ea791e1a33f5a0ee735804a0c4a1b9ffa06
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Sep 2 12:43:17 2011 +0200

    Remove old commented code.

commit 985c2e8eab6bbf22e0c355b8f652c2589d54f153
Merge: 5b2edb5 c5d4412
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Sep 2 12:35:50 2011 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 5b2edb5160b10888a29cd8556def5773206b3c26
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Sep 2 12:31:04 2011 +0200

    PluginBundle refactoring (part 1) : slight improvements to the validator, complete reorganization of the tests (virtual files for config writing, real stubs for actual plugin management)

commit c5d44128eda61c20c0d3110a930a1fd3b671a7c4
Author: Systho <systho@gmail.com>
Date:   Fri Sep 2 11:35:18 2011 +0200

    Namespaces need  to be registered in a single pass in order for the same namespace to be used in src and in plugins

commit 6b64db61b7622cae6114b1badd35600084a9c690
Author: Systho <systho@gmail.com>
Date:   Fri Sep 2 11:15:49 2011 +0200

    PluginManager now creates empty config file if they do not exists

commit 26aab69a1a9f64d3ce255e12c1f36a1ce63b91f7
Author: Systho <systho@gmail.com>
Date:   Fri Sep 2 09:59:59 2011 +0200

    new install scripts, removed plugin files automatically created, recreated placeholders

commit 84993a85907367d2ff88c67055aa8e69c96fd804
Author: Systho <systho@gmail.com>
Date:   Fri Sep 2 09:50:39 2011 +0200

    improving install_script, emptying default plugin config

commit fd09a1767601b142c489da95738f0e4c6dde4042
Author: Systho <systho@gmail.com>
Date:   Thu Sep 1 15:57:20 2011 +0200

    adding an ending blank line in deps file.
    replacing some slashes by DIRECTORY_SEPARATOR

commit dfd1d606a85f878d4a9ea3dda3e6eb8c0c065095
Author: Systho <systho@gmail.com>
Date:   Wed Aug 31 16:07:38 2011 +0200

    forgot to import ArrayInput in PluginInstallAllCommand

commit 3fb34438417eeb3cb91f4b3d5a7767a415d14ad9
Author: Systho <systho@gmail.com>
Date:   Wed Aug 31 16:05:33 2011 +0200

    Fixing a bug in PluginInstallAllCommand. Commenting out all line not related to test environment in CIS_raw_setup

commit 28eac6f225785ad531c412c484eb96bc5e0fa9d2
Author: Systho <systho@gmail.com>
Date:   Wed Aug 31 15:48:41 2011 +0200

    removing creation of database in CIS_installation because the db will remain the same and the db_user has no right to create another db

commit fab60572312eaf08895dd9b40805613bed1e4d76
Merge: cc4c693 d2dad82
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 30 11:21:46 2011 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit d2dad8228739019e7deb1c9ea9b28557b63d950d
Author: Systho <systho@gmail.com>
Date:   Tue Aug 30 11:26:22 2011 +0200

    clearing the cache after plugin install/uninstall

commit cc4c693d97209da6ea51c948f342e93b397703a6
Merge: 3b229ae 0347f9b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 30 11:17:21 2011 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 3b229ae18e6b76c69d2595ad8473b4c70471f4bb
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 30 11:10:05 2011 +0200

    Add a command to drop acl tables. Replace database dropping by schema dropping in the CIS job script.

commit 69fe1193d7f94a5955a8abb18c976eaa56ae5e74
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 30 11:07:42 2011 +0200

    Ant build file modified to use only one phpunit configuration file.

commit 0347f9bcf9b1b79a54892a17fbee2f53e5cde7c4
Author: unknown <Systho@.(none)>
Date:   Tue Aug 30 10:55:23 2011 +0200

    Adding support for system independent directory separator in plugin installation

commit 63ab4b66e8a38e527d61e7023ca7f191e82ee37d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 29 12:41:06 2011 +0200

    Small fixes to README.md.

commit a5bdb12422e6e2211096bcfcc14231246fae9f91
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Aug 29 11:03:25 2011 +0200

    Add an 'app/build' directory, with various build tools configuration (see php template for jenkins).

commit 84039265c9de5752ff06c61bbcae107f3772c6e0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Aug 27 19:04:01 2011 +0200

    Removed phpunit from CIS raw setup.

commit 117d49b6064ea94478f1c40da98c539810535f87
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Aug 26 18:44:19 2011 +0200

    Fixing bad method name + typos.

commit 0584b3874acd270128d851b5e5d6bc45868fca69
Merge: fad3618 8b3a3dd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Aug 26 15:34:24 2011 +0200

    Merge branch 'master' of github.com:claroline/Claroline

commit 8b3a3ddb9566f1d12fd958a8d82a33b1836a8160
Author: Systho <systho@gmail.com>
Date:   Fri Aug 26 15:31:10 2011 +0200

    small fix in README.md

commit 7b19b5169bf019ff3fc4108304ca80525130bb6e
Merge: cd9945c 7f6c9f9
Author: Systho <systho@gmail.com>
Date:   Fri Aug 26 15:28:29 2011 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	README.md

commit cd9945cb9c7a50f636ae6b2be6e351d486f51fe0
Author: Systho <systho@gmail.com>
Date:   Fri Aug 26 15:23:55 2011 +0200

    Updating Readme, Fixing Tests, adding todo tags after a short review of the code

commit fad3618f0f3f2f2e472f21b9a6d8c5bf52dd39b1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Aug 26 11:05:48 2011 +0200

    Add a script for CIS job setup.

commit 3e96817b3e758a6b42ecc941b951e5c326cc62aa
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Aug 26 10:26:13 2011 +0200

    Command-line added for raw installation of all the plugins. Other commands renamed.

commit 7f6c9f94d63f337b6c1b98e7f9c2e50c03b63ef6
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 25 14:38:29 2011 +0200

    Add application launcher menu. Update readme.

commit 0d0276fa65effad1e7de78bad715f28a29b509f3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 24 17:21:39 2011 +0200

    Plugin manager refactoring : put database handling in a dedicated service + use DIC in automated tests.

commit de17dd2a0cb090acfc3b23d156ec84d491dbddb5
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 24 11:03:33 2011 +0200

    Add a service for role management. Add unique entity validation on users and roles.

commit 3d1a13921acb21fbf04f80eb6f4c273eade0b252
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 24 11:01:19 2011 +0200

    Add application plugin management (launchers, access roles).

commit 5651c46a6ea501240afcf13848a73950f90003b1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Aug 24 10:56:43 2011 +0200

    Move auto-registration logic into register plugin bundle.

commit a03407c3453af420848f0200b4b4014e69f1b316
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Aug 20 20:20:54 2011 +0200

    Adding a service for user management.

commit 37af73e46bb0f3b6d82dcf5e6c1930248cedf99e
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Aug 20 12:43:33 2011 +0200

    Core and plugin bundles moved to "src/core" and "src/plugin" directories.

commit 379caad9aad4093ac265ad5fd5eee9eea0257606
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Aug 19 11:24:45 2011 +0200

    Updated vendors.

commit 645439dc01d6756debec2685a6d4286d69593cb3
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Aug 19 10:32:40 2011 +0200

    Turned user's roles into doctrine entities.

commit 831b0667d350adc00f3cd68d8cb0cc5dcfb8924a
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Aug 18 14:32:09 2011 +0200

    Small additions to the plugin bundle (pending)

commit 6d6677efb0acefb0cca67a8e09402c54c20f741d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Tue Aug 2 10:00:45 2011 +0200

    Plugin db registration added.

commit 0a78b5821849612a336e3cc65b240296234bb8c1
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 28 17:28:11 2011 +0200

    Updating to Symfony 2.0.0 (Stable !)

commit 66cbec6b29505543fb1a1951feb0f28133c25982
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 28 16:40:03 2011 +0200

    Adding plugin routing resource import.

commit 584d17314589cc68c045770ab841e33cb90fc338
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 27 17:26:44 2011 +0200

    PluginBundle FileWriter renamed to ConfigurationHandler + class refactoring

commit 052dbab2196f6c38943a433fbeebb15d547781c8
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 27 15:03:14 2011 +0200

    PluginBundle refactoring + tests + command-line utilities.

commit 37bd41b97abf43717395aca699da2c08a4986e04
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 25 11:09:06 2011 +0200

    Updating to Symfony RC6.

commit 77085295b9516afb35badf77397d66a76b629031
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sun Jul 24 20:17:01 2011 +0200

    Plugin bundle draft.

commit a8fcc2de321fab60b3664fed88f90b5ca1111a03
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 18 14:59:31 2011 +0200

    VfsStream (virtual filesystem for tests) added to third-party libraries + dependencies locked.

commit 69442919eb08fce660c7379c053da73b06894d75
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Mon Jul 18 08:39:20 2011 +0200

    Platform-wide templates and widgets put into a gui bundle.

commit 4aec1ecba563120e5d418587400e5f935421ef76
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 16 21:02:19 2011 +0200

    Workspace logic moved into workspace bundle.

commit 5dbc8c3dfcba08073dc75f1195013702d17101e9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Sat Jul 16 15:57:30 2011 +0200

    Authentication logic moved into a dedicated security bundle.

commit 5f9a5a754799d9a5b4a7ad72ee36cb3dacd597f9
Author: Systho <systho@gmail.com>
Date:   Fri Jul 15 11:55:54 2011 +0200

    Added Transactional Testing, Workspace Managers and Shared Data between fixtures

    Transactional Testing is sharing the same connection between all request. It is up to the tester to begin/rollback transaction in the test.

    Workspace Manager is a DAO for workspace, it is made of two layers : managing doctrine and managing ACL. it is available through Symfony Service Container

    Testing data made in Fixture can be shared using a reference container, the tester must provide the same container to all the ficture which share data.

commit 8fc66c79deb73bb4a157c4148debf35eafd1b793
Author: Systho <systho@gmail.com>
Date:   Thu Jul 14 14:06:42 2011 +0200

    updated readme because parameters.ini must be defined before third-party bundles are downloaded

commit 7ace3e67ea35b12a85a590a6f86298b88bc997f9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 8 10:32:56 2011 +0200

    README updated once again

commit 5ef1d037f77a03cacc904689c9097ea6a4a5c34d
Merge: 8981bcf 04d125f
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Fri Jul 8 10:26:01 2011 +0200

    Merge branch 'master' of github.com:claroline/Claroline

    Conflicts:
    	README.md

commit 8981bcff5f87bc267dfd48d12c6e87c63dd595a9
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 7 15:54:16 2011 +0200

    Acl mechanism added on workspace creation/deletion

commit 04d125fb1a87808114735d053444e835eb5eda2f
Author: Phil <Phil@systho-desktop.vinci.be>
Date:   Thu Jul 7 11:06:29 2011 +0200

    Changed the Readme to facilitate copy/paste

commit 4fddea6458b5d43e34cf805b66768a577228476b
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Thu Jul 7 10:03:56 2011 +0200

    Select controls by name rather than value (subject to translation) in tests

commit 2c005083df983e3d92baec4a68f350e54e6230b0
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 6 17:27:47 2011 +0200

    By Systho : added functional tests, fixtures support, fixtures for users and workspaces and config option for a test database

commit 6d88fc0a73e6bda11d5830e32be211c11bde3b1d
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 6 13:25:25 2011 +0200

    README to README.md (still learning git...)

commit 682d6132c6677f31bee814e5389b05e8fb18dabd
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 6 13:23:10 2011 +0200

    README to README.md.

commit 540f4d2cba2555f8eeb1471a53c8c8be592bf3a4
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 6 12:34:07 2011 +0200

    README file updated.

commit a3d8e49bc5b7b9e816f92a074d21b4749ed82c62
Author: Stéphane Klein <stephaneklein221@gmail.com>
Date:   Wed Jul 6 12:06:07 2011 +0200

    Initial commit
Merge remote-tracking branch 'origin/core-squashed'

Conflicts:
	Controller/ProfileController.php
	Controller/WorkspaceController.php
	Form/Factory/FormFactory.php
	Listener/Resource/ActivityListener.php
	Manager/LogManager.php
	Resources/views/Log/config_workspace_widget_form.html.twig
	Resources/views/Profile/profile.html.twig
	Resources/views/form_theme.html.twig
Fixing merge.