hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,001 Commits 268 Branches 107 Tags
53b8ca40872a04579822b23e2b51b43b30cc652f
Commit Graph

122 Commits

Author SHA1 Message Date
Jean-Yves Gaulier
edb36d4558 [PHRAS-26] Fix mime type detection 2014-04-14 14:36:18 +02:00
Romain Neutron
bb7267eafb Use rhumsaa/uuid instead of custom uuid implementation 2014-03-03 11:29:23 +01:00
Romain Neutron
5d843ab370 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Border/Manager.php
	lib/Alchemy/Phrasea/Controller/Prod/Tools.php
	lib/Alchemy/Phrasea/Core/Provider/BorderManagerServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
	lib/Alchemy/Phrasea/Helper/User/Manage.php
	lib/classes/User/Adapter.php
	lib/classes/connection.php
	lib/classes/connection/abstract.php
	lib/classes/connection/interface.php
	lib/classes/connection/pdo.php
	lib/classes/patch/370alpha7a.php
	lib/classes/patch/370alpha8a.php
	lib/classes/record/adapter.php
	lib/classes/task/period/RecordMover.php
	tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/NativeAuthenticationTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
 2014-03-03 00:05:11 +01:00
Romain Neutron
5585d7f7bd Fix #1707 : Update technical informations and metadata fields on record substitution 2014-02-28 19:10:23 +01:00
Romain Neutron
de13d874a3 Fix configuration usage 2014-02-22 10:39:07 +01:00
Romain Neutron
c4efe6d548 Add host configuration 2014-02-21 14:36:38 +01:00
Romain Neutron
787e86aacf Fix latest merge 2014-02-14 11:59:15 +01:00
Romain Neutron
903f63cd32 Merge branch '3.8' 2014-02-14 11:43:55 +01:00
Romain Neutron
9aa4e7abd8 Fix #1680 : Add support for custom extension to mime-type mapping 2014-02-13 16:22:41 +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
1af21b88ef Fix CS 2013-12-03 20:59:47 +01:00
Romain Neutron
2ba164701d Use symfony translator 2013-12-03 20:02:40 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
13dd86c67f Fix CS 2013-10-31 14:22:41 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Romain Neutron
7e8a34c599 Merge branch '3.8' 
Conflicts:
	bin/developer
	build-env.sh
	composer.json
	composer.lock
 2013-10-10 13:42:42 +02:00
Romain Neutron
5996e590bc Reset exiftool writer before writing 2013-10-09 12:18:16 +02:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Romain Neutron
afcdf0f976 Bump to PHP-XPDF 0.2 2013-07-03 12:22:54 +02:00
Romain Neutron
f95bd97fc3 Update to latest media alchemyst api 2013-06-27 12:43:24 +02:00
Romain Neutron
88c3df2ef7 Regenerate doctrine entities and proxies 2013-06-17 20:11:44 +02:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +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
cf01631da7 [SearchEngine] Fix build on 32bit systems 2013-01-17 12:01:41 +01:00
Romain Neutron
dff686c87d Merge branch '3.7' 2013-01-09 11:25:14 +01:00
Romain Neutron
a41b06527b Fix #1060 : Implement BorderManager MetaFields 2013-01-08 19:41:40 +01:00
Romain Neutron
ad11bd0f51 Update Border File API 2012-10-04 15:44:50 +02:00
Romain Neutron
7710e61678 Fix tests on PHP 5.4 2012-10-04 15:43:35 +02:00
Romain Neutron
0ac8a9d8ae Fix tests on PHP 5.4 2012-10-04 15:43:35 +02:00
Romain Neutron
553c2f5813 Fix tests 2012-10-04 15:43:33 +02:00
Romain Neutron
c79dd8ba6f Update status attribute 2012-10-04 15:43:13 +02:00
Romain Neutron
21fa097c81 Fix CS 2012-10-04 15:31:36 +02:00
Romain Neutron
eb9600b19e Update Phrasea Border to the latest service 2012-10-04 15:31:36 +02:00
Romain Neutron
1a3461d5fc Update to filesystem service provider 2012-10-04 15:31:36 +02:00
Romain Neutron
a80073395d Merge with 3.7 2012-09-14 16:18:22 +02:00
Romain Neutron
61be8e4ad7 Split value of Phraseanet TF fields 2012-09-14 12:34:02 +02:00
Romain Neutron
9f11445265 Namespaces cleanup 2012-07-27 12:26:12 +02:00
Romain Neutron
fb95aad718 Remove use of databox singleton 2012-07-26 12:29:44 +02:00
Romain Neutron
eb3eb4a9b5 Create root lazaret dir to avoid infinite loop 2012-07-12 12:58:26 +02:00
Romain Neutron
20c871136a Fix quarantine 2012-07-11 15:16:26 +02:00
Nicolas Le Goff
fd7454a346 fix typo & add doc blocks 2012-07-03 14:47:19 +02:00
Nicolas Le Goff
06eecb913f fix #777 preview in quarantine 2012-07-03 14:40:42 +02:00
Romain Neutron
7018ba0a24 Update dependencies 
Fix controller declaration

Fix PdfTotext use
 2012-06-19 18:39:33 +02:00
Nicolas Le Goff
4edb26c6c6 fix #728 check if thumbExtractor is supported 
remove fileReader its not needed

fix unit tests

fix typo

remove unecessary message
 2012-06-19 18:08:40 +02:00
Nicolas Le Goff
ec15265af7 fix #726 no thumbnail in quarantaine for all media types except images 2012-06-19 17:17:16 +02:00
Romain Neutron
e28184167e Fix CS 2012-06-19 10:40:14 +02:00