hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,930 Commits 268 Branches 107 Tags
6fcf1649d4c404de4df98d6eea75152e0d3f6649
Commit Graph

12930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Harrys Ravalomanana
6fcf1649d4 PHRAS-2579 #comment update embed-bundle version on composer.json #time 0.5h 2019-06-04 10:11:46 +04: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
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
Nicolas Maillat
8115d015e7 Merge pull request #3049 from alchemy-fr/PHRAS-2598_field_type_in_model 
PHRAS-2598 #comment Merge pull request #3049 from alchemy-fr/PHRAS-2598_field_type_in_model
 2019-05-23 22:58:18 +02:00
nmaillat
b4634a8bf7 PHRAS-2598 #comment add type string to fields, change to number lat and long for iptc's model #time 1h 2019-05-23 22:07:56 +02:00
jygaulier
2f36448d21 Merge pull request #2917 from HRavalomanana/PHRAS-2419_refacto_Icons_actions_under_Thumbnail 
PHRAS-2419 refacto_Icons_actions_under_Thumbnail
 2019-05-23 18:01:08 +02:00
jygaulier
9783bbb23d Merge branch 'master' into PHRAS-2419_refacto_Icons_actions_under_Thumbnail 2019-05-23 17:51:01 +02:00
Nicolas Maillat
2d97ec8ef0 Merge pull request #3046 from alchemy-fr/PHRAS-2561_clean_yarn 
PHRAS-2561 #comment clean yarn install
 2019-05-23 16:30:47 +02:00
Nicolas Maillat
4f359035ef PHRAS-2561 #comment rm yarn link before 2019-05-23 16:19:41 +02:00
Nicolas Maillat
256637024d Update config.yml 2019-05-23 16:03:08 +02:00
Nicolas Maillat
83cfeb95d8 Merge pull request #3045 from AlexandreBrach/PHRAS-2600-fpm-user 
PHRAS-2600 #comment merge fpm service doesn't use root account anymore
 2019-05-23 15:15:16 +02:00
nmaillat
11254a1b2c PHRAS-2595 #comment rename enable_pdfjs 2019-05-23 15:10:20 +02:00
nmaillat
04dce19fe3 PHRAS-2595 #comment geoloc remove old name property add map-provider 2019-05-23 14:07:50 +02:00
Alexandre BRACH
bf6da6f438 fpm service doesn't use root account anymore 2019-05-23 12:16:24 +02:00
nmaillat
4812d28333 PHRAS-2595 #comment set geoloc config: Assets position source is now provide by Phraseanet technical data 2019-05-22 23:51:42 +02:00
nmaillat
bc181dcfea PHRAS-2597 #comment removing bridge section and update section geoloc, embed-bundle , search engine, RGPD #time 3h 2019-05-22 17:07:56 +02:00
aina-esokia
3c4046b432 commit doctrine proxies files 2019-05-21 18:07:41 +04:00
Nicolas Maillat
454613111c Merge pull request #3043 from alchemy-fr/PHRAS-2534_dublincore_template_update 
PHRAS-2534 #comment Dublincore Databox template update.
 2019-05-21 16:05:49 +02:00