Nicolas Maillat
|
73024bc1d6
|
Merge branch 'master' into PHRAS-3169_Prod_video_tools_vtt_with_number
|
2020-07-08 17:57:34 +02: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 |
|
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 |
|
Nicolas Maillat
|
3449df75c3
|
Merge branch 'master' into PHRAS-3164_lightbox-download_link
|
2020-07-06 17:16:18 +02:00 |
|
Nicolas Maillat
|
3f47636094
|
typo fix
|
2020-07-06 17:15:57 +02:00 |
|
Harrys Ravalomanana
|
b407a854c1
|
PHRAS-3164 #comment add download action on lightbox #time 6h
|
2020-07-06 18:31:46 +04:00 |
|
gjacobjn
|
7e5f020703
|
Fix for PHRASEANET_ADMIN_ACCOUNT_ID not set
Fix condition when PHRASEANET_ADMIN_ACCOUNT_ID is not set in :env
|
2020-07-06 16:21:50 +02:00 |
|
Nicolas Maillat
|
4cf43797b9
|
Update .env
|
2020-07-06 13:25:13 +02:00 |
|
Nicolas Maillat
|
7b4e82a487
|
Update .env
|
2020-07-06 13:24:14 +02:00 |
|
Nicolas Maillat
|
5525b1da79
|
Merge pull request #3557 from alchemy-fr/PHRAS-3160-thesaurus-populate
PHRAS-3160 merge Thesaurus - launch populate db - don't return elasticsearch detail in answer
|
2020-07-03 22:25:30 +02:00 |
|
Nicolas Maillat
|
21c813c940
|
Merge branch 'master' into PHRAS-3160-thesaurus-populate
|
2020-07-03 22:03:19 +02:00 |
|
Nicolas Maillat
|
68e4dfea8b
|
Merge pull request #3555 from alchemy-fr/PHRAS-3163-Prod-publication_fix-error-on-creation
PHRAS-3163 merge Prod - Publication - Create publication - error in console when create
|
2020-07-03 22:03:03 +02:00 |
|
Harrys Ravalomanana
|
a7254dd815
|
PHRAS-3163 Fix on publication creation
|
2020-07-03 19:45:47 +04:00 |
|
Harrys Ravalomanana
|
93575c7a3b
|
PHRAS-3163
|
2020-07-03 19:29:45 +04:00 |
|
Harrys Ravalomanana
|
f29771693a
|
PHRAS-3163 upgrade phraseanet-production-client
|
2020-07-03 19:18:20 +04:00 |
|
Harrys Ravalomanana
|
b1724cfc76
|
Merge branch 'master' into PHRAS-3163-Prod-publication_fix-error-on-creation
|
2020-07-03 19:16:30 +04:00 |
|
Nicolas Maillat
|
087d783957
|
Merge pull request #3554 from alchemy-fr/PHRAS-3157_prod_video_tools
PHRAS-3157 merge Prod - Video Tools - Thumbnail tab - some fix
|
2020-07-03 16:53:33 +02:00 |
|
aynsix
|
dad3bc4577
|
fix /thesaurus/populate return
|
2020-07-03 17:23:15 +03:00 |
|
Harrys Ravalomanana
|
21deba424f
|
PHRAS-3163 rebase branch
|
2020-07-03 17:31:57 +04:00 |
|
Harrys Ravalomanana
|
d4bf89e8fe
|
PHRAS-3157 upgrade phraseanet-production-client
|
2020-07-03 17:13:45 +04:00 |
|
Harrys Ravalomanana
|
dfb0436bed
|
PHRAS-3163 Publications fix #time 2h
|
2020-07-03 15:15:37 +04:00 |
|
Harrys Ravalomanana
|
e6bdcad4ba
|
PHRAS-3157 : video tools : change loader gif
|
2020-07-03 10:51:38 +04:00 |
|