Commit Graph

14519 Commits

Author SHA1 Message Date
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
Nicolas Maillat
e4a872dfeb Merge pull request #3477 from alchemy-fr/PHRAS-3062_Prod_push_feedback_add_created_user
PHRAS-3062 #comment merge  Prod - Push feedback - The created user is not add to the current push or feedback
2020-05-12 10:34:51 +02:00
Nicolas Maillat
c174cd5e83 Merge branch 'master' into PHRAS-3062_Prod_push_feedback_add_created_user 2020-05-12 10:05:44 +02:00
Nicolas Maillat
ca66dfc11b Merge pull request #3478 from alchemy-fr/PHRAS-3066_Prod_tools_500_error
PHRAS-3066 #comment merge Prod - Tools - 500 error when record selection contains more than one record
2020-05-12 10:05:29 +02:00
Harrys Ravalomanana
7022c382b8 PHRAS-3066 #commetn fix 500 error on tools #time 2h 2020-05-12 11:15:07 +04:00
nmaillat
5e10b6cc04 Fix install admin account test env name 2020-05-12 00:28:42 +02:00
nmaillat
05486f6e35 Renaming INSTALL env name 2020-05-12 00:09:46 +02:00
nmaillat
fd8e9520a0 Renaming INSTALL env name 2020-05-11 23:12:25 +02:00
Harrys Ravalomanana
e4e2bf4984 PHRAS-3062 #comment Fix add created user on push or feedback 2020-05-11 19:13:53 +04:00
nmaillat
a3a69d4a9e volumes for download,lazaret, tmp as env variable 2020-05-11 15:25:34 +02:00
nmaillat
8aaf094716 volumes for download,lazaret, tmp as env variable 2020-05-11 15:22:51 +02:00
Nicolas Maillat
710e6afa51 Merge branch 'master' into PHRAS-3049_more_setup_in_docker-compose 2020-05-11 14:31:08 +02:00
nmaillat
6f07e9e8b0 Email config in entrypoint 2020-05-11 14:30:39 +02:00
nmaillat
ada01f28df PHRAS-3049 #comment roolback on --scheduler-locks-path 2020-05-11 14:30:39 +02:00
nmaillat
054a23734b PHRAS-3049 #comment more volumes in auto-install 2020-05-11 14:30:39 +02:00
nmaillat
91207f9d98 PHRAS-3049 #comment define volume during install #time 3h 2020-05-11 14:30:39 +02:00
nmaillat
d0694457f3 PHRAS-3049 # comment define video poster in embed-bundle conf, add more field in DublinCore template 2020-05-11 14:30:39 +02:00
nmaillat
b0ca1fd5ad install change db template to DublinCore model, edit DublinCore databox template 2020-05-11 14:30:39 +02:00
nmaillat
65aa5a3aaa PHRAS-3049 #comment auto-install reorganisation, more environement variable for mail configuration and http api setting 2020-05-11 14:30:39 +02:00
Nicolas Maillat
e9b3a83c59 Merge pull request #3473 from alchemy-fr/PHRAS-3059_fix_on_string
PHRAS-3059 #comment merge  String is missing in weblate - Prod - Actions button
2020-05-08 17:25:39 +02:00
Harrys Ravalomanana
f2d68c1d3e PHRAs-3059 2020-05-08 19:10:45 +04:00
Harrys Ravalomanana
42cd99da5f Merge branch 'PHRAS-3059_fix_on_string' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3059_fix_on_string 2020-05-08 19:10:08 +04:00
Harrys Ravalomanana
1b4ed3205a Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3059_fix_on_string 2020-05-08 19:07:34 +04:00
Nicolas Maillat
6075d4530a Merge branch 'master' into PHRAS-3059_fix_on_string 2020-05-08 16:47:38 +02:00
Nicolas Maillat
9d93c27b79 Merge pull request #3457 from alchemy-fr/PHRAS-2524-worker-log
PHRAS-2524 #comment Put worker logs, tasks log and app error log into an ELK
2020-05-08 16:47:22 +02:00
Harrys Ravalomanana
de62071cfa PHRAS-3059 Fix on string error 2020-05-08 18:26:03 +04:00
Nicolas Maillat
9503bb3410 Merge branch 'master' into PHRAS-2524-worker-log 2020-05-08 16:20:27 +02:00
Nicolas Maillat
ba9a8da62d Merge pull request #3472 from alchemy-fr/PHRAS-3051_Prod-vide_tools_define_thumbnail
PHRAS-3051 #comment merge Prod - video tools - define a thumbnail for video don't update other static image like poster
2020-05-08 16:20:10 +02:00
Harrys Ravalomanana
2a55ef6880 PHRAS-3051 #comment Fix : Prod video tools define thumbnail size #time 4h 2020-05-08 17:01:48 +04:00
Nicolas Maillat
e974e5c0ab Merge branch 'master' into PHRAS-3049_more_setup_in_docker-compose 2020-05-08 14:47:42 +02:00
Jennifer
01ddf69483 Translated using Weblate (German)
Currently translated at 99.9% (2498 of 2500 strings)
2020-05-08 12:16:04 +00:00