Nicolas Maillat
5a500b2f02
Merge pull request #3273 from alchemy-fr/PHRAS-2814_missing-es-options-for-tests
...
PHRAS-2814 #comment Merge missing Elasticsearch options for tests, this is fix failing test caused by PHRAS-2814 : Elasticsearch informations on setup command line merge in PR #3222
2019-12-16 18:05:45 +01:00
Jean-Yves Gaulier
c119627e84
PHRAS-2814_missing-es-options-for-tests
...
add options to a testfile that changes conf.
todo : fix the test to backup/restore file after test
2019-12-16 17:40:15 +01:00
Jean-Yves Gaulier
2969fa7e9c
PHRAS-2814_missing-es-options-for-tests
...
to complete https://github.com/alchemy-fr/Phraseanet/pull/3222/commits : add options to bootstrap for tests
2019-12-16 16:13:08 +01:00
Nicolas Maillat
54f46e0dbc
Merge pull request #2734 from aynsix/PHRAS-2196-api-stories-pagination
...
PHRAS-2196 #comment merge of search and Stories in V3
2019-12-13 14:16:02 +01:00
aynsix
afc5a85edf
change param name
2019-12-13 15:28:02 +04:00
Nicolas Maillat
1e5aff5abb
Merge branch 'master' into PHRAS-2196-api-stories-pagination
2019-12-13 09:24:28 +01:00
Nicolas Maillat
9508178e48
Merge pull request #3265 from alchemy-fr/PHRAS-2821-video-portrait-nok
...
PHRAS-2821 #comment video portrait nok 4.1
2019-12-12 21:25:27 +01:00
Nicolas Maillat
de3b3c4810
Merge branch 'master' into PHRAS-2821-video-portrait-nok
2019-12-12 16:27:58 +01:00
Nicolas Maillat
a19e3d5566
Merge pull request #3264 from alchemy-fr/PHRAS-2848_Lightbox_mobile_design_refacto
...
PHRAS-2848 #comment merge Lightbox mobile-Light design refacto 4.1 - Fix audio display
2019-12-12 16:27:23 +01:00
aynsix
e435f81c00
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2821-video-portrait-nok
2019-12-12 16:49:42 +04:00
aynsix
2b5902a1b6
php-unoconv 0.3.1 and media-alchemyst 0.5.5
2019-12-12 16:47:44 +04:00
Nicolas Maillat
6afc40ef3b
Merge branch 'master' into PHRAS-2196-api-stories-pagination
2019-12-12 12:56:48 +01:00
Nicolas Maillat
0a4b2b32b7
Merge branch 'master' into PHRAS-2848_Lightbox_mobile_design_refacto
2019-12-12 12:55:30 +01:00
Nicolas Maillat
008244a98a
Merge pull request #3260 from alchemy-fr/PHRAS-2840-exclure-collection-quarantaine
...
PHRAS-2840 #comment merge Exclude collection from quarantine checker
2019-12-12 12:55:16 +01:00
Harrys Ravalomanana
e037e15e95
PHRAS-2848 Fix video display
2019-12-12 15:14:19 +04:00
Nicolas Maillat
a43d073c8a
Merge branch 'master' into PHRAS-2840-exclure-collection-quarantaine
2019-12-12 12:10:35 +01:00
Harrys Ravalomanana
86752ad714
PHRAS-2848 Fix lightbox mobile
2019-12-12 15:04:58 +04:00
aynsix
48f78698cc
resolve conflict
2019-12-12 14:33:37 +04:00
Nicolas Maillat
36bbfb424e
Merge pull request #3263 from alchemy-fr/PHRAS-2856-record-order-in-story
...
PHRAS-2856 #comment merge fix record order in story 4.1
2019-12-12 11:02:57 +01:00
aynsix
5a703f207a
fix record order in story
2019-12-12 12:13:56 +04:00
Nicolas Maillat
18df34cd80
Merge pull request #3262 from alchemy-fr/PHRAS-2856_fix_prod_Basket_and_Story_Set_records_order
...
PHRAS-2856 #comment merge bump phraseanet-production-client Fix prod Basket and story : Set records order
2019-12-11 16:44:00 +01:00
Harrys Ravalomanana
7131080788
PHRAS-2856 #comment Fix prod Basket and story : Set records order
2019-12-11 18:26:44 +04:00
aynsix
8eb6ae5dfa
change variable name
2019-12-11 18:18:30 +04:00
aynsix
9ac196784a
change sql params form
2019-12-11 12:41:43 +04:00
aynsix
1c0b1db9c7
exlu collection in quarantaine when upload
2019-12-11 11:48:23 +04:00
Nicolas Maillat
0fa7b64fb7
Merge branch 'master' into PHRAS-2196-api-stories-pagination
2019-12-06 14:56:43 +01:00
Nicolas Maillat
867d5d40b1
Merge pull request #3252 from HRavalomanana/PHRAS-2848_Lightbox_mobile_design_refacto
...
PHRAS-2848 #comment merge Lightbox mobile design refacto 4.1
2019-12-06 14:55:35 +01:00
Harrys Ravalomanana
7d33c60184
Merge branch 'master' into PHRAS-2848_Lightbox_mobile_design_refacto
2019-12-06 17:09:34 +04:00
Harrys Ravalomanana
b76e503c0c
PHRAS-2848
2019-12-06 17:08:41 +04:00
Harrys Ravalomanana
775e4bd05a
PHRAS-2848 #comment fix error on firefox
2019-12-06 17:03:23 +04:00
aynsix
a340e026bb
Merge branch 'PHRAS-2196-api-stories-pagination' of https://github.com/aynsix/Phraseanet into PHRAS-2196-api-stories-pagination
2019-12-06 14:25:15 +04:00
aynsix
f475a5c925
fix api/v3 api_version
2019-12-06 14:24:03 +04:00
aynsix
2fd5b6cba2
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2196-api-stories-pagination
2019-12-06 14:22:32 +04:00
Harrys Ravalomanana
5309794f33
PHRAS-2848 remove basket description
2019-12-06 12:16:47 +04:00
Nicolas Maillat
a59c163bf2
Merge branch 'master' into PHRAS-2196-api-stories-pagination
2019-12-05 20:26:12 +01:00
Nicolas Maillat
700d01226c
Merge pull request #3250 from alchemy-fr/PHRAS-1324-add-libfaac
...
PHRAS-1324 #comment merge add libfdk_aac and change presets name
2019-12-05 20:24:46 +01:00
Nicolas Maillat
2f05804c52
Merge branch 'master' into PHRAS-1324-add-libfaac
2019-12-05 18:44:05 +01:00
Nicolas Maillat
d61c4ceafb
Merge pull request #3256 from HRavalomanana/PHRAS-2850_Fix_icomoon_error
...
PHRAS-2850 #comment merge of 404 on icomoon.ttf when "Prod" loading.
2019-12-05 18:43:43 +01:00
Nicolas Maillat
1371c607a6
Merge branch 'master' into PHRAS-2850_Fix_icomoon_error
2019-12-05 17:56:10 +01:00
Nicolas Maillat
80392c6742
Merge pull request #3258 from jygaulier/PHRAS-2631_feedback-icon
...
PHRAS-2631 #comment merge _basket-feedback-icon
2019-12-05 17:52:05 +01:00
Jean-Yves Gaulier
0967f3c810
PHRAS-2631_feedback-icon
...
fix : 2 new icons for feedback baskets; no more display of 2 icons.
fix : tooltip on "about" icon of feedback baskets
2019-12-05 14:52:46 +01:00
aynsix
d95014831e
update presets webm
2019-12-05 15:23:59 +04:00
aynsix
960c40233c
add presets and libmp3lame to default
2019-12-05 14:55:56 +04:00
aynsix
276d5a8ce6
remove unused comment
2019-12-05 14:42:15 +04:00
aynsix
3d6d2e4e64
fix V1Controller
2019-12-05 14:30:17 +04:00
Harrys Ravalomanana
1313d8ff82
PHRAS-2850 #comment fix error icomoon #time 2h
2019-12-05 14:13:23 +04:00
Harrys Ravalomanana
4fd9f49ec2
PHRAS-2848 #comment some
2019-12-05 13:25:19 +04:00
aynsix
e4b29d70c5
route search and storie on api/v3
2019-12-05 12:30:23 +04:00
aynsix
5929690333
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2196-api-stories-pagination
2019-12-05 10:05:54 +04:00
Nicolas Maillat
17610e22ab
Merge branch 'master' into PHRAS-1324-add-libfaac
2019-12-04 16:53:52 +01:00
