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

73 Commits

Author SHA1 Message Date
Nicolas Le Goff
8f9745d874 Merge branch '3.8' 
Conflicts:
	lib/classes/task/Scheduler.php
	lib/classes/task/abstract.php
	templates/web/client/index.html.twig
 2014-02-04 11:25:59 +01:00
Romain Neutron
cb82e6047d Enhance error messages 2014-02-03 16:36:43 +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
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +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
ed3f31b01d Fix #1563 : Explicitely declare the default environment to be Application::ENV_PROD 2013-11-05 10:53:32 +01:00
Romain Neutron
9b471fdf76 Fix CS 2013-10-31 11:53:30 +01:00
Romain Neutron
f07ace58bc Add plugins reset command 2013-08-08 15:35:46 +02:00
Romain Neutron
38c0109915 Add cookie remover to application 2013-06-28 23:24:20 +02:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +02:00
Romain Neutron
38f38290c8 Fix CS 2013-05-29 21:21:02 +02:00
Romain Neutron
e42363acb0 Add API auth events 2013-05-29 14:23:22 +02:00
Romain Neutron
822dbdac89 Move api app to www directory 2013-05-24 16:14:53 +02:00
Romain Neutron
24812f5f08 Update Oauth2 controller to use the merged application 2013-05-24 15:41:07 +02:00
Romain Neutron
670a5f7024 Rename Api application 2013-05-24 15:39:10 +02:00
Romain Neutron
0247c20634 Merge API root, API v1 and API oauth2 application in a single one 2013-05-24 15:37:02 +02:00
Romain Neutron
43856b7f62 Cleanup Code 2013-05-13 15:07:49 +02:00
Romain Neutron
c172ba7bbc Merge branch '3.7' 2013-03-28 14:37:57 +01:00
Romain Neutron
35c64c6a32 Fix #1128 : Add API timers logs 2013-03-25 19:55:33 +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
133595635c [SearchEngine] Finalize search engine refactor 2013-01-17 11:43:36 +01:00
Romain Neutron
dff686c87d Merge branch '3.7' 2013-01-09 11:25:14 +01:00
Romain Neutron
52a7f58a31 Add better support for stories 2012-12-19 19:58:07 +01:00
Romain Neutron
2267af36d1 Implement story routes in API 2012-12-19 17:48:32 +01:00
Romain Neutron
9c601190e1 Fix tests 2012-11-12 19:30:19 +01:00
Romain Neutron
0565bce475 Remove user variable assignment 2012-10-04 15:44:49 +02:00
Romain Neutron
c2239f5259 Disable cookie session in API 2012-10-04 15:43:36 +02:00
Romain Neutron
49b9581e91 Update applications 2012-10-04 15:43:36 +02:00
Romain Neutron
d5325dba2b Applications cleanup 2012-10-04 15:43:36 +02:00
Romain Neutron
0ac8a9d8ae Fix tests on PHP 5.4 2012-10-04 15:43:35 +02:00
Romain Neutron
52d58b4cdf Fix API session open 2012-10-04 15:43:32 +02:00
Romain Neutron
77b0150e12 Update API and Oauth applications 2012-10-04 15:43:15 +02:00
Romain Neutron
ca88e08053 Fix #865 : add route in API for scheduler infos 2012-08-31 16:22:38 +02:00
Romain Neutron
def3a2b293 Fix #865 : add route in API for scheduler infos 2012-08-29 16:15:53 +02:00
Romain Neutron
1117c64604 Workaround for HttpKernel bug in API 2012-07-24 17:59:29 +02:00
Romain Neutron
1a596b7cc8 Code cleanup 2012-07-19 12:00:15 +02:00
Romain Neutron
e8a64f3f81 Cleanup applications 2012-07-18 18:08:31 +02:00
Romain Neutron
3812399a35 Add Phraseanet Service Provider and Phraseanet Application 2012-07-18 18:07:34 +02:00
Romain Neutron
e28184167e Fix CS 2012-06-19 10:40:14 +02:00
Romain Neutron
1b6984c37e Add Allow header to API 2012-06-19 10:16:09 +02:00
Romain Neutron
97084f3cc4 Fix Silex BC break 2012-06-14 18:32:03 +02:00
Romain Neutron
05a2c62cf4 Refactor API tests, add tests for feeds 2012-06-12 13:13:20 +02:00
Romain Neutron
4afa21d419 Fix CS 2012-05-23 00:01:29 +02:00
Romain Neutron
076f0317b5 Cleanup + add error_type to API response 2012-05-22 20:00:13 +02:00
Nicolas Le Goff
d9edeb7cd2 remove /monitor/scheduler/ route 2012-05-03 21:21:58 +02:00
Nicolas Le Goff
9ee9157f65 add monitor routes 2012-05-03 21:21:55 +02:00
Nicolas Le Goff
c37ae56b2e add new routes 2012-05-03 21:20:04 +02:00