7806 Commits

Author	SHA1	Message	Date
aynsix	3a8b99bf67	Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1890_Add-GS1-databases-model-to-Phraseanet	2020-06-03 10:31:26 +03:00
Nicolas Maillat	19d0d1901b	PHRAS-3120 fix storage file path for subview ... fix for audiovideowav and audiovideomp3	2020-06-03 01:49:46 +02:00
jygaulier	b67c37c340	WIP	2020-06-02 20:26:30 +02:00
Nicolas Maillat	b1511db777	Merge branch 'master' into PHRAS-1890_Add-GS1-databases-model-to-Phraseanet	2020-05-29 15:49:46 +02:00
Nicolas Maillat	bd7635b781	Merge branch 'master' into PHRAS-3091-search-on-contains-operator	2020-05-29 12:17:44 +02:00
Nicolas Maillat	3ea40f113c	Merge branch 'master' into PHRAS-3088-mysql-gone-away	2020-05-29 11:55:29 +02:00
aynsix	92502d8caa	search user on like %...%	2020-05-29 11:25:37 +03:00
nmaillat	bdd0032ed5	PHRAS-3009 #comment add audio preview in dublincore model	2020-05-29 01:35:30 +02:00
Nicolas Maillat	501811db37	Merge branch 'master' into PHRAS-3049_more_setup_in_docker-compose	2020-05-29 00:46:01 +02:00
aynsix	24261483d7	catch exception on the worker	2020-05-28 20:29:15 +03:00
aynsix	50f016ebb5	fix mysql server gone away and dead lock on table	2020-05-27 19:55:45 +03:00
Nicolas Maillat	2f1b90ad00	Merge branch 'master' into PHRAS-3081-sqllite-db-to-appbox	2020-05-27 14:51:42 +02:00
aynsix	71cc21bb43	custom link section	2020-05-27 11:27:18 +03:00
Nicolas Maillat	7696dfb610	Merge branch 'master' into PHRAS-1890_Add-GS1-databases-model-to-Phraseanet	2020-05-27 10:25:11 +02:00
aynsix	1f1a2e9aa1	Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3034-geoloc-video-timeout-patch	2020-05-27 09:55:13 +03:00
aynsix	ba4d3677aa	reverse column in admin	2020-05-27 09:48:48 +03:00
aynsix	0aa4864b9a	fix	2020-05-26 20:10:42 +03:00
aynsix	7e88bb236e	delete unused config class	2020-05-26 19:38:27 +03:00
aynsix	d25da3ee0c	remove sqllite db , add finished colomn	2020-05-26 19:35:33 +03:00
Nicolas Maillat	c3883d6b6b	Merge branch 'master' into PHRAS-2393-archive-task-improvement	2020-05-25 18:53:58 +02:00
Harrys Ravalomanana	c9e448d8fa	PHRAS-3082 Add string translation	2020-05-25 11:51:11 +04:00
aynsix	a0521c59fc	port to 4.1 archive task improvement	2020-05-22 12:24:19 +03:00
Nicolas Maillat	9e17f22683	Merge branch 'master' into PHRAS-3034-geoloc-video-timeout-patch	2020-05-21 01:05:43 +02:00
Harrys Ravalomanana	fdfb4122d5	PHRAS-3073 #comment add basket preference + display doc type #comment 3h	2020-05-20 19:20:59 +04:00
aynsix	7a3f74d256	fix conf timeout and patch geoloc binaries video editor	2020-05-20 17:06:29 +03:00
Nicolas Maillat	24cde66ea0	Merge branch 'master' into PHRAS-3057-worker-in-core-4-1	2020-05-20 01:10:41 +02:00
Nicolas Maillat	6615fe6722	Update TwigServiceProvider.php	2020-05-19 23:26:29 +02:00
Nicolas Maillat	50d70ffda3	Bigger icon for url link	2020-05-19 23:23:22 +02:00
Nicolas Maillat	824c6bac61	Update TwigServiceProvider.php	2020-05-19 23:10:01 +02:00
jygaulier	5ff6f3365b	better regex, not 100% url strict but ok enough	2020-05-19 18:20:35 +02:00
aynsix	77311ed7f6	fix refresh working tab	2020-05-19 17:45:16 +03:00
aynsix	8e7537e0ae	fix pull assets mode	2020-05-19 17:41:38 +03:00
aynsix	b2bb0c612e	fix api upload/enqueue	2020-05-19 15:42:02 +03:00
aynsix	bfb2b7723a	refresh working info	2020-05-18 17:38:04 +03:00
Nicolas Maillat	8ff6e5f16d	Merge branch 'master' into PHRAS-3049_more_setup_in_docker-compose	2020-05-18 14:20:53 +02:00
aynsix	11b8ca7953	change display work column	2020-05-18 11:42:06 +03:00
aynsix	c771d7da2b	catch subdef exception	2020-05-16 12:01:44 +03:00
aynsix	5b13beb02e	fix test	2020-05-16 09:35:38 +03:00
aynsix	5f9fb0224e	manage error on subdef an write meta	2020-05-15 21:04:30 +03:00
aynsix	6a7ca08000	Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3057-worker-in-core-4-1	2020-05-15 21:01:55 +03:00
aynsix	c54a062c64	update php-amqplib	2020-05-15 17:30:41 +03:00
Harrys Ravalomanana	f21d126295	PHRAS-3072	2020-05-15 13:05:51 +04:00
aynsix	0b45ae377c	add time to message, ad status info in worker table, fix subdef elastic flush	2020-05-14 18:48:00 +03:00
aynsix	67c8bf2125	fix connection	2020-05-14 10:49:03 +03:00
aynsix	b484b5f261	fix handler	2020-05-14 09:51:10 +03:00
gjacobjn	f91926c730	Add GS1 database model ... Add GS1 database model	2020-05-13 18:00:23 +02:00
aynsix	daf059d03f	make delayed queue connfigurable	2020-05-13 17:29:45 +03:00
Nicolas Maillat	8756384241	Merge branch 'master' into PHRAS-3049_more_setup_in_docker-compose	2020-05-13 16:16:51 +02:00
aynsix	8ace8aeab7	fix subscriber	2020-05-13 15:25:16 +03:00
aynsix	2bde6b8804	fix connection	2020-05-13 11:55:26 +03:00