hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 14:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,556 Commits 268 Branches 107 Tags
17e4750b5985bcc6e0e09b27d062df1a91c033b6
Commit Graph

358 Commits

Author SHA1 Message Date
Thibaud Fabre
17e4750b59 Add WebProfilerServiceProvider to inject Ajax profiler 
- Silex provider implements feature, but only in Silex 2.0 compatible branch
 2016-01-20 08:00:02 +01:00
Benoît Burnichon
edefb161be Lower priority of extended formats in API 
PHRAS-900
 2016-01-11 10:23:51 +01:00
Thibaud Fabre
c92d5da9fe Merge branch 'clean-boxes' into merge-clean-boxes 2016-01-06 19:53:43 +01:00
Benoît Burnichon
51023c5533 bump copyright year 2016-01-05 13:38:14 +01:00
Benoît Burnichon
985ec4a491 Extract JsonBodyHelper and use it 2015-12-22 14:24:32 +01:00
Benoît Burnichon
b2ee2668a1 Change to be able to return called API version 2015-12-22 14:19:34 +01:00
Benoît Burnichon
6847737742 Use alchemy/symfony-cors instead of ApiCorsSubscriber 2015-11-20 19:13:18 +01:00
Benoît Burnichon
533c792a7f Properly handle negotiation of custom formats. 2015-11-13 11:37:11 +01:00
Benoît Burnichon
afd3fc56f7 Change in ContentNegotiationSubscriber 2015-10-29 18:06:33 +01:00
Benoît Burnichon
0db32e35b8 Change to comply negotiation:^2.0.0 2015-10-28 11:56:59 +01:00
Benoît Burnichon
b335620306 Add plugin capability to add routes. 2015-10-28 10:59:20 +01:00
Thibaud Fabre
6882424a01 Add registration related webhooks 2015-10-20 17:45:16 +02:00
Thibaud Fabre
5bf08210aa Enable application logging from API calls 2015-09-29 18:16:12 +02:00
Thibaud Fabre
da9ec3908c Fix typos and use method to fetch appbox 2015-09-25 18:06:32 +02:00
Thibaud Fabre
569c2ff6d8 Implement save collection VO 2015-07-10 17:32:09 +02:00
Thibaud Fabre
1bcefda9a1 Add API get collection route 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/classes/API/V1/adapter.php

Conflicts:
	lib/classes/appbox.php
 2015-07-07 19:28:50 +02:00
Benoît Burnichon
78187f7103 PHPCS fixup 2015-07-02 12:33:19 +02:00
Benoît Burnichon
d645b92afa Add AclAware Trait 2015-07-02 12:33:18 +02:00
Benoît Burnichon
4880f2bf5a Add getAuthenticator usage 
Replace $app['authentication']->getUser() by $app->getAuthenticatedUser()
replace twig app['authentication'].getUser() with corresponding method
 2015-07-02 12:33:18 +02:00
Benoît Burnichon
3804eb5408 Add AuthenticatorAware trait to Application 2015-07-02 12:27:26 +02:00
Benoît Burnichon
6e651f3b07 Replace app['phraseanet.appbox']->get_databox using trait 2015-07-02 12:27:26 +02:00
Benoît Burnichon
8d47fb4848 Add ApplicationBoxAware trait 2015-07-02 12:27:25 +02:00
Benoît Burnichon
4eea27d9be Refactor UploadController 2015-06-02 13:59:16 +02:00
Benoît Burnichon
7581aada18 Merge pull request #1384 from bburnichon/feature/controller-as-service 
controller as service
 2015-05-27 18:30:40 +02:00
Benoît Burnichon
c083cd5d53 Allow API to be used with WebProfiler 2015-05-26 18:35:57 +02:00
Benoît Burnichon
2523320850 Refactor RecordController. Adding SearchEngineTrait 2015-05-25 17:38:09 +02:00
Benoît Burnichon
94133aabe4 Create UserQueryAware trait. 2015-05-25 10:49:05 +02:00
Benoît Burnichon
fb5ca52306 Add Permalink 2015-05-21 12:26:28 +02:00
Benoît Burnichon
ad766a3eaf Refactor LazaretController 2015-05-15 02:05:05 +02:00
Benoît Burnichon
b19083096b Add DelivererAware trait 2015-05-15 02:05:05 +02:00
Benoît Burnichon
469e2d0583 Add DataboxLoggerAware where needed 2015-05-14 23:43:00 +02:00
Benoît Burnichon
e25cd4097c Change DispatcherAware to accept concrete instances 
Dispatcher is already instanciated when invoking controller. So useless to lazy load it.
 2015-05-14 21:06:39 +02:00
Benoît Burnichon
55190dffd0 Move methods from Feed ControllerProvider to Controller 2015-05-14 18:34:12 +02:00
Benoît Burnichon
549c63d083 PHRAS-530 
FileSystemAware was renamed FilesystemAware (lowercase S) but change was not reflected on real git filesystem.
 2015-05-13 15:53:12 +02:00
Benoît Burnichon
88cb63b3ed Refactor ExportController 2015-05-12 19:09:08 +02:00
Benoît Burnichon
61206fd517 Replace calls to mediavorus to getMediaFromUri 2015-05-12 18:12:02 +02:00
Benoît Burnichon
81e8fcb606 Fixup CS and missing $this->app 2015-05-12 17:15:38 +02:00
Benoît Burnichon
019bf563f8 Split Export Controller, introduce DispatcherAware trait 2015-05-12 17:11:47 +02:00
Benoît Burnichon
c90a60b0f6 Missing OAuth Service Provider 2015-04-28 10:40:54 +02:00
Benoît Burnichon
62b8e5a6e4 Refactoring of API V1 Controller 2015-04-27 20:35:36 +02:00
Benoît Burnichon
3f4e767557 Refactor Api OAuth2 Controller 2015-04-21 19:40:22 +02:00
Benoît Burnichon
ad51a350b7 Change content type negotiation in API. 
Fix typo in negotiator word.
 2015-03-27 13:46:54 +01:00
Benoît Burnichon
1342756b84 Rename Controller to ControllerProvider 2015-03-27 12:55:43 +01:00
Benoît Burnichon
c72e31163b Merge remote-tracking branch 'upstream/3.8' 2015-03-13 18:50:49 +01:00
Nicolas Le Goff
5b3e699599 Merge remote-tracking branch 'upstream/3.8' 
Conflicts:
	bower.json
	composer.lock
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineQueryParser.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/User/Query.php
	lib/classes/patch/320alpha4b.php
	templates/web/admin/statusbit.html.twig
	templates/web/prod/actions/Tools/index.html.twig
	templates/web/prod/index.html.twig
	templates/web/prod/upload/lazaret.html.twig
	templates/web/prod/upload/upload-flash.html.twig
	www/scripts/apps/login/home/config.js
	www/skins/prod/000000/prodcolor.css
	www/skins/prod/959595/prodcolor.css
 2015-02-23 19:16:56 +01:00
Nicolas Le Goff
938a83b967 PHRAS-29 #fix Add creation story in API 2015-02-23 14:44:16 +01:00
Nicolas Le Goff
9a3e92ed9c Multiple ORMs for all database 2015-02-12 17:58:45 +01:00
Nicolas Le Goff
c06563b4dd PHRAS-409 #fix 2015-02-11 18:29:56 +01:00
Nicolas Le Goff
949bf06cac Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	bin/console
	bin/developer
	bin/setup
	bower.json
	composer.json
	composer.lock
	features/bootstrap/FeatureContext.php
	features/bootstrap/GuiContext.php
	lib/Alchemy/Phrasea/Authentication/Token/TokenValidator.php
	lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php
	lib/Alchemy/Phrasea/Command/CreateCollection.php
	lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php
	lib/Alchemy/Phrasea/Controller/Admin/Collection.php
	lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Client/Baskets.php
	lib/Alchemy/Phrasea/Controller/Client/Root.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Controller/Prod/Property.php
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Controller/Prod/Tools.php
	lib/Alchemy/Phrasea/Controller/Prod/Upload.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php
	lib/Alchemy/Phrasea/Core/Event/ApiLoadEndEvent.php
	lib/Alchemy/Phrasea/Core/Event/ApiLoadStartEvent.php
	lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Exception/XMLParseErrorException.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/Alchemy/Phrasea/Helper/User/Edit.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/Doctrine/Entities/AuthFailure.php
	lib/Doctrine/Entities/Basket.php
	lib/Doctrine/Entities/BasketElement.php
	lib/Doctrine/Entities/LazaretAttribute.php
	lib/Doctrine/Entities/LazaretCheck.php
	lib/Doctrine/Entities/LazaretFile.php
	lib/Doctrine/Entities/LazaretSession.php
	lib/Doctrine/Entities/Session.php
	lib/Doctrine/Entities/SessionModule.php
	lib/Doctrine/Entities/StoryWZ.php
	lib/Doctrine/Entities/UsrList.php
	lib/Doctrine/Entities/UsrListEntry.php
	lib/Doctrine/Entities/UsrListOwner.php
	lib/Doctrine/Entities/ValidationData.php
	lib/Doctrine/Entities/ValidationParticipant.php
	lib/Doctrine/Entities/ValidationSession.php
	lib/Doctrine/Logger/MonologSQLLogger.php
	lib/Doctrine/Repositories/BasketRepository.php
	lib/Doctrine/Repositories/ValidationParticipantRepository.php
	lib/Doctrine/Types/Binary.php
	lib/Doctrine/Types/Blob.php
	lib/Doctrine/Types/Enum.php
	lib/Doctrine/Types/LongBlob.php
	lib/Doctrine/Types/VarBinary.php
	lib/classes/API/OAuth2/Account.php
	lib/classes/API/OAuth2/Application.php
	lib/classes/API/OAuth2/Application/OfficePlugin.php
	lib/classes/API/OAuth2/AuthCode.php
	lib/classes/API/OAuth2/RefreshToken.php
	lib/classes/API/OAuth2/Token.php
	lib/classes/API/V1/Abstract.php
	lib/classes/API/V1/Interface.php
	lib/classes/API/V1/adapter.php
	lib/classes/API/V1/exception/abstract.php
	lib/classes/API/V1/exception/badrequest.php
	lib/classes/API/V1/exception/forbidden.php
	lib/classes/API/V1/exception/internalservererror.php
	lib/classes/API/V1/exception/maintenance.php
	lib/classes/API/V1/exception/methodnotallowed.php
	lib/classes/API/V1/exception/notfound.php
	lib/classes/API/V1/exception/unauthorized.php
	lib/classes/API/V1/result.php
	lib/classes/Exception/Feed/EntryNotFound.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/CollectionInterface.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/Image.php
	lib/classes/Feed/XML/RSS/ImageInterface.php
	lib/classes/User/Adapter.php
	lib/classes/User/Interface.php
	lib/classes/appbox/register.php
	lib/classes/connection.php
	lib/classes/connection/abstract.php
	lib/classes/connection/interface.php
	lib/classes/connection/pdo.php
	lib/classes/connection/pdoStatementDebugger.php
	lib/classes/deprecated/countries.php
	lib/classes/deprecated/inscript.api.php
	lib/classes/eventsmanager/event/test.php
	lib/classes/ftpclient.php
	lib/classes/http/request.php
	lib/classes/media/subdef.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/patch/320alpha4b.php
	lib/classes/patch/3715alpha1a.php
	lib/classes/patch/379alpha1a.php
	lib/classes/patch/380alpha10a.php
	lib/classes/patch/380alpha11a.php
	lib/classes/patch/380alpha13a.php
	lib/classes/patch/380alpha14a.php
	lib/classes/patch/380alpha15a.php
	lib/classes/patch/380alpha16a.php
	lib/classes/patch/380alpha17a.php
	lib/classes/patch/380alpha18a.php
	lib/classes/patch/380alpha3a.php
	lib/classes/patch/380alpha4a.php
	lib/classes/patch/380alpha6a.php
	lib/classes/patch/380alpha8a.php
	lib/classes/patch/380alpha9a.php
	lib/classes/patch/381alpha1b.php
	lib/classes/patch/381alpha2a.php
	lib/classes/patch/381alpha3a.php
	lib/classes/patch/381alpha4a.php
	lib/classes/patch/383alpha1a.php
	lib/classes/patch/383alpha2a.php
	lib/classes/patch/383alpha3a.php
	lib/classes/patch/383alpha4a.php
	lib/classes/record/adapter.php
	lib/classes/record/preview.php
	lib/classes/recordutils.php
	lib/classes/recordutils/audio.php
	lib/classes/recordutils/document.php
	lib/classes/recordutils/map.php
	lib/classes/recordutils/video.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/apiwebhooks.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
	templates/web/admin/collection/collection.html.twig
	templates/web/common/dialog_export.html.twig
	templates/web/common/menubar.html.twig
	templates/web/prod/actions/Tools/index.html.twig
	templates/web/prod/index.html.twig
	templates/web/prod/upload/upload-flash.html.twig
	templates/web/prod/upload/upload.html.twig
	templates/web/report/report_layout_child.html.twig
	templates/web/setup/step2.html.twig
	templates/web/thesaurus/new-synonym-dialog.html.twig
	templates/web/thesaurus/properties.html.twig
	templates/web/thesaurus/search.html.twig
	tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
	tests/Alchemy/Tests/Phrasea/Cache/FactoryTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php
 2015-02-05 18:38:49 +01:00
Nicolas Le Goff
d82adbf109 Bump year to 2015 2015-01-20 14:08:25 +01:00