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
12,995 Commits 268 Branches 107 Tags
713e41fac76bf480985b95275da3621675e27f2d
Commit Graph

12995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
72da67f961 Merge pull request #3062 from HRavalomanana/PHRAS-2376_Prod_Toolbar_Change_icon 
PHRAS-2376 #comment Prod toolbar change icon update yarn.lock
 2019-06-04 14:32:54 +02:00
Harrys Ravalomanana
b6297d3e22 PHRAS-2616 #comment Port41 of PHRAS-2351 #time 0.25h 2019-06-04 16:30:38 +04:00
Harrys Ravalomanana
ed8164b23d PHRAS-2386 #comment Port-41 of PHRAS-2278 #time 1.5h 2019-06-04 16:11:21 +04:00
Harrys Ravalomanana
ee221c7296 PHRAS-2386 #comment Port41 of PHRAS-2344 #time 2h 2019-06-04 15:47:34 +04:00
Harrys Ravalomanana
82c19b9e2f PHRAS-2386 #comment Refacto picto comment #time 1h 2019-06-04 14:53:15 +04:00
Jean-Yves Gaulier
3b120fb020 PHRAS-2573_last-query-as-default_4.1 
- set default default user settings to "replay last_query on login"
- set a default (empty) query for first login
 2019-06-04 12:07:32 +02:00
Harrys Ravalomanana
48bd30ab9a PHRAS-2376 #comment update yarn.lock 2019-06-04 13:09:45 +04:00
Nicolas Maillat
35b77fd6a0 Merge pull request #3060 from jygaulier/PHRAS-2614_This-query-not-fired_4.1 
PHRAS-2614_This-query-not-fired_4.1
 2019-06-04 10:50:45 +02:00
Nicolas Maillat
4021e8d4b4 Merge branch 'master' into PHRAS-2614_This-query-not-fired_4.1 2019-06-04 10:41:23 +02:00
Nicolas Maillat
ce6a800852 Merge pull request #3058 from HRavalomanana/PHRAS-2376_Prod_Toolbar_Change_ico 
PHRAS-2376 Prod toolbar change icons
 2019-06-04 10:41:06 +02:00
Nicolas Maillat
9d75c28d2c Merge branch 'master' into PHRAS-2376_Prod_Toolbar_Change_ico 2019-06-04 10:32:09 +02:00
Nicolas Maillat
d1b48d905b Merge pull request #3061 from HRavalomanana/PHRAS-2579_Video_player_Chapter_presentation_list_Mode 
PHRAS-2579 #comment merge  update embed-bundle version on composer.json, embed-bundle  a features for display video chapters in dropdown using videojs plugin video-chapters-thumbnails
 2019-06-04 09:15:08 +02:00
Harrys Ravalomanana
6fcf1649d4 PHRAS-2579 #comment update embed-bundle version on composer.json #time 0.5h 2019-06-04 10:11:46 +04:00
Jean-Yves Gaulier
4550257d59 PHRAS-2614_This-query-not-fired_4.1 
fix : "user settings / configuration / display on startup" = "the query:___" (always run the same query after login) : The query is now fired after login
nb : silly trick to change ft-query to json in twig, so no need to change lib.
 2019-06-03 18:51:52 +02:00
Nicolas Maillat
86460906b0 Merge branch 'master' into PHRAS-2376_Prod_Toolbar_Change_ico 2019-06-03 17:06:50 +02:00
Nicolas Maillat
8bcfe7af9a Merge pull request #3059 from HRavalomanana/PHRAS-2608_Prod_Fix_responsive_custom_link 
PHRAS-2608 #comment remove empty link when user is not connected
 2019-06-03 16:21:47 +02:00
Nicolas Maillat
2ca1afe0ed Merge branch 'master' into PHRAS-2608_Prod_Fix_responsive_custom_link 2019-06-03 13:15:41 +02:00
Nicolas Maillat
cbd974b261 Merge pull request #3034 from jygaulier/PHRAS-2581_twig-macro-explode_4.1 
PHRAS-2581 #comment twig-macro-explode 4.1 in 3 files
 2019-06-03 12:06:57 +02:00
Nicolas Maillat
aa584c97e8 Merge branch 'master' into PHRAS-2581_twig-macro-explode_4.1 2019-06-03 11:54:54 +02:00
Harrys Ravalomanana
45a649245f PHRAS-2608 #comment remove custom link when user is not connected #time 1h 2019-06-03 13:33:59 +04:00
Harrys Ravalomanana
8daaa1ffdb PHRAS-2376 #comment toolbar icons changed #time 2h 2019-06-03 11:38:40 +04:00
Nicolas Maillat
2c4ad4565c Merge pull request #3057 from AlexandreBrach/PHRDPL-32_env-vars 
PHRDPL-32 #comment fpm/nginx configuration variabilisable
 2019-05-31 19:56:00 +02:00
Alexandre BRACH
0c9fef9a4f PHRDPL-32 #comment fpm/nginx configuration variabilisable 2019-05-31 19:15:26 +02:00
Nicolas Maillat
b70c0ea8ce Merge pull request #3056 from AlexandreBrach/PHRDPL-34_widgets 
PHRDPL-34 #comment fix PHP version (from 7.1 to 7.0)
 2019-05-31 15:35:44 +02:00
Nicolas Maillat
4d4181cf67 Merge branch 'master' into PHRDPL-34_widgets 2019-05-31 15:20:03 +02:00
Nicolas Maillat
cdf772fddc Merge pull request #3055 from HRavalomanana/PHRAS-2574_new_search_dont_reset_facets 
PHRAS-2574 #comment merge update phraseanet-production-client version to 0.34.15-d 
New search don't reset facets, use cross for remove it
PHRAS-2613 #comment Don't auto start video when openning video tool
 2019-05-31 15:19:43 +02:00
Alexandre BRACH
e9aad5f579 PHRDPL-34 #comment fix PHP version (from 7.1 to 7.0) 2019-05-31 14:51:43 +02:00
Harrys Ravalomanana
674fe1d817 PHRAS-2574 #comment update phraseanet-production-client version to 0.34.15-d #time 0.5 2019-05-31 16:43:29 +04:00
Nicolas Maillat
854e25deae Merge pull request #3054 from HRavalomanana/PHRAS-2608_Prod_Fix_responsive_custom_link 
PHRAS-2608 #comment  Fix custom-link of nav-bar on responsive
 2019-05-31 14:24:19 +02:00
Harrys Ravalomanana
0e4e5782aa PHRAS-2608 #time 2h 2019-05-31 10:21:00 +04:00
Harrys Ravalomanana
d757cf439a PHRAS-2608 Prod_Fix_responsive_custom_link #time 1h 2019-05-29 10:45:30 +04:00
Harrys Ravalomanana
6566e15f62 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2608_Prod_Fix_responsive_custom_link 2019-05-29 10:35:37 +04:00
jygaulier
a372f09664 Merge pull request #3047 from jygaulier/PHRAS-2605_fix-unittest-bootstrap_4.1 
PHRAS-2605_fix-unittest-bootstrap_4.1
 2019-05-28 15:32:57 +02:00
Jean-Yves Gaulier
1653c2494c PHRAS-2605_fix-unittest-bootstrap_4.1 
remove debug
 2019-05-28 15:16:28 +02:00
Jean-Yves Gaulier
0cbc5a8ef4 PHRAS-2605_fix-unittest-bootstrap_4.1 
remove debug
 2019-05-28 15:06:06 +02:00
Jean-Yves Gaulier
dca1387a17 PHRAS-2605_fix-unittest-bootstrap_4.1 
fix conf
 2019-05-28 14:59:34 +02:00
Jean-Yves Gaulier
c68ad4fd8f PHRAS-2605_fix-unittest-bootstrap_4.1 
fix default lng
add missing cmd
 2019-05-28 14:49:49 +02:00
Harrys Ravalomanana
1eda490e65 PHRAS-2608 #comment Fix custom-link of nav-bar on responsive, hide the Navigation bar if there is no sub menu #time 2h 2019-05-28 15:30:10 +04:00
Nicolas Maillat
3df03d8abf Merge pull request #3053 from alchemy-fr/PHRAS-2597_add_latest_properties_to_default_configuration 
PHRAS-2597  #comment merge of Add latest properties to default configuration
 2019-05-24 21:47:10 +02:00
Nicolas Maillat
9bfc7d3bcc Merge branch 'master' into PHRAS-2597_add_latest_properties_to_default_configuration 2019-05-24 19:39:17 +02:00
nmaillat
7a1ba7e567 PHRAS-2597 #comment geoloc fields fix and language #time 2h debug geolocfield and test 2019-05-24 19:03:08 +02:00
Nicolas Maillat
1f23de8f12 update readme 2019-05-24 17:18:11 +02:00
Nicolas Maillat
ac405771bb Merge pull request #3044 from aynsix/PHRAS-1686-test-commit-proxies 
PHRAS-1686 : use test ,commit proxies
 2019-05-24 14:30:49 +02:00
Nicolas Maillat
680b92c11e Merge branch 'master' into PHRAS-1686-test-commit-proxies 2019-05-24 13:54:36 +02:00
Nicolas Maillat
30b8451092 Merge pull request #3052 from HRavalomanana/PHRAS-2419_refacto_Icons_actions_under_Thumbnail 
PHRAS-2419 #comment set phraseanet-production-client to 0.34.12-d for refacto icons actions under thumbnail
 2019-05-24 13:52:07 +02:00
Harrys Ravalomanana
f9a82d6b41 PHRAS-2419 #comment update phraseanet-production-version to 0.354.12-d #time 15m 2019-05-24 15:37:39 +04:00
Harrys Ravalomanana
eef9bb21e3 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2419_refacto_Icons_actions_under_Thumbnail 2019-05-24 15:21:32 +04:00
Nicolas Maillat
1bc1233bec Merge branch 'master' into PHRAS-1686-test-commit-proxies 2019-05-24 13:20:26 +02:00
Nicolas Maillat
6b887fcd97 Merge pull request #3050 from HRavalomanana/PHRAS-2592-embed_bundle_fix_audio_player 
PHRAS-2592 #comment composer.json : upgrade embed-bundle version for fix videojs player when read audio file
 2019-05-24 09:36:51 +02:00
Harrys Ravalomanana
a38a702ff4 PHRAS-2592 #comment update composer.json for embed-bundle #time 1h 2019-05-24 11:18:55 +04:00