hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,462 Commits 268 Branches 107 Tags
69c608a25c97e61681bdaa69905ba9c2bbddccf3
Commit Graph

13462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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