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 |
|
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 |
|
Harrys Ravalomanana
|
661f09e3fd
|
PHRAS-3006 #comment port 41 Front elete 3 by 3
|
2020-04-02 11:52:52 +04: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 |
|
Harrys Ravalomanana
|
4febd38154
|
PHRAS-2999 #comment remove Detail info block
|
2020-04-01 14:46:34 +04: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 |
|
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
|
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 |
|
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 |
|