Nicolas Maillat
|
ea23bdd996
|
Merge branch 'master' into PHRDPL-93-trusted-proxy-env-var
|
2020-07-09 23:08:11 +02:00 |
|
Nicolas Maillat
|
3254ca8ed2
|
Merge pull request #3569 from alchemy-fr/PHRAS-3177_prod-video-tools-auto-subtitling
PHRAS-3177 merge prod - video tools - auto subtitling - add info about running autosubtitling request
|
2020-07-09 23:05:43 +02:00 |
|
Alexandre BRACH
|
838a6e1499
|
use PHRASEANET_TRUSTED_PROXY env var
|
2020-07-09 17:43:36 +02:00 |
|
Harrys Ravalomanana
|
b2c4472a40
|
PHRAS-3177 Add request status
|
2020-07-09 18:46:34 +04:00 |
|
Nicolas Maillat
|
45e169694e
|
Merge pull request #3567 from alchemy-fr/PHRAS-3169_Prod_video_tools_vtt_with_number
PHRAS-3169 merge Prod video tools : Resize video on automatic subtitle tab
|
2020-07-09 16:21:54 +02:00 |
|
Nicolas Maillat
|
92951fff1d
|
Merge branch 'master' into PHRAS-3169_Prod_video_tools_vtt_with_number
|
2020-07-09 15:51:36 +02:00 |
|
Nicolas Maillat
|
9f0a2be8c3
|
Merge pull request #3556 from alchemy-fr/PHRAS-2504-ginga-subtitle
PHRAS-2504 merge Ginger service integration Auto-subtitle
|
2020-07-09 15:51:09 +02:00 |
|
aynsix
|
a040a3af5a
|
fix databoxID
|
2020-07-09 16:13:56 +03:00 |
|
Harrys Ravalomanana
|
08f63994bd
|
PHRAS-3169 resize video on automatic subtitle tab
|
2020-07-09 14:30:50 +04:00 |
|
Nicolas Maillat
|
83c4f1937d
|
Merge branch 'master' into PHRAS-2504-ginga-subtitle
|
2020-07-08 23:43:36 +02:00 |
|
Nicolas Maillat
|
7a4b595d0f
|
Merge pull request #3566 from alchemy-fr/PHRAS-3173_extract_pdf_text_nok
PHRAS-3173 merge change xpdf in favor of poppler-utils
|
2020-07-08 23:43:13 +02:00 |
|
Nicolas Maillat
|
98e03fa947
|
Merge branch 'master' into PHRAS-3173_extract_pdf_text_nok
|
2020-07-08 23:14:38 +02:00 |
|
Nicolas Maillat
|
f1c6f05ab6
|
Merge pull request #3561 from alchemy-fr/PHRAS-3169_Prod_video_tools_vtt_with_number
PHRAS-3169 merge Prod -video tools - take the clip numbers into account when they are present in video text track subtitle (VTT)
|
2020-07-08 22:51:38 +02:00 |
|
nmaillat
|
8ca946be93
|
PHRAS-3173 change xpdf in favor of poppler-utils
|
2020-07-08 22:42:01 +02:00 |
|
aynsix
|
936e3b704c
|
add ginger conf in conf.d
|
2020-07-08 19:15:45 +03:00 |
|
aynsix
|
2654037910
|
fix delimiter
|
2020-07-08 19:00:23 +03:00 |
|
Nicolas Maillat
|
73024bc1d6
|
Merge branch 'master' into PHRAS-3169_Prod_video_tools_vtt_with_number
|
2020-07-08 17:57:34 +02:00 |
|
aynsix
|
53397bb345
|
add an webvtt header description
|
2020-07-08 18:36:39 +03:00 |
|
Nicolas Maillat
|
e7c42c13c0
|
Merge pull request #3559 from alchemy-fr/PHRAS-3162_es-document-is-empy-pdf_4.1
PHRAS-3162 merge es-document-is-empy-pdf_4.1, This problem occurs when the last character is a utf-8 character
|
2020-07-08 17:33:13 +02:00 |
|
Nicolas Maillat
|
fd79374a5d
|
Merge branch 'master' into PHRAS-3162_es-document-is-empy-pdf_4.1
|
2020-07-08 17:07:33 +02:00 |
|
aynsix
|
1d243776e2
|
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2504-ginga-subtitle
|
2020-07-08 18:04:47 +03:00 |
|
Harrys Ravalomanana
|
9b0c5634d4
|
PHRAS-3169 video subtitle : add number on saving
|
2020-07-08 18:32:01 +04:00 |
|
Harrys Ravalomanana
|
227159e526
|
Merge branch 'master' into PHRAS-3169_Prod_video_tools_vtt_with_number
|
2020-07-08 17:44:20 +04:00 |
|
Nicolas Maillat
|
1cc45f9794
|
Merge pull request #3564 from alchemy-fr/PHRAS-3164_lightbox-download_link
PHRAS-3164 merge Lightbox : Remove key actions when modal is open
|
2020-07-08 15:42:01 +02:00 |
|
Harrys Ravalomanana
|
c7870dbc4f
|
PHRAS-3164 : add some string on export > email
|
2020-07-08 17:11:49 +04:00 |
|
Harrys Ravalomanana
|
d8a659f6c0
|
Merge branch 'master' into PHRAS-3164_lightbox-download_link
|
2020-07-08 16:10:02 +04:00 |
|
Harrys Ravalomanana
|
4b9ee4f6a5
|
PHRAS-3164 Fix on lightbox
|
2020-07-08 15:17:22 +04:00 |
|
Nicolas Maillat
|
393fae810f
|
Merge branch 'master' into PHRAS-3169_Prod_video_tools_vtt_with_number
|
2020-07-08 13:13:18 +02:00 |
|
Nicolas Maillat
|
81d3410f55
|
Merge pull request #3562 from alchemy-fr/PHRAS-3159-lazaret-storage-file
PHRAS-3159 merge Lazaret (quarantine) storage file path is not taken in account
|
2020-07-08 12:53:06 +02:00 |
|
Nicolas Maillat
|
bb2eff0752
|
Merge branch 'master' into PHRAS-3159-lazaret-storage-file
|
2020-07-08 09:41:00 +02:00 |
|
Nicolas Maillat
|
43c343439e
|
Merge pull request #3558 from alchemy-fr/PHRAS-3164_lightbox-download_link
PHRAS-3164 merge lightbox - download action is NOK
|
2020-07-08 09:40:11 +02:00 |
|
aynsix
|
a6f01624e8
|
fix lazaret storage path
|
2020-07-07 20:19:51 +03:00 |
|
Harrys Ravalomanana
|
9619de3015
|
PHRAS-3164
|
2020-07-07 20:56:50 +04:00 |
|
Harrys Ravalomanana
|
9af8f50fe9
|
PHRAS-3169 : video subtitle with cue number
|
2020-07-07 20:41:48 +04:00 |
|
Harrys Ravalomanana
|
47c6ad80e0
|
PHRAS-3164 export add term of use design
|
2020-07-07 15:46:30 +04:00 |
|
Harrys Ravalomanana
|
6092bf9c0c
|
Merge branch 'PHRAS-3164_lightbox-download_link' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3164_lightbox-download_link
|
2020-07-07 14:53:55 +04:00 |
|
Harrys Ravalomanana
|
16a390fdb2
|
PHRAS-3164 add favicon
|
2020-07-07 14:53:21 +04:00 |
|
Nicolas Maillat
|
229e234796
|
Merge branch 'master' into PHRAS-3164_lightbox-download_link
|
2020-07-07 09:17:34 +02:00 |
|
Nicolas Maillat
|
6f005a9735
|
Merge pull request #3553 from alchemy-fr/PHRAS-3150-Make-optional-for-sync-admin-password
PHRAS-3150 merge Make the synchronization of the password of the Phraseanet root account optional
|
2020-07-06 23:54:25 +02:00 |
|
Nicolas Maillat
|
7860d00230
|
Merge branch 'master' into PHRAS-3164_lightbox-download_link
|
2020-07-06 23:27:43 +02:00 |
|
Nicolas Maillat
|
0a4a2bd3f1
|
Merge branch 'master' into PHRAS-3150-Make-optional-for-sync-admin-password
|
2020-07-06 23:23:22 +02:00 |
|
Nicolas Maillat
|
e7b9544b44
|
Merge pull request #3560 from alchemy-fr/PHRAS-3167_add_fpm_parameters
PHRAS-3167 merge add env for set the php and the nginx gateway timeout
|
2020-07-06 23:21:51 +02:00 |
|
nmaillat
|
25319e6b18
|
fix sed src
|
2020-07-06 21:35:15 +02:00 |
|
nmaillat
|
f3750e987b
|
add nginx.conf
|
2020-07-06 20:42:08 +02:00 |
|
nmaillat
|
e828e98916
|
set timeout default value to 120 sec
|
2020-07-06 20:18:26 +02:00 |
|
nmaillat
|
72d2bc028d
|
set gateway fpm timeout
|
2020-07-06 20:13:27 +02:00 |
|
nmaillat
|
7eb95a97c5
|
set php timeout
|
2020-07-06 19:03:54 +02:00 |
|
jygaulier
|
2186142f9b
|
Merge branch 'master' into PHRAS-3162_es-document-is-empy-pdf_4.1
|
2020-07-06 18:12:38 +02:00 |
|
jygaulier
|
71dd539c76
|
fix : if string cutting at 32766 OCTETS for es/lucene happened in the middle of a utf8 CHAR, string was invalid.
|
2020-07-06 18:06:51 +02:00 |
|
aynsix
|
8f3f3845c0
|
add subdef_source in config
|
2020-07-06 18:23:42 +03:00 |
|