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
12,001 Commits 268 Branches 107 Tags
53b8ca40872a04579822b23e2b51b43b30cc652f
Commit Graph

221 Commits

Author SHA1 Message Date
Thibaud Fabre
2d7d58079e Use base ID instead of collection ID 2015-07-01 11:52:12 +02:00
Benoît Burnichon
041f017fd7 Merge pull request #1395 from jygaulier/PHRAS-442_FACETS-IN-API 
PHRAS-442
 2015-06-29 17:55:56 +02:00
Benoît Burnichon
28fee99fc4 Add Form for ElasticSearch Configuration. 
Also changed type from array to Options object.
 2015-06-29 17:10:32 +02:00
Jean-Yves Gaulier
50ddbbed60 PHRAS-442 #time 10 m 
cs
 2015-06-22 18:20:22 +02:00
Jean-Yves Gaulier
1d0dcaa240 PHRAS-442 #time 5h 
facets returned in API
"suggestions" returned in API (as flat facets)
 2015-06-22 18:20:22 +02:00
Thibaud Fabre
af1dc9126b Return base_id in API & remove unneeded conversions 2015-06-18 11:24:11 +02:00
Thibaud Fabre
c425c3391a CS fixes 2015-06-10 10:50:52 +02:00
Thibaud Fabre
265b40c6e0 List collection rights in /me 2015-06-09 16:51:05 +02:00
Benoît Burnichon
2489cc6ffe Rework FeedAggregate. Issue with embedded entry collection. 
PHRAS-542
 2015-05-27 12:56:46 +02:00
Benoît Burnichon
a85f495b23 Fixup return on getEntry to Collection. 
PHRAS-542.
 2015-05-27 11:11:20 +02:00
Benoît Burnichon
d77b55388d Add extended behavior to listRecord 
PHRAS-537
 2015-05-22 16:18:14 +02:00
Benoît Burnichon
1dc0ff9123 JWT uses an ArrayAccess but expects a string, not a Secret model. 2015-05-21 14:33:11 +02:00
Benoît Burnichon
fb5ca52306 Add Permalink 2015-05-21 12:26:28 +02:00
Benoît Burnichon
c2ff3b6575 Add Secrets to ApplicationBox. 2015-05-19 18:26:57 +02:00
Benoît Burnichon
469e2d0583 Add DataboxLoggerAware where needed 2015-05-14 23:43:00 +02:00
Benoît Burnichon
3b1d5aff10 Merge remote-tracking branch 'origin/feature/controller-as-service' 2015-05-13 10:19:38 +02:00
Benoît Burnichon
956b6e401c Fixup ApiTests about Content-Type 
# Conflicts:
#	lib/Alchemy/Phrasea/Controller/Prod/BridgeController.php
 2015-05-13 09:49:33 +02:00
Jean-Yves Gaulier
e713cbcc80 - fix : title is writen in the (first) field declared "thumbtitle" 
- add (wip, do not use) : metadatas can be set for the new story(ies), by field name of metadata_struct_id, see sample:

{
	"stories": [
		{
  			"title": "Story 1",
  			"description": "A story from Phraseanet",
	    	"collection_id": 494,
            "metadatas": {
            	"Ville": "Paris",
                "Pays": "France",
                "7": "Dupond",
                "MotsCles": [
                	"soleil",
                    "pluie"
                ]
            },
			"story_records": [
				{
					"title": "record 1 in story 1",
					"databox_id": 3,
					"record_id": 209
				},
				{
					"title": "record 2 in story 1",
					"databox_id": 3,
					"record_id": 210
				}
			]
	  	},
		{
  			"title": "Story 2",
  			"description": "Another story from Phraseanet",
	    	"collection_id": 495
  		}
	]
}
 2015-05-12 21:29:52 +02:00
Benoît Burnichon
61206fd517 Replace calls to mediavorus to getMediaFromUri 2015-05-12 18:12:02 +02:00
Benoît Burnichon
634f5366ae use DispatcherAware wherever possible 2015-05-12 17:15:11 +02:00
Benoît Burnichon
72fdfa7141 Fixup ApiTests about Content-Type 2015-05-11 18:11:51 +02:00
Benoît Burnichon
8c037232d5 Merge pull request #1374 from jygaulier/API_STORY 
report des routes api/story de 3.8
 2015-05-11 12:18:45 +02:00
Jean-Yves Gaulier
ae24e5332a -fix 2015-05-11 11:41:43 +02:00
Jean-Yves Gaulier
02a06c6515 #time 2h 
- fix api subdef substitute
- fix api addrecord/nosubdef
 2015-05-07 19:32:15 +02:00
Jean-Yves Gaulier
68a27c173f fix 2015-05-07 17:53:04 +02:00
Jean-Yves Gaulier
3305329501 report des routes api/story de 3.8 
#time 1.5d
 2015-05-07 16:53:53 +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
1342756b84 Rename Controller to ControllerProvider 2015-03-27 12:55:43 +01:00
Benoît Burnichon
0095ae611f Some Version static calls changed to method calls. 2015-03-19 15:15:59 +01:00
Benoît Burnichon
03b573f19c Some PHPCS fixes. 2015-03-19 15:15:59 +01:00
Benoît Burnichon
775552f613 Change Version to non-static 2015-03-19 11:28:06 +01:00
Benoît Burnichon
0ce4fd3192 Change to use border-manager as checker registry. 2015-03-17 16:55:55 +01:00
Benoît Burnichon
9a115726f4 Remove use of LazaretCheck::getMessage() static calls 
LazaretCheck should not perform the translations.

It would be better to have Checker registry to find checker to use.
 2015-03-17 15:59:53 +01:00
Benoît Burnichon
e32816a8e0 Refactor Api/V1 controller. 
Reorder entries.
Properly indent routes.
 2015-03-16 15:03:30 +01:00
Benoît Burnichon
c72e31163b Merge remote-tracking branch 'upstream/3.8' 2015-03-13 18:50:49 +01:00
Nicolas Le Goff
d5a56165a2 Fix search route tests 2015-03-11 21:50:36 +01:00
Benoît Burnichon
118bb2f03c Some fixup for ES instance 2015-03-11 15:22:20 +01:00
Nicolas Le Goff
ed3ffb59a6 Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer 
Conflicts:
	bin/console
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Border/Manager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/classes/caption/field.php
	lib/classes/record/Interface.php
	templates/web/prod/index.html.twig
	www/skins/prod/000000/prodcolor.css
 2015-03-10 14:36:31 +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
111755fa9b Refactor status display 2015-02-19 15:14:23 +01:00
Nicolas Le Goff
9a3e92ed9c Multiple ORMs for all database 2015-02-12 17:58:45 +01:00
Nicolas Le Goff
065f64bd47 Report previous patches 2015-02-09 13:42:26 +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
Mathieu Darse
c6b509a32c Centralize record event dispatches inside record adapter (but not structure ones) 2015-02-03 11:19:23 +01:00
Jean-Yves Gaulier
138008f7c6 #PHRAS-325 #time 5h 
fix "substit" flag in subdef.

new api route /embed/substitute
parms :
- databox_id
- record_id
- name
- /file/

more properties returned by api / object "embed" :
- substituted
- created_on
- updated_on
 2015-01-29 19:55:24 +01:00
Mathieu Darse
e287ba1a42 Merge record and structure events inside new namespace 2015-01-27 18:59:27 +01:00
Mathieu Darse
a1d6fc03b6 Move RECORD_* events in a new RecordEvents class 2015-01-27 16:17:48 +01:00
Mathieu Darse
85c410278a Remaining record events OK 2015-01-27 14:58:05 +01:00