hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 20:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,325 Commits 268 Branches 107 Tags
12f9575a8b93a5f86dd89c42a22ff33c82fbe2c8
Commit Graph

60 Commits

Author SHA1 Message Date
Nicolas Le Goff
c4eadb7e0e Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Controller/Prod/TOU.php
	lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Security/Firewall.php
	lib/classes/task/abstract.php
	tests/Alchemy/Tests/Phrasea/Security/FirewallTest.php
 2014-02-05 19:42:22 +01:00
Romain Neutron
b9e4c599b2 Avoid exception driven logic 2014-02-05 16:43:49 +01:00
Romain Neutron
91cf9705ab Add subdef substituer 2014-01-14 15:05:44 +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
2ba164701d Use symfony translator 2013-12-03 20:02:40 +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
ea7523f1db Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Publications.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Permalink.php
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/Alchemy/Phrasea/Controller/Prod/Order.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Share.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Controller/Setup.php
	lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/record/adapter.php
	lib/classes/task/Scheduler.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/cindexer.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
 2013-10-31 14:01:44 +01:00
Romain Neutron
9b471fdf76 Fix CS 2013-10-31 11:53:30 +01:00
Romain Neutron
1af022b84f Declare prod controllers as services, remove "call" methods 2013-10-30 18:47:40 +01:00
Romain Neutron
58c402ac2b Update unit tests and legacy 2013-10-29 18:46:34 +01:00
Nicolas Le Goff
bdf491c426 Fix CS 2013-09-02 12:12:36 +02:00
Nicolas Le Goff
6a2fb618d3 Move substituion logger from class method to controllers 2013-09-02 12:12:36 +02:00
Nicolas Le Goff
74f8bc3c3c Fix CS 2013-08-08 16:25:16 +02:00
Nicolas Le Goff
47bb3331dd Move substituion logger from class method to controllers 2013-08-08 16:25:15 +02:00
Romain Neutron
3f47cc248d Remove registry's GV_RootPath calls 2013-06-19 19:25:16 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Romain Neutron
77817d177f Merge branch '3.7' 2013-03-22 15:07:12 +01:00
Nicolas Le Goff
128f69e314 Fix typo 2013-03-22 15:03:01 +01:00
Nicolas Le Goff
02e5e2c216 Subsitution cleanup && test enhancement 2013-03-22 15:03:00 +01:00
Nicolas Le Goff
93aa9be0fa Fix sub views substitution 2013-03-22 15:03:00 +01:00
Romain Neutron
370d603741 Merge branch '3.7' 2013-03-22 15:01:00 +01:00
Nicolas Le Goff
2ba14821b3 Fix typo 2013-03-21 17:17:23 +01:00
Nicolas Le Goff
3bcf24b611 Subsitution cleanup && test enhancement 2013-03-21 17:10:46 +01:00
Nicolas Le Goff
915749c224 Fix sub views substitution 2013-03-21 16:06:06 +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
73da820b86 Use PHPExiftool service provider 2013-01-21 20:44:27 +01:00
Romain Neutron
3eefb23d38 [SearchEngine] Add search engine indexation 2013-01-17 11:43:33 +01:00
Nicolas Le Goff
89eac37046 Fix tools window 2012-10-18 15:45:51 +02:00
Romain Neutron
a9a24d5424 Add firewalls 2012-10-04 16:54:47 +02:00
Romain Neutron
f68cae2bb4 Cleanup controllers 2012-10-04 15:44:48 +02:00
Romain Neutron
1fc9a78e7f Update prod controllers 2012-10-04 15:31:37 +02:00
Romain Neutron
1a3461d5fc Update to filesystem service provider 2012-10-04 15:31:36 +02:00
Romain Neutron
2aae5331ab Fix merge 2012-09-27 14:53:24 +02:00
Romain Neutron
dbfeb91ed3 Fix #910 : wrong file extension after substitution 2012-09-27 14:22:11 +02:00
Romain Neutron
686f8f59c5 Fix #910 : wrong file extension after substitution 2012-09-27 12:55:00 +02:00
Romain Neutron
0f7056dfed Normalize request calls 2012-08-23 14:15:21 +02:00
Romain Neutron
59e06043d2 Substitute helper by record request in Basket / Feeds / Tools / Tooltips 2012-07-26 15:38:57 +02:00
Romain Neutron
3395ec84e4 Remove last serializers 2012-07-25 12:46:13 +02:00
Romain Neutron
2a4a3f3ec8 Enable Twig service provider 2012-07-24 13:11:26 +02:00
Romain Neutron
3812399a35 Add Phraseanet Service Provider and Phraseanet Application 2012-07-18 18:07:34 +02:00
Romain Neutron
4c7463cf29 Update to the latest silex API 2012-06-19 18:39:33 +02:00
Romain Neutron
e28184167e Fix CS 2012-06-19 10:40:14 +02:00
Romain Neutron
50cf4ab8c8 Use mediavorus as core service 2012-06-19 10:17:14 +02:00
Romain Neutron
978edd78fe Update thumbnail reconstruction 2012-06-01 16:57:01 +02:00
Romain Neutron
4ea411eca8 Remove file after substitution 2012-06-01 16:56:42 +02:00
Nicolas Le Goff
b507c11d83 fix #655 No metas for grouping record 
fix #654 Toolbox error when file has no subdef
 2012-05-25 21:10:14 +02:00
Romain Neutron
4afa21d419 Fix CS 2012-05-23 00:01:29 +02:00