hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 04:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,146 Commits 268 Branches 107 Tags
PHRAS-4131-set-order-add-loader
Commit Graph

3071 Commits

Author SHA1 Message Date
Nicolas Le Goff
0d040519f3 Add third party application webhook event 2014-06-23 17:48:42 +02:00
Nicolas Le Goff
1250f8ab0b Fix latest merge 2014-06-19 16:11:27 +02:00
Nicolas Le Goff
a8da584666 Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Controller/Admin/Collection.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Controller/Prod/Language.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php
	lib/Alchemy/Phrasea/Controller/Report/Informations.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	lib/Alchemy/Phrasea/Controller/Root/Developers.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
	lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
	lib/Alchemy/Phrasea/Controller/Utils/PathFileTest.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Form/Login/PhraseaAuthenticationForm.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
	lib/classes/API/OAuth2/Application.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Aggregate.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/ZipArchiveImproved.php
	lib/classes/caption/Field/Value.php
	lib/classes/caption/record.php
	lib/classes/eventsmanager/notify/feed.php
	lib/classes/media/subdef.php
	lib/classes/module/report/connexion.php
	lib/classes/module/report/download.php
	lib/classes/record/adapter.php
	lib/classes/registry.php
	lib/classes/set/export.php
	lib/classes/setup.php
	lib/classes/task/abstract.php
	lib/classes/task/period/emptyColl.php
	lib/classes/uuid.php
	lib/conf.d/_GV_template.inc
	lib/conf.d/bases_structure.xml
	lib/conf.d/configuration.yml
	lib/conf.d/minifyGroupsConfig.php
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	locale/phraseanet.pot
	templates/web/account/account.html.twig
	templates/web/account/base.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/admin/index.html.twig
	templates/web/admin/setup.html.twig
	templates/web/admin/tree.html.twig
	templates/web/client/index.html.twig
	templates/web/common/caption.html.twig
	templates/web/common/caption_templates/answer.html.twig
	templates/web/common/caption_templates/basket_element.html.twig
	templates/web/common/caption_templates/internal_publi.html.twig
	templates/web/common/caption_templates/lazaret.html.twig
	templates/web/common/caption_templates/overview.html.twig
	templates/web/common/caption_templates/preview.html.twig
	templates/web/common/index_bootstrap.html.twig
	templates/web/common/indexfloat.html.twig
	templates/web/common/thumbnail.html.twig
	templates/web/developers/application_form.html.twig
	templates/web/lightbox/IE6/feed.html.twig
	templates/web/lightbox/IE6/validate.html.twig
	templates/web/lightbox/feed.html.twig
	templates/web/lightbox/validate.html.twig
	templates/web/prod/actions/Download/prepare.html.twig
	templates/web/prod/actions/publish/publish.html.twig
	templates/web/prod/index.html.twig
	templates/web/prod/preview/caption.html.twig
	templates/web/prod/results/answerlist.html.twig
	templates/web/thesaurus/accept.html.twig
	templates/web/thesaurus/export-text-dialog.html.twig
	templates/web/thesaurus/export-text.html.twig
	templates/web/thesaurus/export-topics-dialog.html.twig
	templates/web/thesaurus/export-topics.html.twig
	templates/web/thesaurus/index.html.twig
	templates/web/thesaurus/link-field-step1.html.twig
	templates/web/thesaurus/link-field-step2.html.twig
	templates/web/thesaurus/link-field-step3.html.twig
	templates/web/thesaurus/new-term.html.twig
	templates/web/thesaurus/properties.html.twig
	templates/web/thesaurus/search.html.twig
	templates/web/thesaurus/thesaurus.html.twig
	tests/Alchemy/Tests/Phrasea/Application/ApiJsonTest.php
	tests/Alchemy/Tests/Phrasea/Application/ApiYamlTest.php
	tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
	tests/Alchemy/Tests/Phrasea/Application/OAuth2Test.php
	tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
	tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
	tests/Alchemy/Tests/Phrasea/Cache/RedisCacheTest.php
	tests/Alchemy/Tests/Phrasea/Command/Compile/ConfigurationTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJSONPTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/EditTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/LanguageTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/MoveCollectionTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/PrinterTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/PushTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/RootTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/ToolsTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/TooltipTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Utils/ConnectionTestTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Utils/PathFileTestTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/FTPServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/LocaleServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/RegistrationServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Http/XSendFile/NginxModeTest.php
	tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfEditDateTest.php
	tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMimeTypeTest.php
	tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineAbstractTest.php
	tests/classes/Feed/Feed_AggregateTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/db-ref.sqlite
 2014-06-17 15:30:41 +02:00
Nicolas Le Goff
b92370cca2 Merge pull request #1021 from nlegoff/api-doctrine 
[READY][3.9] Transform api_* tables to doctrine entities
 2014-06-13 14:13:23 +02:00
Nicolas Le Goff
0345e0ee8e Fix PHRAS-45 'mail' action is not logged anymore 2014-06-13 12:56:06 +02:00
Nicolas Le Goff
291512ff34 Fix empty of collection 2014-06-06 16:42:24 +02:00
Nicolas Le Goff
e5b8817c46 PHP CS fix 2014-05-30 15:22:00 +02:00
Nicolas Le Goff
53c2f7b5e0 Always send webhook 2014-05-28 15:48:12 +02:00
Nicolas Le Goff
e0197cadb5 Update new entry event webhook payload 2014-05-28 15:47:58 +02:00
Jean-Yves Gaulier
45b5aca078 phras-141 #time 4h 2014-05-28 15:10:28 +02:00
Jean-Yves Gaulier
3434e4cab2 added patch, redirect parm, translations 2014-05-23 14:43:46 +02:00
Nicolas Le Goff
5944809fc3 Fix H264 pseudostreaming mode 2014-05-13 20:32:50 +02:00
Nicolas Le Goff
7929f05857 Merge pull request #1033 from nlegoff/api-hooks 
[3.8] Add API webhooks mechanism
 2014-05-06 17:23:24 +02:00
Nicolas Le Goff
122e068656 Merge pull request #1072 from nlegoff/patch-cors 
[3.8] Patch cors
 2014-05-06 15:13:53 +02:00
Nicolas Le Goff
1e6f49bdad Enhance data schema 2014-05-06 11:07:16 +02:00
Nicolas Le Goff
b99db80fef Fix array declaration 2014-05-06 10:53:29 +02:00
Nicolas Le Goff
1a528b5f5f Add webhook task 2014-05-06 10:53:29 +02:00
Nicolas Le Goff
2ccd478a6b Add webhooks only if feed notify_email is set to true 2014-05-06 10:53:29 +02:00
Nicolas Le Goff
9e9cfa3c5f Add new feed entry web hook when creating a new feed entry 2014-05-06 10:53:29 +02:00
Nicolas Le Goff
b23115d38d Add api webhook adapter 2014-05-06 10:53:29 +02:00
Nicolas Le Goff
da45ac4d78 Handle new webhook field 2014-05-06 10:53:28 +02:00
Nicolas Le Goff
f5a97091eb Fix 3.8.4a2 migration patch 2014-05-05 09:55:24 +02:00
Nicolas Le Goff
fc23a83574 Bump to version 3.8.4alpha-3 2014-05-05 09:43:26 +02:00
Nicolas Le Goff
c56fc230ab Merge pull request #1069 from nlegoff/phras-82 
[3.8] Fix phras-82 sanitize feed url's
 2014-04-25 11:22:45 +02:00
Nicolas Le Goff
2a94980786 Merge pull request #1067 from nlegoff/phras-46 
[3.8] Fix phras-46 display passwords fields as 'password' input
 2014-04-24 11:24:14 +02:00
Nicolas Le Goff
d716c8e400 Fix phras-82 sanitize feed url's 2014-04-23 19:08:29 +02:00
Nicolas Le Goff
759a205025 Fix phras-46 display passwords fields as 'password' input 2014-04-23 16:49:37 +02:00
Nicolas Le Goff
cc49f51cfa Merge pull request #1063 from nlegoff/phras-55 
[3.8] PHRAS-55 Rename status icon filename
 2014-04-23 14:46:39 +02:00
Nicolas Le Goff
031de51044 Fix PHRAS-24 Use https endpoint to display google charts 2014-04-22 17:48:29 +02:00
Nicolas Le Goff
d0d83cd705 Add migration patch 2014-04-22 11:20:36 +02:00
Nicolas Le Goff
9d10c68446 Rename icone status 2014-04-22 11:20:17 +02:00
Nicolas Le Goff
721fd9e909 Merge pull request #1039 from jygaulier/fix-bounce-and-highlight 
[3.8][PHRAS-74] Fix thesaurus bounce
 2014-04-15 15:45:50 +02:00
Nicolas Le Goff
f9ee940526 Fix API feeds pagination 2014-04-15 12:03:41 +02:00
Nicolas Le Goff
424fea8c8e Clean up the code 2014-04-14 14:58:55 +02:00
Jean-Yves Gaulier
761437154c Fix thesaurus bounce 2014-04-14 14:54:14 +02:00
Nicolas Le Goff
68861f546b PHRAS-70 Set default etags 2014-04-10 18:05:31 +02:00
Nicolas Le Goff
e97ed2b3f1 Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Controller/Admin/Publications.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Client/Root.php
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/Alchemy/Phrasea/Controller/Prod/Root.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/Alchemy/Phrasea/Controller/Report/Export.php
	lib/Alchemy/Phrasea/Controller/Report/Informations.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Aggregate.php
	lib/classes/Feed/Collection.php
	lib/classes/format.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Report/ExportTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
	tests/classes/Feed/Feed_CollectionTest.php
	tests/classes/api/v1/api_v1_adapterTest.php
 2014-03-30 09:00:17 +02:00
Nicolas Le Goff
aa07eba97f Merge pull request #1041 from nlegoff/api-enhancement 
[3.8][READY] Add some API enhancement
 2014-03-25 14:43:13 +01:00
Nicolas Le Goff
bf3f870a91 Store UNIX timestamp for token expiration 2014-03-24 12:29:39 +01:00
Nicolas Le Goff
ad4c265cdf Fix migration patch 2014-03-24 12:29:39 +01:00
Nicolas Le Goff
383107b954 Update migration patch 2014-03-24 12:29:39 +01:00
Nicolas Le Goff
137cacea0b Fix sets of expiration time 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
dce52c26d8 Add proper expire date to oauth code token 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
fa9189f78a Add oauth2 adapter as a service 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
40ff8968e9 Raise bad request exception if uri is malformed && Fix use statement 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
e0d538c2c9 Split route field value & sets expie date to null 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
63b6de5fc8 Remove one to one relation beetween account and token & add lastUsed field for token 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
2cc2387c87 Fix migration SQLs 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
426816e2d3 Checks if api tables exists before apllaying patch 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
ec07e33c9f Fix patch 2014-03-24 12:29:37 +01:00