Romain Neutron
|
2df0f9d659
|
Merge branch '3.8'
|
2014-02-28 00:28:06 +01:00 |
|
Romain Neutron
|
51b9a7f89a
|
Improve Xsendfile tools, allow dump whenever the conf is disabled
|
2014-02-26 18:47:31 +01:00 |
|
Nicolas Le Goff
|
383ff77449
|
Merge branch '3.8'
Conflicts:
.travis.yml
lib/Alchemy/Phrasea/Controller/Permalink.php
lib/classes/API/OAuth2/Adapter.php
lib/classes/databox.php
|
2014-01-27 17:23:03 +01:00 |
|
Nicolas Le Goff
|
6ba5ce6669
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Controller/Admin/Root.php
lib/classes/module/console/schedulerStart.php
lib/classes/module/console/taskrun.php
lib/classes/task/Scheduler.php
lib/classes/task/abstract.php
lib/classes/task/databoxAbstract.php
templates/web/admin/collection/collection.html.twig
templates/web/admin/databox/databox.html.twig
templates/web/email-template.html.twig
|
2014-01-24 18:52:14 +01:00 |
|
Nicolas Le Goff
|
d1537fd168
|
Fix #1672 Fix uninitialized variable in XsendFileMapiingGenerator
|
2014-01-24 12:11:49 +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
|
d519c13e56
|
Bump copyright year
|
2014-01-06 15:28:12 +01:00 |
|
Romain Neutron
|
7e0a3c7338
|
Use configuration property accessor
|
2013-11-18 18:48:27 +01:00 |
|
Romain Neutron
|
56b373ee6e
|
Use short array declaration
|
2013-11-18 13:57:33 +01:00 |
|
Romain Neutron
|
13915dc1a8
|
Rename "phraseanet.configuration" service to "configuration"
|
2013-11-15 22:08:07 +01:00 |
|
Romain Neutron
|
6be4e789b5
|
Optimize xsendfile mapping generator, use the factory to generate mapping
|
2013-07-12 17:08:17 +02:00 |
|
Romain Neutron
|
a231826ab0
|
Fix #1290 : Download xith xsendfile activated fails
|
2013-07-11 12:49:41 +02:00 |
|
Romain Neutron
|
3648a0f52a
|
Rename XSendFile commands
|
2013-07-09 18:20:33 +02:00 |
|
Romain Neutron
|
10556b90a7
|
Fix CS
|
2013-07-04 18:49:21 +02:00 |
|
Romain Neutron
|
5b9a8f4055
|
Add XSenfFile mapping generator
|
2013-07-04 17:31:42 +02:00 |
|