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

29 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
051d9f4035 Remove license comments 2013-11-20 16:49:29 +01:00
Romain Neutron
2e2bdb86e9 Remove system_url 2013-10-29 17:37:28 +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
2b7c196d13 Remove platform detection 2012-05-24 17:37:16 +02:00
Romain Neutron
4afa21d419 Fix CS 2012-05-23 00:01:29 +02:00
Romain Neutron
cf1236c6cd Remove old files 2012-05-22 20:03:30 +02:00
Romain Neutron
4cf5adcd1e Update Unit tests 2012-05-12 02:22:19 +02:00
Romain Neutron
925fc616e7 Use latest PHPExiftool API 2012-05-07 00:15:03 +02:00
Romain Neutron
135420008b Delegate all exiftool commands to PHPExiftool 2012-05-04 20:17:17 +02:00
Romain Neutron
516008d84d Remove mplayer, delegate technical read to MediaVorus 2012-05-04 16:29:05 +02:00
Romain Neutron
fcd3e42737 Remove exiftool gitmodule dependency 2012-05-04 01:26:21 +02:00
Romain Neutron
6911718c46 Fix build PHP 5.4 2012-04-28 03:55:10 +02:00
Romain Neutron
70519a471a Update copyright year 2012-04-26 02:06:29 +02:00
Romain Neutron
33b10d6746 Add curly braces 2012-04-26 01:55:12 +02:00
Romain Neutron
ade22295ad Fix CS 2012-04-26 00:55:53 +02:00
Romain Neutron
dd994a9bd6 Fix CS 2012-04-25 17:38:49 +02:00
Romain Neutron
4b7f6175e7 Fix bug meta merging 2012-04-18 13:39:50 +02:00
Romain Neutron
1626246f7f Merge with master 2012-01-31 18:28:49 +01:00
Romain Neutron
81631e1bbc Removed debug 2012-01-25 18:54:12 +01:00
Romain Neutron
fc1a0abb19 Cleanup 2012-01-25 18:45:28 +01:00
Romain Neutron
e1c95b49a5 Merge with master 2012-01-25 17:25:25 +01:00
Romain Neutron
9852e2077c Meta writer 2012-01-25 15:09:02 +01:00
Romain Neutron
562744f6c7 Refactor caption_field 2012-01-18 18:20:15 +01:00
Romain Neutron
09c9e455f4 Fix #144 : Phraseanet:tf-filename metadata is wrong 2012-01-03 18:21:57 +01:00
Romain Neutron
4c5b7eb658 V 3.5 RC 1 2011-12-05 00:23:28 +01:00