hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-09 02:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,049 Commits 268 Branches 107 Tags
e233e5afa6716e060457869b284ea4bea9e72fe2
Commit Graph

33 Commits

Author SHA1 Message Date
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
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
c184278b40 Fix doc blocks 2013-01-29 18:34:50 +01:00
Romain Neutron
4414892b91 Fix CS lib/classes 2013-01-29 16:39:02 +01:00
Romain Neutron
842ad40985 Bump copyright year 2013-01-21 23:28:58 +01:00
Romain Neutron
2069d40544 Use composer as application autoloader 2013-01-18 17:47:25 +01:00
Romain Neutron
1700565862 Cleanup namepaces, variables uses 2012-10-04 15:44:49 +02:00
Romain Neutron
7e104b2865 Update cache databox 2012-10-04 15:43:12 +02:00
Romain Neutron
d022ff69c7 Remove use of databox singleton 2012-07-26 12:29:44 +02:00
Romain Neutron
4afa21d419 Fix CS 2012-05-23 00:01:29 +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
82c4474f55 Fix databox cache update 2012-04-19 10:41:34 +02:00
Romain Neutron
82d9eeef7b Coding standards 2012-03-09 12:49:13 +01:00
Romain Neutron
8c840091d7 Merge branch 'HotFixCache' into 3.6 2012-02-22 12:39:17 +01:00
Romain Neutron
dc1ec6df7d Fix cache asynchro 2012-02-22 12:18:30 +01:00
Romain Neutron
0009a4d5cf Cleanup 2012-02-21 16:54:00 +01:00
Romain Neutron
1d6eb86c90 Refactor Appbox 2012-02-21 16:09:34 +01:00
Nicolas Le Goff
97454bd1fd removed memcached as available adapter 2012-02-08 11:45:48 +01:00
Romain Neutron
b0c2c098fe Merge with master 2012-02-07 19:46:23 +01:00
Romain Neutron
d3eee39ddd Fix bug cache replication 2012-02-07 19:43:44 +01:00
Romain Neutron
d475e00cfa Merge with master 2012-02-07 17:47:39 +01:00
Romain Neutron
dfa39b8f1e Fix bugs 2012-02-07 16:54:19 +01:00
Romain Neutron
a9c7ed23cb Coding standards 2012-02-02 15:43:12 +01:00
Romain Neutron
99a344774f Coding standards 2012-01-31 18:35:27 +01:00
Romain Neutron
1626246f7f Merge with master 2012-01-31 18:28:49 +01:00
Romain Neutron
f060323941 Fix cached desynchro 2012-01-31 15:57:50 +01:00
Romain Neutron
6f40609528 Phrasea Kernel 2011-12-13 18:22:11 +01:00
Romain Neutron
4c5b7eb658 V 3.5 RC 1 2011-12-05 00:23:28 +01:00
Alchemy
339d23c06d initial import 2011-02-16 16:09:48 +01:00