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

57 Commits

Author SHA1 Message Date
Romain Neutron
fe54343f0e Add story-wz repository as a service 2014-02-28 20:01:58 +01:00
Romain Neutron
a72d8ccabc Add registration and basket repositories as a service 2014-02-28 20:00:27 +01:00
Romain Neutron
2de870c3f9 Add a namespace to Phraseanet doctrine entities 2014-02-18 19:32:08 +01:00
Romain Neutron
76048709ee Fix CS 2014-02-11 16:27:47 +01:00
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
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
680643c0fc Fix unit tests and arrays declaration 2013-12-03 20:06:49 +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
3548421160 Add basket converter 2013-11-13 17:52:12 +01:00
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +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
08ce909730 Move doctrine repositories to Phrasea namespace 2013-10-29 17:30:11 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Romain Neutron
76413165ff Update authentication to service provider 2013-05-29 14:22:51 +02:00
Romain Neutron
842ad40985 Bump copyright year 2013-01-21 23:28:58 +01:00
Romain Neutron
13b67dfe37 Update Firewall API 2012-10-04 15:44:53 +02:00
Romain Neutron
0565bce475 Remove user variable assignment 2012-10-04 15:44:49 +02:00
Romain Neutron
f68cae2bb4 Cleanup controllers 2012-10-04 15:44:48 +02:00
Romain Neutron
abc4d81521 Update controllers 2012-10-04 15:42:54 +02:00
Romain Neutron
1fc9a78e7f Update prod controllers 2012-10-04 15:31:37 +02:00
Romain Neutron
0f7056dfed Normalize request calls 2012-08-23 14:15:21 +02:00
Romain Neutron
0247a47497 Refactor route workzone 2012-07-25 11:02:04 +02:00
Romain Neutron
a9bdeefcde Remove inline redirection 2012-07-24 19:13:21 +02:00
Romain Neutron
89737fb5e4 Remove serializer 2012-07-24 19:01:06 +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
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
9acaf0b211 Use Composer for dependencies instead of git submodules 2012-03-30 13:39:44 +02:00
Romain Neutron
2590ab6ddd Add control on BasketRepo 2012-02-17 16:08:00 +01:00
Romain Neutron
8e8f15cab8 Fix Story attachment 2012-02-14 19:34:28 +01:00
Romain Neutron
9135de65cf Push & Feedback templates 2012-02-02 15:21:51 +01:00
Romain Neutron
afb42193e7 Merge with master 2012-01-31 12:09:07 +01:00
Romain Neutron
34f2e91fd4 Coding standards 2012-01-26 16:26:00 +01:00
Romain Neutron
c2017a0399 Fix usrlist unit tests 2012-01-26 16:23:09 +01:00
Romain Neutron
06b8df26b1 Fix coding standards 2012-01-26 12:32:37 +01:00
Romain Neutron
883dde944f Refactor Core::request 2012-01-12 14:25:35 +01:00
Romain Neutron
869a2f614c Added WorkZone browser routes 2012-01-10 20:32:00 +01:00
Romain Neutron
eebc52cd83 Basket Browser 2012-01-10 12:49:01 +01:00