Commit Graph

14294 Commits

Author SHA1 Message Date
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
Harrys Ravalomanana
30f2d2824f PHRAS-2978 2020-03-23 18:20:56 +04:00
Nicolas Maillat
64942e6eff Merge branch 'master' into PHRAS-2937_libfdk_aac_in_db_model 2020-03-23 14:34:30 +01:00
Nicolas Maillat
a13ca88125 Merge pull request #3409 from alchemy-fr/PHRAS-2989-Prod-detailed-view-basket
PHRAS-2989 #comment Prod - Detailed view - link in basket
2020-03-23 14:33:46 +01:00
Nicolas Maillat
fda0c860ce Merge branch 'master' into PHRAS-2989-Prod-detailed-view-basket 2020-03-23 14:32:34 +01:00
Nicolas Maillat
caaa565c10 Merge pull request #3408 from alchemy-fr/PHRAS-2978_feedback_basket-change_date-format
PHRAS-2978 #comment merge of  Feedback basket - Change date format lib for translation and UI fix
2020-03-23 14:32:17 +01:00
Harrys Ravalomanana
dc312296fe PHRAS-2989 2020-03-23 17:00:47 +04:00
Harrys Ravalomanana
ed7c73458d Merge branch 'master' into PHRAS-2989-Prod-detailed-view-basket 2020-03-23 16:59:17 +04:00
Harrys Ravalomanana
b6b2a4aae6 PHRAS-2978 2020-03-23 16:52:26 +04:00
Harrys Ravalomanana
769185952c PHRAS-2989 Fix on detailled view 2020-03-23 15:52:25 +04:00
Harrys Ravalomanana
b5cbb6328f Merge branch 'master' into PHRAS-2978_feedback_basket-change_date-format 2020-03-23 14:32:25 +04:00
Nicolas Maillat
556409392c Merge pull request #3406 from alchemy-fr/PHRAS-2989-Prod-detailed-view-basket
PHRAS-2989 #comment merge  Prod - Detailed view - link in basket, store etc ... requires a double click
2020-03-23 10:31:02 +01:00
Nicolas Maillat
e4cf024180 Merge branch 'master' into PHRAS-2978_feedback_basket-change_date-format 2020-03-20 19:07:51 +01:00
Harrys Ravalomanana
3700b1a1ce PHRAS-2978 fix on datepicker 2020-03-20 18:13:29 +04:00
nmaillat
008d5d6766 replace libmp3aac by libfdk_aac in databox model 2020-03-20 00:05:19 +01:00
Harrys Ravalomanana
3d64d47614 Merge branch 'master' into PHRAS-2989-Prod-detailed-view-basket 2020-03-19 17:25:29 +04:00
Harrys Ravalomanana
28766799be PHRAS-2989 fix dblclick on view details 2020-03-19 17:23:24 +04:00
Nicolas Maillat
f6591cc30c Merge pull request #3403 from alchemy-fr/PHRAS-2979-41-fix-right-access
PHRAS-2979 #comment  4.1 The content of a story is not displayed even for users with appropriate on the collection
2020-03-18 13:08:44 +01:00
aynsix
4277bd5d06 add command system:apply-rights 2020-03-18 14:48:19 +03:00
aynsix
ca2611f4c9 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2979-41-fix-right-access 2020-03-18 14:18:34 +03:00
Nicolas Maillat
3a1be947a5 Merge pull request #3172 from aynsix/PHRAS-2680-webhook-privacy-and-security
PHRAS-2680 #comment merge of webhook privacy and security in worker context
2020-03-18 11:17:49 +01:00
Nicolas Maillat
d1c299e774 Merge branch 'master' into PHRAS-2680-webhook-privacy-and-security 2020-03-18 11:00:44 +01:00
Nicolas Maillat
191cbb2b5e Merge pull request #3174 from aynsix/PHRAS-2739-incorporate-subdefwebhook
PHRAS-2739 #comment merge incorporate Phraseanet-plugin-SubdefWebhook into Phraseanet
2020-03-18 10:59:55 +01:00
Nicolas Maillat
5cbf1e8729 Merge branch 'master' into PHRAS-2739-incorporate-subdefwebhook 2020-03-18 10:34:04 +01:00
Nicolas Maillat
a89f170241 Merge branch 'master' into PHRAS-2979-41-fix-right-access 2020-03-18 10:27:58 +01:00
Nicolas Maillat
c046f7990f Merge pull request #3173 from aynsix/PHRAS-2741-worker-service-part1
PHRAS-2741 #comment merge worker service part 1, require for Phraseanet-plugin-worker
2020-03-18 10:27:28 +01:00
Nicolas Maillat
83d9416d7b Merge branch 'master' into PHRAS-2741-worker-service-part1 2020-03-18 01:38:15 +01:00
Nicolas Maillat
936c24329b Translated using Weblate (French)
Currently translated at 98.9% (2451 of 2476 strings)
2020-03-18 00:35:36 +00:00
Nicolas Maillat
fba38da25c Translated using Weblate (English)
Currently translated at 98.9% (2451 of 2476 strings)
2020-03-18 00:35:31 +00:00
Nicolas Maillat
9a3d4600b9 Merge branch 'master' into PHRAS-2741-worker-service-part1 2020-03-18 00:37:29 +01:00
Nicolas Maillat
5fdcc9eb86 Merge branch 'master' into PHRAS-2979-41-fix-right-access 2020-03-18 00:01:54 +01:00
Nicolas Maillat
4c0668869d Merge pull request #3405 from alchemy-fr/PHRAS-2978_feedback_basket-change_date-format
PHRAS-2978 #comment merge Feedback basket - enable to edit validation deadline
2020-03-17 16:57:14 +01:00