Nicolas Maillat
068c8422df
Merge pull request #3285 from alchemy-fr/PHRAS-2863-lightbox-mobile-PDF-Reading
...
PHRAS-2863 #comment merge Lightbox mobile: Load PDF reader (videojs)
2020-01-08 14:01:46 +01:00
Nicolas Maillat
5951568da6
Merge branch 'master' into PHRAS-2868_PRod-video_tools_define_thumbnails_video
2020-01-08 13:38:01 +01:00
Harrys Ravalomanana
c62b43f4a5
Merge branch 'master' into PHRAS-2863-lightbox-mobile-PDF-Reading
2020-01-08 16:29:47 +04:00
Harrys Ravalomanana
d57901e0b0
PHRAS-2868
2020-01-07 19:02:33 +04:00
Nicolas Maillat
e98017d9fd
Translated using Weblate (French)
...
Currently translated at 99.0% (2384 of 2408 strings)
2020-01-07 13:13:22 +00:00
Harrys Ravalomanana
c7acefdb6e
Merge branch 'master' into PHRAS-2868_PRod-video_tools_define_thumbnails_video
2020-01-07 16:56:36 +04:00
Nicolas Maillat
b61f55e976
Merge branch 'master' into PHRAS-2861_Prod_Basket_menu_preference
2020-01-07 12:16:55 +01:00
Nicolas Maillat
992a2bc3ad
Merge branch 'master' into PHRAS-2863-lightbox-mobile-PDF-Reading
2020-01-07 12:15:44 +01:00
Nicolas Maillat
eea77e3274
Translated using Weblate (French)
...
Currently translated at 95.5% (2300 of 2408 strings)
2020-01-07 11:13:53 +00:00
Harrys Ravalomanana
9089993d6a
Merge branch 'PHRAS-2863-lightbox-mobile-PDF-Reading' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2863-lightbox-mobile-PDF-Reading
2020-01-07 11:06:52 +04:00
Harrys Ravalomanana
93a9bb83e0
PHRAS-2863
2020-01-07 11:04:24 +04:00
Harrys Ravalomanana
2fd36d0e6a
Merge branch 'master' into PHRAS-2863-lightbox-mobile-PDF-Reading
2020-01-07 11:02:52 +04:00
Harrys Ravalomanana
4d768889f2
PHRAS-2863 #comment Lightbox mobile: resize pdf iframe #time 3h
2020-01-07 10:55:11 +04:00
Jennifer
5f3d8d8038
Translated using Weblate (French)
...
Currently translated at 95.5% (2300 of 2408 strings)
2020-01-06 20:05:19 +00:00
Nicolas Maillat
fb9fb9648f
Translated using Weblate (French)
...
Currently translated at 95.5% (2300 of 2408 strings)
2020-01-06 17:03:47 +00:00
Jennifer
aee3657ad2
Translated using Weblate (English)
...
Currently translated at 97.4% (2346 of 2408 strings)
2020-01-06 16:52:58 +00:00
Nicolas Maillat
0699f37ae1
Translated using Weblate (French)
...
Currently translated at 95.5% (2300 of 2408 strings)
2020-01-06 16:51:54 +00:00
Jennifer
84ed1824de
Translated using Weblate (French)
...
Currently translated at 95.5% (2300 of 2408 strings)
2020-01-06 15:42:17 +00:00
Nicolas Maillat
30bb0a9cfb
Merge branch 'master' into PHRAS-2861_Prod_Basket_menu_preference
2020-01-06 14:02:13 +01:00
Nicolas Maillat
98c40b754d
Merge branch 'master' into PHRAS-2863-lightbox-mobile-PDF-Reading
2020-01-06 13:55:05 +01:00
Nicolas Maillat
69c608a25c
Translated using Weblate (French)
...
Currently translated at 95.4% (2299 of 2408 strings)
2020-01-03 18:17:11 +00:00
Nicolas Maillat
897ba9e7c9
Translated using Weblate (French)
...
Currently translated at 95.6% (2293 of 2398 strings)
2020-01-03 15:53:06 +00:00
Harrys Ravalomanana
cba9b9b5ac
PHRAS-2863
2019-12-27 15:11:40 +04:00
Harrys Ravalomanana
9e1fa5413a
PHRAS-2863 #comment fix lightbox mobile pdf reading on thumbnail #time 2h
2019-12-27 15:09:03 +04:00
Harrys Ravalomanana
18568a6cd6
PHRAS-2861
2019-12-26 15:03:03 +04:00
Harrys Ravalomanana
be20062b6d
PRHAS-2861 #comment Port 41 Prod Basket show caption #time 4h
2019-12-26 15:01:02 +04:00
Harrys Ravalomanana
6272aa37b1
PHRAS-2868 #comment Fix Video editor canvas for vertical video #time 8h
2019-12-23 16:55:11 +04:00
Harrys Ravalomanana
3d9f9136d7
PHRAS-2870 #comment Fix Prod workzone video max-width #time 3h
2019-12-19 18:12:58 +04:00
jygaulier
6ac8d5b904
Merge pull request #3280 from alchemy-fr/PHRAS-2859_tests-do-corrupt-conf-bis_4.1
...
PHRAS-2859_tests-do-corrupt-conf-bis_4.1
2019-12-18 18:51:19 +01:00
jygaulier
e8a5c6d136
Merge branch 'master' into PHRAS-2859_tests-do-corrupt-conf-bis_4.1
2019-12-18 18:18:13 +01:00
Jean-Yves Gaulier
718a031a73
PHRAS-2859_tests-do-corrupt-conf_4.1
...
fix test to allow to run tests locally when servername has no scheme
2019-12-18 18:17:38 +01:00
Jean-Yves Gaulier
d6c8eaa659
PHRAS-2859_tests-do-corrupt-conf-bis_4.1
...
fix new tests
2019-12-18 16:51:17 +01:00
Nicolas Maillat
162c57e051
Merge pull request #3278 from alchemy-fr/PHRAS-2869_update_composer_checksum
...
PHRAS-2869 #comment hotfix, update composer checksum until we use a programmatically method.
2019-12-18 16:15:34 +01:00
Nicolas Maillat
36b1904719
PHRAS-2869 update composer checksum
2019-12-18 15:05:16 +01:00
Nicolas Maillat
9fc9ed8a34
Merge pull request #3274 from alchemy-fr/PHRAS-2861_Prod_Basket_menu_preference
...
PHRAS-2861 #comment merge only a design fix for Prod-Basket zone Drop down menu-Preference
2019-12-18 14:01:30 +01:00
Nicolas Maillat
264f8c1be4
Merge branch 'master' into PHRAS-2861_Prod_Basket_menu_preference
2019-12-17 15:49:41 +01:00
Nicolas Maillat
f883748f40
Merge pull request #3275 from alchemy-fr/PHRAS-2706_Prod_Basket_browser
...
PHRAS-2706 #comment merge Prod - Basket browser windows - Received basket filter basket
2019-12-17 12:03:08 +01:00
Nicolas Maillat
64a22e8255
Merge branch 'master' into PHRAS-2706_Prod_Basket_browser
2019-12-17 11:40:10 +01:00
Nicolas Maillat
7bcdb97983
Merge branch 'master' into PHRAS-2861_Prod_Basket_menu_preference
2019-12-17 11:39:53 +01:00
Nicolas Maillat
d0768571e1
Merge pull request #3267 from jygaulier/PHRAS-2859_tests-do-corrupt-conf_4.1
...
PHRAS-2859 #comment merge
2019-12-17 11:39:15 +01:00
Jean-Yves Gaulier
f57e85ec2a
PHRAS-2859_tests-do-corrupt-conf_4.1
...
fix tests
2019-12-17 11:17:01 +01:00
Harrys Ravalomanana
ad47f4b18c
PHRAS-2706 #comment Prod Fix Basket browser #time 2h
2019-12-17 12:07:04 +04:00
Harrys Ravalomanana
e670b34949
PHRAS-2861 #comment Fix Prod Basket menu preference #time 1h
2019-12-17 11:10:14 +04:00
Jean-Yves Gaulier
24e56696e7
PHRAS-2859_tests-do-corrupt-conf_4.1
...
fix test that overrides conf during install.
2019-12-16 18:16:51 +01:00
Jean-Yves Gaulier
915e7bcd32
PHRAS-2859_tests-do-corrupt-conf_4.1
...
fix : configuration.yml is not modified by unit-tests anymore
2019-12-16 18:16:51 +01:00
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
