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,195 Commits 268 Branches 107 Tags
232c255e3e760f0a59680552f4183d0e6feeb542
Commit Graph

13195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
c4ea7e3160 Merge branch 'master' into PHRAS-2665_PRod_video_tools_use_preview_ratio_instead_of_document_ratio 2019-07-15 16:10:49 +02:00
Nicolas Maillat
5e2f8da2bb Merge pull request #3097 from HRavalomanana/PHRAS-2621-Define_cover_subdef_for_audio_type 
PRHAS-2621  #comment merge update embed-bundle and configuration.yml
 2019-07-15 15:40:41 +02:00
Harrys Ravalomanana
d02f8f5a01 PHRAS-2665 #comment Fix video tool ratio #time 8h 2019-07-12 18:06:01 +04:00
Harrys Ravalomanana
e38dd3c645 PRHAS-2621 #comment update embed-bundle and configuration.yml 2019-07-11 17:49:59 +04:00
Nicolas Maillat
1868d4368f Merge pull request #3096 from aynsix/PHRAS-2660-api-stories-enhancement 
PHRAS-2660 #comment merge api stories routes enhancement
 2019-07-11 12:34:07 +02:00
aina-esokia
cd3995382c take account all record type for story cover 2019-07-11 11:31:41 +04:00
aina-esokia
fe48e8a305 api stories add cover source 2019-07-10 14:26:34 +04:00
Nicolas Maillat
e1af9a1989 Merge pull request #3095 from HRavalomanana/PHRAS-2656-Prod-Editing-fix-tab-key-accessibility 
PHRAS-2656 #comment merge update Phraseanet production client version in package.json and yarn.lock
 2019-07-10 09:35:54 +02:00
Harrys Ravalomanana
29cac8af1f PHRAS-2656 update package.json for the fix 2019-07-09 16:04:04 +04:00
Nicolas Maillat
0218816bf6 Merge pull request #3094 from HRavalomanana/PHRAS-2544-upgrade-phraseanet-production-client 
PHRAS-2544 #comment upgrade phraseanet-production-client to 0.34.52-d
 2019-07-05 16:11:33 +02:00
Nicolas Maillat
c47348c3b2 Merge branch 'master' into PHRAS-2544-upgrade-phraseanet-production-client 2019-07-05 15:42:27 +02:00
Nicolas Maillat
8949f53254 Merge pull request #3090 from HRavalomanana/PHRAS-2544_Prod-grey_and_white_skins_colors 
PHRAS-2544 #comment merge  update fix on grey and white theme
 2019-07-05 15:41:54 +02:00
Harrys Ravalomanana
dbf653badf PHRAS-2455 #comment upgrade phraseanet-production-client to 0.34.52-d 2019-07-05 17:18:12 +04:00
Nicolas Maillat
6147cd62f8 Merge branch 'master' into PHRAS-2544_Prod-grey_and_white_skins_colors 2019-07-05 15:15:14 +02:00
jygaulier
4a55ad2dd4 Merge pull request #3093 from aynsix/PHRAS-2654-field-no-source 
PHRAS-2654 : Port to 4.1 Fields "Phraseanet::no-source" are pushed to exiftool
 2019-07-05 11:03:10 +02:00
aina-esokia
a11e230ded port fix field no-source not pushed to writer 2019-07-05 12:16:12 +04:00
Harrys Ravalomanana
273bfa563d Merge of master branch 2019-07-03 15:37:42 +04:00
Harrys Ravalomanana
4902620347 PHRAS-2544 #comment save skin preference #time 1h 2019-07-03 15:33:23 +04:00
Harrys Ravalomanana
86ef7618da Merge branch 'master' into PHRAS-2544_Prod-grey_and_white_skins_colors 2019-07-03 13:55:47 +04:00
Harrys Ravalomanana
4bfa1b109f PHRAS-2544 #comment port41 of 2537 #time 4h 2019-07-03 13:52:37 +04:00
Nicolas Maillat
f8f2221910 Merge pull request #3091 from aynsix/PHRAS-2507_Enhance_addplugin_downloadplugin 
PHRAS-2507 #comment enhance addplugin downloadplugin
 2019-07-02 15:34:57 +02:00
aina-esokia
ba302125f8 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2507_Enhance_addplugin_downloadplugin 2019-07-02 15:35:51 +04:00
aina-esokia
11c9b2ba99 update AddPlugin 2019-07-02 15:34:42 +04:00
aina-esokia
1b4110c085 add composer.lock 2019-07-02 14:23:12 +04:00
Nicolas Maillat
e1210cc398 Merge pull request #3089 from aynsix/PHRAS-2405-substitue-update-record-table 
PHRAS-2405  #comment merge  update record type and mimetype when sustitute a document
 2019-07-02 12:18:04 +02:00
aina-esokia
61a92d9cb0 fix conflict 2019-07-02 12:19:45 +04:00
Harrys Ravalomanana
fc022f817b PHRAS-2544 fix statistic popup 2019-07-01 18:32:12 +04:00
aina-esokia
0263f7b5a5 update record type and mimetype on sustitute 2019-07-01 18:15:08 +04:00
Harrys Ravalomanana
63a89521b6 PHRAS-2544 #comment update fix on grey and white theme #time 8h 2019-07-01 17:41:01 +04:00
Nicolas Maillat
22e3605153 Merge pull request #3088 from HRavalomanana/PHRAS-1310_Login_page_Fix_select_language 
PHRAS-1310 # merge  Fix select language on login page this is also for issue PHRAS-2556 and related to cokies PHRAS-1838
 2019-07-01 09:42:12 +02:00
Nicolas Maillat
7fd5f9184b Merge branch 'master' into PHRAS-1310_Login_page_Fix_select_language 2019-06-27 16:36:32 +02:00
Nicolas Maillat
d8e67520f6 Merge pull request #3087 from HRavalomanana/PHRAS-2544_Prod-grey_and_white_skins_colors 
PHRAS-2544 #comment merge upgrade phraseanet-production-client@0.34.41-d
 2019-06-27 16:36:13 +02:00
Harrys Ravalomanana
ede2cda427 PHRAS-1310 #comment Fix select language on login page #time 2h 2019-06-27 16:18:54 +04:00
Harrys Ravalomanana
529dbf9783 PHRAS-2544 #comment upgrade phraseanet-production-client@0.34.41-d 2019-06-27 14:13:13 +04:00
Nicolas Maillat
93c09d2461 Merge pull request #3086 from HRavalomanana/PHRAS-2544_Prod-grey_and_white_skins_colors 
PRHAS-2544  Prod- Grey and White Skins -Colors corrections
 2019-06-27 10:57:08 +02:00
Nicolas Maillat
ec057989d2 Merge branch 'master' into PHRAS-2544_Prod-grey_and_white_skins_colors 2019-06-27 10:41:04 +02:00
Nicolas Maillat
c51f029ca5 Merge pull request #3085 from HRavalomanana/PHRAS-2620-Prod-facet-change-icon 
PHRAS-2620 #comment merge add new icomoon font and change icon on facet masking
 2019-06-27 10:40:48 +02:00
Harrys Ravalomanana
8837363126 PHRAS-2620 Add new font #time 2h 2019-06-25 17:46:33 +04:00
Harrys Ravalomanana
e33cd0d142 Merge branch 'master' into PHRAS-2544_Prod-grey_and_white_skins_colors 2019-06-25 17:05:13 +04:00
Harrys Ravalomanana
3e2795776d PHRAS-2544 2019-06-25 16:53:48 +04:00
Nicolas Maillat
47d71d6f2c Merge branch 'master' into PHRAS-2620-Prod-facet-change-icon 2019-06-25 11:28:45 +02:00
Nicolas Maillat
6f7c52fed6 Merge pull request #3084 from HRavalomanana/PHRAS-2623_upgrade_videojs_and_remove_video_chapter_thumbnail 
PHRAS-2623  #comment Remove video-chapter-thumbail videojs and roll back on view
 2019-06-25 11:28:30 +02:00
Harrys Ravalomanana
419ffd4aab PRHAS-2544 #comment Fix colorpicker display #time 2h 2019-06-24 17:24:09 +04:00
Harrys Ravalomanana
3dc4feade8 PHRAS-2620 #comment add new icomoon font # time 2h 2019-06-24 14:21:02 +04:00
Harrys Ravalomanana
53d8615c59 PHRAS-2623 #comment update composer.json and package.lock on phraseanet 2019-06-20 17:52:42 +04:00
Nicolas Maillat
7d66dd4f17 Merge pull request #3081 from alchemy-fr/PHRAS-2434_update_changelog 
PHRAS-2434 #comment merge update changelog.md
 2019-06-17 12:05:48 +02:00
Nicolas Maillat
713e41fac7 PHRAS-2434 #comment update changelog.md 
PHRAS-2434 #comment update changelog.md #time 2h reread add to changelog.md
 2019-06-17 11:19:54 +02:00
Nicolas Maillat
f2ebef2dd0 Merge pull request #3078 from HRavalomanana/PHRAS-2619_Admin_Publication_fix_icon_size 
PHRAS-2619 Admin Publication : Fix icon size
 2019-06-14 14:23:16 +02:00
Nicolas Maillat
d2b2dd712b Merge branch 'master' into PHRAS-2619_Admin_Publication_fix_icon_size 2019-06-14 13:47:29 +02:00
Nicolas Maillat
f146fbda9f Merge pull request #3077 from HRavalomanana/PHRAS-2530_Port41_Admin_Fix_user_search_with_field 
PHRAS-2530 #comment merge Admin: user search by country and company fields
 2019-06-14 13:47:15 +02:00