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

4675 Commits

Author SHA1 Message Date
Thibaud Fabre
15c533f709 PHRAS-1251 Replace webhook job by queue worker 2016-10-10 11:19:44 +02:00
Thibaud Fabre
c48b490e18 Return empty array when configuration cannot be loaded 2016-10-10 11:19:44 +02:00
Thibaud Fabre
d915c0d6e3 Fix configuration provider 2016-10-10 11:19:44 +02:00
Thibaud Fabre
7b18eda9bb PHRAS-1253 Add RabbitMQ and AMQP libraries to provisioning 2016-10-10 11:19:44 +02:00
Thibaud Fabre
dd480b0db0 Start integration of worker bundle 2016-10-10 11:19:43 +02:00
Thibaud Fabre
f2b956b015 Merge pull request #1968 from jygaulier/PHRAS-946_delete-record-api 
PHRAS-946_delete-record-api
 2016-09-29 17:41:24 +02:00
Jean-Yves Gaulier
c6186abe56 PHRAS-946_delete-record-api 
- add : api route to delete record : verb DELETE ; /api/v1/records/{{databox_id}}/{{record_id}}
 2016-09-29 15:54:04 +02:00
Thibaud Fabre
cdc410191c Merge pull request #1960 from jygaulier/PHRAS-1192_quarantaine-by-filenames_4.0 
PHRAS-1192_quarantaine-by-filenames_4.0
 2016-09-29 14:11:08 +02:00
Thibaud Fabre
91aae6a236 Merge pull request #1945 from jygaulier/PHRAS-1178_edit-story-and-records_4.0 
PHRAS-1178_edit-story-and-records_4.0
 2016-09-29 14:10:47 +02:00
Thibaud Fabre
08a8970147 Merge pull request #1944 from jygaulier/PHRAS-842_search-logged-as-es_4.0 
PHRAS-842_search-logged-as-es_4.0
 2016-09-29 14:10:21 +02:00
Thibaud Fabre
bd7e0987bc Clear log repository on user deletion 2016-09-29 10:22:05 +02:00
Thibaud Fabre
9597a775e2 Merge pull request #1964 from alchemy-fr/4.0 
Merge 4.0 into master
 2016-09-29 09:32:30 +02:00
Thibaud Fabre
b98d8a38b2 Fix webhook repository test 2016-09-28 21:35:48 +02:00
Thibaud Fabre
73be6d5615 PHRAS-1239 Add webhook for user deleted events 2016-09-28 21:35:48 +02:00
Thibaud Fabre
f62c22bc5c Move setting to registry and form type 2016-09-28 20:58:26 +02:00
Thibaud Fabre
7cf5d28a99 Fix configuration setting access 2016-09-28 20:25:25 +02:00
Thibaud Fabre
c13e086120 Add option to disable API via configuration setting 2016-09-28 20:25:25 +02:00
Thibaud Fabre
73826d535c PHRAS-1248 Merge branch '4.0' 
Conflicts:
	Makefile
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Collection/CollectionService.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php
	lib/Alchemy/Phrasea/Core/Event/Subscriber/RecordEditSubscriber.php
	lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php
	lib/Alchemy/Phrasea/Model/Manipulator/LazaretManipulator.php
	lib/classes/record/adapter.php
	resources/ansible/roles/app/tasks/main.yml
	resources/www/prod/js/jquery.Edit.js
	resources/www/prod/js/jquery.main-prod.js
	resources/www/prod/skins/ui-components/_answers-tools.scss
	templates/web/common/dialog_export.html.twig
	templates/web/prod/thesaurus.js.twig
 2016-09-28 19:52:33 +02:00
Jean-Yves Gaulier
877beaa40d PHRAS-1178_edit-story-and-records_4.0 
- change : if a record is updated, every "parent" story is considered as updated too (editDateField(s) set)
 - fix : cache is now invalidated after editing records
 - fix : recordeditsuscriber can't run into recursion anymore
 2016-09-28 17:43:37 +02:00
Jean-Yves Gaulier
837a294827 PHRAS-1192_quarantaine-by-filenames_4.0 
- add : quarantine thumbnails looks like result thb (zoom, caption, infos, ...) by using the same template
 - removed : some code about highlighting titles
 - fix : double extension on exported files
 2016-09-28 13:16:10 +02:00
Thibaud Fabre
675ec2c939 Merge pull request #1957 from alchemy-fr/fix/provisioned-api-settings 
API settings provisioning
 2016-09-27 11:27:13 +02:00
Thibaud Fabre
3d8d4f6d99 Fix config editor set command 2016-09-27 11:11:02 +02:00
Thibaud Fabre
ebc515f2c1 PHRAS-1006 Add order manager in API collection description 2016-09-27 10:38:34 +02:00
Thibaud Fabre
8b843b9357 Add configuration editor command in setup 2016-09-27 07:49:06 +02:00
Thibaud Fabre
051eb0a2bf PHRAS-1210 Remove invalid assignment 2016-09-22 18:11:24 +02:00
Jean-Yves Gaulier
827e4fe255 PHRAS-842_search-logged-as-es_4.0 
- fix : query is logged in a "user" form, before parsing
 2016-09-22 15:16:36 +02:00
Thibaud Fabre
d934e04c80 Merge pull request #1938 from jygaulier/PHRAS-1216_story-cover-changed-event 
PHRAS-1216_story-cover-changed-event
 2016-09-21 16:11:56 +02:00
Jean-Yves Gaulier
1c1e9cf723 PHRAS-1216_story-cover-changed-event 
- fix : class name/extend changed,
#time 10m
 2016-09-21 15:47:55 +02:00
Thibaud Fabre
4a434672b4 Remove limit clause and use maxResults query method 2016-09-21 15:17:27 +02:00
Thibaud Fabre
e9f74c9c52 Fix login issues when multiple validation tokens exist 2016-09-21 15:17:18 +02:00
Thibaud Fabre
b255f32e34 Revert "Fix non unique validation tokens" 2016-09-21 15:15:38 +02:00
Jean-Yves Gaulier
e10971a88f PHRAS-1216_story-cover-changed-event 
#time 1h
 2016-09-21 15:13:12 +02:00
Thibaud Fabre
e2f0285356 Remove limit clause and use maxResults query method 2016-09-21 15:03:00 +02:00
Thibaud Fabre
46283817aa Fix login issues when multiple validation tokens exist 2016-09-21 14:46:14 +02:00
Thibaud Fabre
7041c960c7 Fix filename 2016-08-02 15:25:53 +02:00
Thibaud Fabre
303a39e359 Allow removing order masters without adding a new one 2016-07-29 14:46:18 +02:00
jygaulier
98dbb863fe Merge pull request #1927 from jygaulier/PHRAS-1190_prod-search-thesaurus 
PHRAS-1190_prod-search-thesaurus
 2016-07-19 15:36:55 +02:00
Jean-Yves Gaulier
19342cf45c PHRAS-1190_prod-search-thesaurus 
- removed comment
- test is ok (no more timeout) but without changes from first commit (???)
 2016-07-19 13:46:27 +02:00
Jean-Yves Gaulier
0dac4a4573 PHRAS-1190_prod-search-thesaurus 
- wip : changes removed to see if tests timeout again
 2016-07-19 12:00:47 +02:00
Jean-Yves Gaulier
5ae1b8355d PHRAS-1190_prod-search-thesaurus 
- wip : changes removed to see if tests timeout again
 2016-07-19 11:37:46 +02:00
Jean-Yves Gaulier
69914dee31 PHRAS-1190_prod-search-thesaurus 
- wip : changes removed to see if tests timeout again
 2016-07-18 16:42:52 +02:00
Jean-Yves Gaulier
1abe2463e8 PHRAS-1190_prod-search-thesaurus 
- fix : prod / thesaurus search is ok (language doesn't care)
#time 2h
 2016-07-18 15:32:27 +02:00
jygaulier
d558192a74 Merge pull request #1910 from jygaulier/PHRAS-1168_Backport-PHRAS-1094-to-4.0 
PHRAS-1168_Backport-PHRAS-1094-to-4.0
 2016-07-18 13:32:27 +02:00
Thibaud Fabre
9dc6509911 Merge pull request #1925 from aztech-dev/feature/cors-configuration 
PHRAS-1180 Add configuration entry to enable CORS on custom paths
 2016-07-12 15:11:32 +02:00
Thibaud Fabre
9ca8dee44f PHRAS-1180 Add configuration entry to enable CORS on custom paths 2016-07-12 14:22:12 +02:00
Florian BLOUET
75b172b7cf Bump Phraseanet Production Client 
update video tools features
- add sequencial hotkey for play speed: (L) (LL) (LLL...)
 2016-07-08 15:30:37 +02:00
Florian BLOUET
3258d91f73 Bump Phraseanet Production Client 
update video tools features
- add keyboard shortcuts: move up/down ranges in list
- fix loop if end range match the end of the video
- fix play/pause race condition
 2016-07-08 12:12:25 +02:00
Florian BLOUET
6774f5cd9e Bump Phraseanet Production Client 
update video tools features, fix misc issues
    - fix pym.js integration issues
    - fix record editor's preview tab
    - add video Editor in record Editor
    - export VTT content to VideoTextTrack field
 2016-07-06 13:45:15 +02:00
Thibaud Fabre
3072125658 Fix include resolution for search type 2 2016-07-02 15:40:32 +02:00
Thibaud Fabre
8c888b99f5 Fix incorrect include resolution for search type 2 2016-07-02 15:35:45 +02:00