Commit Graph

32 Commits

Author SHA1 Message Date
Nicolas Le Goff
c3c0110b7d Merge branch '3.8' 2014-02-13 21:44:23 +01:00
Romain Neutron
7f7d9c7753 Update cache namespace strategy to avoid collisions 2014-02-13 16:11:02 +01:00
Romain Neutron
d7f7e1c92c Fix CS 2014-01-14 12:04:38 +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
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
32c2d6154a Remove phraseanet services, update configuration 2013-06-11 14:05:44 +02:00
Romain Neutron
53206af159 Fix CS lib/Alchemy 2013-01-29 16:38:00 +01:00
Romain Neutron
842ad40985 Bump copyright year 2013-01-21 23:28:58 +01:00
Romain Neutron
3e3a3f1bd0 Update Phrasea Cache 2012-10-04 15:31:36 +02:00
Romain Neutron
5440dc18d0 Remove unused namespace 2012-04-30 17:29:07 +02:00
Romain Neutron
2620caebf6 Remove Unnecessary SplFileObject's 2012-04-30 17:03:22 +02:00
Romain Neutron
7d9eb63246 Remove unused package annotation 2012-04-26 02:09:59 +02:00
Romain Neutron
70519a471a Update copyright year 2012-04-26 02:06:29 +02:00
Romain Neutron
ade22295ad Fix CS 2012-04-26 00:55:53 +02:00
Romain Neutron
5475a5b4ea Merge branch '361' into Dev 2012-03-22 15:26:45 +01:00
Romain Neutron
9a6d475f3b Flushing the cache now empty the cache registry 2012-03-22 15:23:14 +01:00
Romain Neutron
a49157b7d6 Fix build 2012-03-19 19:36:07 +01:00
Romain Neutron
0c47f9229c Merge branch 'Doctrine2.2' into Dev 2012-03-19 19:06:03 +01:00
Nicolas Le Goff
5557d8b8b7 refactor service interface 2012-03-15 16:43:23 +01:00
Romain Neutron
7a0495caf3 Merge with 3.6 2012-03-12 18:40:21 +01:00
Romain Neutron
ffd452603c Fix upgrader 2012-03-09 16:12:13 +01:00
Romain Neutron
82d9eeef7b Coding standards 2012-03-09 12:49:13 +01:00
Nicolas Le Goff
5ebb982839 fix #486 Installeur n'aboutit pas sans APC 2012-02-29 15:16:20 +01:00
Romain Neutron
4ea41a1104 Refactor cache objects for doctrine 2.2 2012-02-28 14:09:53 +01:00
Romain Neutron
e7da8bd564 Change use of deleteAll to flushAll 2012-02-28 12:22:56 +01:00
Romain Neutron
e3df263373 Upgrade Configuration 2012-02-22 18:04:28 +01:00
Romain Neutron
5ee18bacc7 Update Cache Manager 2012-02-21 17:11:02 +01:00
Romain Neutron
c91a84937c Refactor Cache services 2012-02-21 16:49:54 +01:00
Romain Neutron
0c38207579 Add LastUpdated datetime in cache_registry.yml 2012-02-20 10:18:36 +01:00
Nicolas Le Goff
2347d06793 fix core manager 2012-02-17 19:11:23 +01:00
Nicolas Le Goff
3e0c9fce74 add cache driver 2012-02-17 19:00:11 +01:00