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 |
|
Nicolas Maillat
|
e066ca19fa
|
Merge pull request #3487 from alchemy-fr/PHRAS-3072_Several_design_fix
PHRAS-3072 #comment Several Design fix on production client before 4.1.0 release
|
2020-05-15 16:27:42 +02:00 |
|
Harrys Ravalomanana
|
80497e85f6
|
PHRAS-3072 fix on publication
|
2020-05-15 16:06:26 +04:00 |
|
Harrys Ravalomanana
|
5bed9f486f
|
PHRAS-3072 add translation + more fix on design
|
2020-05-15 14:05:01 +04:00 |
|
Harrys Ravalomanana
|
f21d126295
|
PHRAS-3072
|
2020-05-15 13:05:51 +04:00 |
|
Harrys Ravalomanana
|
fe6b01aaae
|
Merge branch 'master' into PHRAS-3072_Several_design_fix
|
2020-05-15 11:57:35 +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 |
|
Harrys Ravalomanana
|
a535268ae8
|
PHRAS-3072 #comment Design fix #time 6h
|
2020-05-14 18:39:24 +04:00 |
|
Nicolas Maillat
|
7a2410401d
|
Merge pull request #3485 from alchemy-fr/PHRAS-3070_Prod_publication_fix_on_display
PHRAS-3070 #comment Prod publication - gif are played and check behavior in 4.0
|
2020-05-14 10:25:18 +02: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 |
|
nmaillat
|
1ae39daa86
|
PHRAS-3049 #comment Move Mailhog, builder from overide to docker compose, mount cache in builder
|
2020-05-13 21:34:50 +02:00 |
|
Harrys Ravalomanana
|
5cb7e728b4
|
Merge branch 'master' into PHRAS-3070_Prod_publication_fix_on_display
|
2020-05-13 18:48:27 +04:00 |
|
Harrys Ravalomanana
|
6b34c149e3
|
PHRAS-3070 #comment Fix on publication display #time 2h
|
2020-05-13 18:46:14 +04: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 |
|
Nicolas Maillat
|
bfdba6cd7f
|
Merge pull request #3484 from alchemy-fr/PHRAS-3068_Prod_publication_editing
PHRAS-3068 #comment merge Prod - publication -editing - title and subtile is not update after modification
|
2020-05-13 16:04:16 +02:00 |
|
aynsix
|
8ace8aeab7
|
fix subscriber
|
2020-05-13 15:25:16 +03:00 |
|
Harrys Ravalomanana
|
4d48b3669b
|
Merge branch 'master' into PHRAS-3068_Prod_publication_editing
|
2020-05-13 16:21:40 +04:00 |
|
Nicolas Maillat
|
543ff8c1fb
|
Merge pull request #3483 from alchemy-fr/PHRAS-3067_Prod_video_tools_change_default_option_No_chapter_overlaps
PHRAS-3067 #comment merge Prod - video tools - by default option "No Chapters Overlaps" need to be true
|
2020-05-13 14:10:36 +02:00 |
|
Harrys Ravalomanana
|
5f8ca21c8a
|
Merge branch 'master' into PHRAS-3068_Prod_publication_editing
|
2020-05-13 16:02:45 +04:00 |
|
Harrys Ravalomanana
|
80023b5fe5
|
PHRAS-3068 upgrade phraseanet-production-client
|
2020-05-13 16:01:42 +04:00 |
|
Nicolas Maillat
|
ec1212e322
|
Merge branch 'master' into PHRAS-3067_Prod_video_tools_change_default_option_No_chapter_overlaps
|
2020-05-13 13:49:43 +02:00 |
|
Nicolas Maillat
|
ac8b04d72c
|
Merge pull request #3480 from alchemy-fr/PHRAS-2157_Prod_share_iframe_size
PHRAS-2157 #comment merge Prod / Share : Iframe sizes are set to 0 for audio documents
|
2020-05-13 13:44:52 +02:00 |
|
Harrys Ravalomanana
|
fd2f9f75d9
|
PHRAS-3068 #comment Fix update value of title and subtitle after modification #time 2h
|
2020-05-13 14:42:44 +04:00 |
|
aynsix
|
7228b43cf5
|
test
|
2020-05-13 12:34:39 +03:00 |
|
Harrys Ravalomanana
|
a237007195
|
PHRAS-3067 change default value of chapter overlaps
|
2020-05-13 12:55:42 +04:00 |
|
aynsix
|
2bde6b8804
|
fix connection
|
2020-05-13 11:55:26 +03:00 |
|
Nicolas Maillat
|
cfb71fb4d7
|
Merge branch 'master' into PHRAS-2157_Prod_share_iframe_size
|
2020-05-13 10:28:13 +02:00 |
|
Nicolas Maillat
|
4f8c850fc5
|
Merge branch 'master' into PHRAS-3057-worker-in-core-4-1
|
2020-05-12 21:15:11 +02:00 |
|
Nicolas Maillat
|
ac38b5d68a
|
PHRAS-3057 dockerfile cmd for worker
|
2020-05-12 21:14:37 +02:00 |
|
Nicolas Maillat
|
14ce0e3940
|
Merge pull request #3479 from alchemy-fr/PHRAS-3063_prod_basket_reorder_documents
PHRAS-3063 #comment Prod - Reorder documents in basket: Design issues
|
2020-05-12 20:47:43 +02:00 |
|
Nicolas Maillat
|
e46c3071c7
|
Merge branch 'master' into PHRAS-3063_prod_basket_reorder_documents
|
2020-05-12 19:55:46 +02:00 |
|
aynsix
|
65552dcbfe
|
fix
|
2020-05-12 19:42:43 +03:00 |
|
aynsix
|
c9970fcc24
|
fix provider
|
2020-05-12 18:16:45 +03:00 |
|
aynsix
|
bb2123df5a
|
include plugin worker in phraseanet core
|
2020-05-12 18:06:45 +03:00 |
|
Harrys Ravalomanana
|
16477a2a53
|
PHRAS-2157 #comment Prod share fix iframe size #time 2h
|
2020-05-12 18:40:23 +04:00 |
|
Harrys Ravalomanana
|
9d23503c44
|
PHRAS-3063 #comment Fix onf prod basket reorder doc
|
2020-05-12 12:44:52 +04:00 |
|