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
|
d519c13e56
|
Bump copyright year
|
2014-01-06 15:28:12 +01:00 |
|
Romain Neutron
|
64456a8964
|
Remove phraseanet registry
|
2013-12-20 16:44:22 +01:00 |
|
Romain Neutron
|
2ba164701d
|
Use symfony translator
|
2013-12-03 20:02:40 +01:00 |
|
Romain Neutron
|
56b373ee6e
|
Use short array declaration
|
2013-11-18 13:57:33 +01:00 |
|
Romain Neutron
|
3548421160
|
Add basket converter
|
2013-11-13 17:52:12 +01:00 |
|
Nicolas Le Goff
|
1fdf30c6af
|
Use ACL service provider to get user's ACL
|
2013-11-05 12:21:42 +01:00 |
|
Romain Neutron
|
1c27778001
|
Merge branch '3.8'
Conflicts:
tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
|
2013-10-31 17:56:48 +01:00 |
|
Romain Neutron
|
664339e3ec
|
Merge pull request #742 from romainneutron/fix-1555
Fix #1555 : API sessions remain open
|
2013-10-31 08:35:00 -07:00 |
|
Romain Neutron
|
24a6dce598
|
Fix #1555 : API sessions remains open
|
2013-10-31 15:19:24 +01:00 |
|
Romain Neutron
|
13dd86c67f
|
Fix CS
|
2013-10-31 14:22:41 +01:00 |
|
Romain Neutron
|
9b471fdf76
|
Fix CS
|
2013-10-31 11:53:30 +01:00 |
|
Romain Neutron
|
5f015b924f
|
Declare API controllers as services, remove "call" methods
|
2013-10-30 18:59:15 +01:00 |
|
Romain Neutron
|
58c402ac2b
|
Update unit tests and legacy
|
2013-10-29 18:46:34 +01:00 |
|
Romain Neutron
|
2baa5a6484
|
Fix merge
|
2013-09-14 02:12:20 +02:00 |
|
Romain Neutron
|
f955163edb
|
Merge branch '3.7' into 3.8
Conflicts:
lib/Alchemy/Phrasea/Application/Api.php
lib/Alchemy/Phrasea/Core/Version.php
lib/conf.d/_GV_template.inc
|
2013-09-14 02:02:56 +02:00 |
|
Romain Neutron
|
d2bc4f4a23
|
Add AuthenticationServiceProvider
|
2013-05-29 14:22:50 +02:00 |
|
Romain Neutron
|
0247c20634
|
Merge API root, API v1 and API oauth2 application in a single one
|
2013-05-24 15:37:02 +02:00 |
|