hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 01:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,225 Commits 268 Branches 107 Tags
35cfd07f18424bc86e9bc85d4ff6e9b939995175
Commit Graph

14225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
9d68c12cb6 Update README.md 2020-04-02 19:35:46 +02:00
Nicolas Maillat
0f39756147 Merge branch 'master' into PHRAS-2972_update_readme-1 2020-04-02 19:03:37 +02:00
Nicolas Maillat
935152d3ac Merge pull request #3407 from alchemy-fr/PHRAS-2937_libfdk_aac_in_db_model 
PHRAS-2937 #comment merge of replace libmp3aac by libfdk_aac in databox model
 2020-04-02 19:01:37 +02:00
Nicolas Maillat
ac69912d84 Merge branch 'master' into PHRAS-2937_libfdk_aac_in_db_model 2020-04-02 18:46:07 +02:00
Nicolas Maillat
da81f8dbf1 Merge pull request #3421 from alchemy-fr/PHRAS-3002-upgrade-php-ffmpeg-lib 
PHRAS-3002 #comment merge Build subdef with fdk_aac NOK with ffmpeg 4.2.2 on Docker.
 2020-04-02 18:45:12 +02:00
Harrys Ravalomanana
11e729ca1e PHRAS-3006 2020-04-02 19:37:44 +04:00
Nicolas Maillat
a38f01ca57 Merge branch 'master' into PHRAS-3002-upgrade-php-ffmpeg-lib 2020-04-02 16:37:40 +02:00
Nicolas Maillat
314e9b4ae7 Merge pull request #3416 from alchemy-fr/PHRAS-3001_es-geopoint-sources_4.1 
PHRAS-3001 #comment  merge es geopoint sources 4.1
 2020-04-02 16:37:19 +02:00
Jean-Yves Gaulier
1106e28603 PHRAS-3008_multiple-definitions-warnings_4.1 
- fix : removed composer.phar after plugin add.
 2020-04-02 14:57:05 +02:00
Harrys Ravalomanana
ca02542b96 Merge branch 'PHRAS-3006_Port41_Front_delete_3_by_3' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3006_Port41_Front_delete_3_by_3 2020-04-02 15:58:25 +04:00
Harrys Ravalomanana
01ac6936c2 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3006_Port41_Front_delete_3_by_3 2020-04-02 15:57:49 +04:00
aynsix
51b10b6bec add php modification 2020-04-02 14:56:27 +03:00
Nicolas Maillat
bb430f76d4 Merge branch 'master' into PHRAS-3001_es-geopoint-sources_4.1 2020-04-02 12:23:27 +02:00
Nicolas Maillat
c42e419ad2 Merge pull request #3424 from alchemy-fr/PHRAS-2992 
PHRAS-2992 #comment merge of Prod Fix Date translation everywhere record history.
 2020-04-02 12:21:50 +02:00
Nicolas Maillat
3767c75b0a Merge branch 'master' into PHRAS-2992 2020-04-02 10:08:08 +02:00
Nicolas Maillat
1885a51b1e Merge branch 'master' into PHRAS-3001_es-geopoint-sources_4.1 2020-04-02 09:59:53 +02:00
Harrys Ravalomanana
661f09e3fd PHRAS-3006 #comment port 41 Front elete 3 by 3 2020-04-02 11:52:52 +04:00
Nicolas Maillat
3cff44eec2 Merge branch 'master' into PHRAS-3002-upgrade-php-ffmpeg-lib 2020-04-01 23:48:33 +02:00
Nicolas Maillat
32ec5da4a8 Merge pull request #3423 from alchemy-fr/PHRAS-3005-Prod-workzone-fox-error-feedback-date 
PHRAS-3005 #comment merge  Prod - workzone - error when expand feedback.
 2020-04-01 23:48:00 +02:00
Nicolas Maillat
9df31156a8 Merge branch 'master' into PHRAS-3005-Prod-workzone-fox-error-feedback-date 2020-04-01 20:08:49 +02:00
Nicolas Maillat
dec19c1b73 Merge pull request #3422 from alchemy-fr/PHRAS-2999_PROD_Answer_grid 
PHRAS-2999 #comment merge prod - answer grid - hide selection summary
 2020-04-01 20:08:19 +02:00
Harrys Ravalomanana
1b752fde1c PHRAS-2992 code factoring 2020-04-01 17:42:36 +04:00
Harrys Ravalomanana
eddf95e71b PHRAS-2992 2020-04-01 17:40:01 +04:00
Harrys Ravalomanana
ed0c2bbf2e PHRAS-2992 fix date translation 2020-04-01 17:27:54 +04:00
Harrys Ravalomanana
5229eba49e PHRAS-3005 #comment fix error on feedback-date 2020-04-01 16:35:48 +04:00
aynsix
a39c0b5ff0 use php-ffmpeg v0.15 2020-04-01 13:52:55 +03:00
Harrys Ravalomanana
4febd38154 PHRAS-2999 #comment remove Detail info block 2020-04-01 14:46:34 +04:00
jygaulier
5df663cad2 Merge branch 'master' into PHRAS-3001_es-geopoint-sources_4.1 2020-03-31 17:54:55 +02:00
Jean-Yves Gaulier
027f7e1571 PHRAS-3001_es-geopoint-sources_4.1 
- fix : exif source is a fallback if no good values are found in the configured source field (or if conf is not set)
 2020-03-31 17:54:22 +02:00
Jean-Yves Gaulier
9f216813b7 PHRAS-3001_es-geopoint-sources_4.1 
- fix : follow the original conf structure (position-fields into provider)
- add : handles "latlng" format
 2020-03-31 17:16:57 +02:00
Nicolas Maillat
65a4a7deb0 Merge pull request #3418 from alchemy-fr/PHRAS-2998_prod_workzone_default_sort_2 
PHRAS-2998 #merge Prod - workzone - basket tab - default sort is always by date
 2020-03-31 13:39:33 +02:00
Nicolas Maillat
02ba33a8f9 Merge branch 'master' into PHRAS-2998_prod_workzone_default_sort_2 2020-03-31 12:50:58 +02:00
Nicolas Maillat
fe575e9830 Merge pull request #3417 from alchemy-fr/PHRAS-3003_large-value-32ko_es_4.1 
PHRAS-3003 #comment Merge truncate large value at 32ko in elasticesearch  4.1
 2020-03-31 12:48:54 +02:00
Harrys Ravalomanana
3c80198e3b PHRAS-2998 2020-03-31 12:09:03 +04:00
Harrys Ravalomanana
d30b67df1c PHRAS-2998 2020-03-30 18:50:53 +04:00
Jean-Yves Gaulier
40b9a7cd0c PHRAS-3003_large-value-32ko_es_4.1 
- fix (temporary ?) : text values are kept full in metadata table, but truncated to 32Ko by indexer.
 2020-03-30 15:46:04 +02:00
Jean-Yves Gaulier
8ffeb58289 PHRAS-3001_es-geopoint-sources_4.1 
WIP
- fix : gps position indexed by es now comes from the metadata fields defined in conf; (not from exif anymore).
- todo/wip : decide conf place, since today we only have an array of geo providers
- todo/wip : does exif apply as fallback if nothing in conf ? or if metadata not set in record ?
 2020-03-29 20:11:03 +02:00
Nicolas Maillat
ddca8a24a9 Merge pull request #3415 from alchemy-fr/PHRAS-2937_update_video_preset 
PHRAS-2937 #comment merge Remove libtheora from preset
 2020-03-27 23:10:59 +01:00
Nicolas Maillat
141180a02d Remove libtheora from preset 2020-03-27 22:40:10 +01:00
Nicolas Maillat
988406ce31 Merge pull request #3413 from alchemy-fr/PHRAS-2997-Add_Matomo_analytic_service 
PHRAS-2997 #comment merge of Matomo analytic service in Phraseanet core
 2020-03-26 20:32:35 +01:00
Nicolas Maillat
a56b420a88 Merge branch 'master' into PHRAS-2997-Add_Matomo_analytic_service 2020-03-26 19:47:48 +01:00
Nicolas Maillat
5e986fc131 Merge pull request #3414 from alchemy-fr/docker-ffpmeg 
PHRAS-2975 #comment merge  bump ffmpeg version to docker image
 2020-03-26 18:54:55 +01:00
Nicolas Maillat
afc2b8a863 Merge branch 'master' into docker-ffpmeg 2020-03-24 17:29:47 +01:00
Arthur de Moulins
74ca9b6083 add ffmpeg to docker image 2020-03-24 17:27:08 +01:00
Harrys Ravalomanana
8650f7e722 PHRAS-2997 remove https generation on url 2020-03-24 19:00:43 +04:00
Harrys Ravalomanana
53f6ca54fd PHRAS-2997 2020-03-24 18:33:21 +04:00
Harrys Ravalomanana
49ce33ceef PHRAS-2997 Rename properties 2020-03-24 18:25:31 +04:00
Harrys Ravalomanana
8e03128544 PHRAS-2997 2020-03-24 17:59:34 +04:00
Harrys Ravalomanana
7d2941146a PHRAS-2997- #comment add matomo script 2020-03-24 17:38:39 +04:00
Nicolas Maillat
7508ed8f93 Merge pull request #3410 from alchemy-fr/PHRAS-2978_feedback_basket-change_date-format 
PHRAS-2978 #comment  Feedback basket - Fix on feedback count display color
 2020-03-23 16:55:02 +01:00