Romain Neutron
|
2de870c3f9
|
Add a namespace to Phraseanet doctrine entities
|
2014-02-18 19:32:08 +01:00 |
|
Romain Neutron
|
e233e5afa6
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
lib/classes/Exception/Feed/ItemNotFound.php
lib/classes/Exception/Feed/PublisherNotFound.php
lib/classes/Feed/Abstract.php
lib/classes/Feed/Adapter.php
lib/classes/Feed/Aggregate.php
lib/classes/Feed/Collection.php
lib/classes/Feed/CollectionInterface.php
lib/classes/Feed/Entry/Adapter.php
lib/classes/Feed/Entry/Collection.php
lib/classes/Feed/Entry/Interface.php
lib/classes/Feed/Entry/Item.php
lib/classes/Feed/Entry/ItemInterface.php
lib/classes/Feed/Interface.php
lib/classes/Feed/Link.php
lib/classes/Feed/LinkInterface.php
lib/classes/Feed/Publisher/Adapter.php
lib/classes/Feed/Publisher/Interface.php
lib/classes/Feed/Token.php
lib/classes/Feed/TokenAggregate.php
lib/classes/Feed/XML/Abstract.php
lib/classes/Feed/XML/Atom.php
lib/classes/Feed/XML/Cooliris.php
lib/classes/Feed/XML/Interface.php
lib/classes/Feed/XML/RSS.php
lib/classes/Feed/XML/RSS/ImageInterface.php
lib/classes/http/request.php
lib/classes/module/console/schedulerStart.php
lib/classes/module/console/schedulerState.php
lib/classes/module/console/schedulerStop.php
lib/classes/module/console/taskState.php
lib/classes/module/console/tasklist.php
lib/classes/module/console/taskrun.php
lib/classes/registry.php
lib/classes/registryInterface.php
lib/classes/set/order.php
lib/classes/system/url.php
lib/classes/task/Scheduler.php
lib/classes/task/appboxAbstract.php
lib/classes/task/databoxAbstract.php
lib/classes/task/manager.php
lib/classes/task/period/RecordMover.php
lib/classes/task/period/apibridge.php
lib/classes/task/period/archive.php
lib/classes/task/period/cindexer.php
lib/classes/task/period/emptyColl.php
lib/classes/task/period/ftp.php
lib/classes/task/period/ftpPull.php
lib/classes/task/period/subdef.php
lib/classes/task/period/test.php
lib/classes/task/period/writemeta.php
lib/conf.d/PhraseaFixture/AbstractWZ.php
lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php
lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php
lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php
lib/conf.d/PhraseaFixture/Story/LoadOneStory.php
lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php
lib/conf.d/PhraseaFixture/UsrLists/UsrList.php
lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php
lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php
lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php
lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php
lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php
|
2014-01-06 15:38:14 +01:00 |
|
Romain Neutron
|
766773da01
|
Fix CS
|
2013-12-03 21:20:19 +01:00 |
|
Romain Neutron
|
420df7febd
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Command/CreateCollection.php
lib/Alchemy/Phrasea/Controller/Admin/Databox.php
lib/Alchemy/Phrasea/Controller/Root/Login.php
lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php
lib/Alchemy/Phrasea/Model/Entities/AuthFailure.php
lib/Alchemy/Phrasea/Model/Entities/LazaretAttribute.php
lib/Alchemy/Phrasea/Model/Entities/LazaretCheck.php
lib/Alchemy/Phrasea/Model/Entities/SessionModule.php
lib/Alchemy/Phrasea/Model/Entities/ValidationData.php
lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
lib/conf.d/Doctrine/Entities.Session.dcm.yml
lib/conf.d/Doctrine/Entities.StoryWZ.dcm.yml
lib/conf.d/Doctrine/Entities.UsrList.dcm.yml
lib/conf.d/Doctrine/Entities.UsrListEntry.dcm.yml
lib/conf.d/Doctrine/Entities.UsrListOwner.dcm.yml
lib/conf.d/Doctrine/Entities.ValidationSession.dcm.yml
lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php
|
2013-12-03 21:19:20 +01:00 |
|
Romain Neutron
|
051d9f4035
|
Remove license comments
|
2013-11-20 16:49:29 +01:00 |
|
Romain Neutron
|
56b373ee6e
|
Use short array declaration
|
2013-11-18 13:57:33 +01:00 |
|
Romain Neutron
|
d40b1d4fb1
|
Fix CS
|
2013-11-18 13:07:40 +01:00 |
|
Romain Neutron
|
3548421160
|
Add basket converter
|
2013-11-13 17:52:12 +01:00 |
|
Romain Neutron
|
08ce909730
|
Move doctrine repositories to Phrasea namespace
|
2013-10-29 17:30:11 +01:00 |
|