hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 04:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,475 Commits 268 Branches 107 Tags
dcb8da99aa097bd588495b99f49dc46ec7f23c57
Commit Graph

57 Commits

Author SHA1 Message Date
Nicolas Le Goff
2899f152fb Merge branch '3.8' into fix-latest-merge 
Conflicts:
	README.md
	composer.json
	composer.lock
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiExceptionHandlerSubscriber.php
	lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/adapter.php
	lib/classes/API/V1/result.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/schedulerState.php
	lib/classes/module/console/schedulerStop.php
	lib/classes/module/console/taskrun.php
	lib/classes/set/export.php
	lib/conf.d/_GV_template.inc
	lib/conf.d/configuration.yml
	templates/web/admin/setup.html.twig
	templates/web/admin/tasks/list.html.twig
	templates/web/api/auth/end_user_authorization.html.twig
	templates/web/prod/actions/Feedback/list.html.twig
	templates/web/prod/actions/publish/publish.html.twig
	templates/web/prod/upload/upload.html.twig
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/classes/api/v1/api_v1_resultTest.php
 2014-08-11 20:28:03 +02:00
Nicolas Le Goff
ba9ff5d807 PHRAS-197 #fix add possibility to override cache namespace 2014-07-25 16:59:26 +02:00
Nicolas Le Goff
e5b8817c46 PHP CS fix 2014-05-30 15:22:00 +02:00
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
354232f61a Bump copyright year 2014-01-06 15:40:56 +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
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
3e9f3418ce Remove dead code 2013-11-13 14:54:47 +01:00
Romain Neutron
19462d160c Decouple Phraseanet cache factory and cache connection factory 2013-11-05 15:22:46 +01:00
Romain Neutron
ab512540ca Add cache provider for memcached extension 2013-11-04 19:11:36 +01:00
Romain Neutron
ee18f7e27b Cast isOnline return value to ensure boolean 2013-07-10 11:23:00 +02:00
Romain Neutron
3f37226226 Add MemcachedCache support 2013-07-10 11:22:26 +02:00
Romain Neutron
32c2d6154a Remove phraseanet services, update configuration 2013-06-11 14:05:44 +02:00
Romain Neutron
c184278b40 Fix doc blocks 2013-01-29 18:34:50 +01: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
23a8bbbebf Fix CS 2013-01-21 23:21:33 +01:00
Romain Neutron
99630f773f Merge with 3.7 2012-10-16 15:56:43 +02:00
Romain Neutron
a032ac6d2f Fix #918 : Add wincache support 2012-10-16 15:21:34 +02:00
Romain Neutron
3e3a3f1bd0 Update Phrasea Cache 2012-10-04 15:31:36 +02:00
Romain Neutron
2a4a3f3ec8 Enable Twig service provider 2012-07-24 13:11:26 +02:00
Romain Neutron
e28184167e Fix CS 2012-06-19 10:40:14 +02:00
Romain Neutron
c6f3b08a57 Fix isOnline 2012-06-19 10:18:57 +02:00
Romain Neutron
66812a001c Add Alchemy\Phrasea\Cache\Cache::isOnline method 2012-06-19 10:16:09 +02:00
Romain Neutron
4afa21d419 Fix CS 2012-05-23 00:01:29 +02:00
Nicolas Le Goff
b7eb53c320 fix typo 2012-05-03 21:32:40 +02:00
Nicolas Le Goff
e32811ecb2 fix typo 2012-05-03 21:30:25 +02:00
Nicolas Le Goff
56afaebf00 add doc + Cache::getName method in cache interface 2012-05-03 21:21:58 +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
1cce9c072c Redis cache is now doctrine 2 compatible 2012-04-04 21:53:26 +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