Jean-Yves Gaulier
|
32fbf049cf
|
PHRAS-2757_print-feedback_4.1
Add a print format when printing a feedback basket
Only the creator of the feedback can print it.
|
2020-01-09 20:31:09 +01:00 |
|
Harrys Ravalomanana
|
1dd0be65d4
|
PHRAS-2868 #comment update phraseanet-production-client version
|
2020-01-09 19:05:31 +04:00 |
|
aynsix
|
12d01afeb0
|
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2741-worker-service-part1
|
2019-12-19 16:09:47 +04:00 |
|
aynsix
|
cfa854f307
|
start subdef creation after first write meta
|
2019-12-19 16:09:35 +04:00 |
|
aynsix
|
63d2f1cf54
|
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2603-migration-patch-configuration-yml
|
2019-12-17 14:09:27 +04:00 |
|
Harrys Ravalomanana
|
ad47f4b18c
|
PHRAS-2706 #comment Prod Fix Basket browser #time 2h
|
2019-12-17 12:07:04 +04:00 |
|
aynsix
|
afc5a85edf
|
change param name
|
2019-12-13 15:28:02 +04:00 |
|
Nicolas Maillat
|
ede9c5ad3b
|
Merge branch 'master' into PHRAS-2680-webhook-privacy-and-security
|
2019-12-12 12:57:33 +01:00 |
|
Nicolas Maillat
|
6afc40ef3b
|
Merge branch 'master' into PHRAS-2196-api-stories-pagination
|
2019-12-12 12:56:48 +01:00 |
|
Nicolas Maillat
|
84d1fdead4
|
Merge branch 'master' into PHRAS-2739-incorporate-subdefwebhook
|
2019-12-12 12:56:10 +01:00 |
|
Nicolas Maillat
|
a43d073c8a
|
Merge branch 'master' into PHRAS-2840-exclure-collection-quarantaine
|
2019-12-12 12:10:35 +01:00 |
|
Nicolas Maillat
|
78619ad2cc
|
Merge branch 'master' into PHRAS-2739-incorporate-subdefwebhook
|
2019-12-12 12:07:17 +01:00 |
|
Nicolas Maillat
|
5e414fbe6d
|
Merge branch 'master' into PHRAS-2680-webhook-privacy-and-security
|
2019-12-12 12:07:02 +01:00 |
|
aynsix
|
48f78698cc
|
resolve conflict
|
2019-12-12 14:33:37 +04:00 |
|
aynsix
|
5a703f207a
|
fix record order in story
|
2019-12-12 12:13:56 +04:00 |
|
aynsix
|
8eb6ae5dfa
|
change variable name
|
2019-12-11 18:18:30 +04:00 |
|
aynsix
|
9ac196784a
|
change sql params form
|
2019-12-11 12:41:43 +04:00 |
|
aynsix
|
1c0b1db9c7
|
exlu collection in quarantaine when upload
|
2019-12-11 11:48:23 +04:00 |
|
aynsix
|
f475a5c925
|
fix api/v3 api_version
|
2019-12-06 14:24:03 +04:00 |
|
aynsix
|
2fd5b6cba2
|
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2196-api-stories-pagination
|
2019-12-06 14:22:32 +04:00 |
|
Nicolas Maillat
|
2f05804c52
|
Merge branch 'master' into PHRAS-1324-add-libfaac
|
2019-12-05 18:44:05 +01:00 |
|
Jean-Yves Gaulier
|
0967f3c810
|
PHRAS-2631_feedback-icon
fix : 2 new icons for feedback baskets; no more display of 2 icons.
fix : tooltip on "about" icon of feedback baskets
|
2019-12-05 14:52:46 +01:00 |
|
aynsix
|
d95014831e
|
update presets webm
|
2019-12-05 15:23:59 +04:00 |
|
aynsix
|
960c40233c
|
add presets and libmp3lame to default
|
2019-12-05 14:55:56 +04:00 |
|
aynsix
|
276d5a8ce6
|
remove unused comment
|
2019-12-05 14:42:15 +04:00 |
|
aynsix
|
3d6d2e4e64
|
fix V1Controller
|
2019-12-05 14:30:17 +04:00 |
|
aynsix
|
e4b29d70c5
|
route search and storie on api/v3
|
2019-12-05 12:30:23 +04:00 |
|
aynsix
|
530397db00
|
do no use header application/vnd.phraseanet.story-paginate
|
2019-12-04 10:17:59 +04:00 |
|
aynsix
|
3d1983452e
|
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2196-api-stories-pagination
|
2019-12-04 10:10:03 +04:00 |
|
aynsix
|
cac34cc3a4
|
add libfdk_aac and change presets name
|
2019-12-02 16:34:49 +04:00 |
|
aynsix
|
f7a6ae2f3f
|
patch for configuration.yml
|
2019-12-02 15:34:28 +04:00 |
|
Nicolas Maillat
|
5342f07a82
|
Revert "PHRAS-1324 : libfaac abandoned 4.1"
|
2019-11-29 16:38:47 +01:00 |
|
Nicolas Maillat
|
f28488b6ec
|
Merge branch 'master' into PHRAS-1154-remove-all-last-default-query
|
2019-11-29 13:14:21 +01:00 |
|
aynsix
|
166c302889
|
remove all and last in default query pref
|
2019-11-29 12:22:24 +04:00 |
|
aynsix
|
c9356ec206
|
max_items depends on header application/vnd.phraseanet.story-paginate
|
2019-11-28 18:15:55 +04:00 |
|
aynsix
|
cb38023290
|
libfaac abandoned
|
2019-11-27 17:37:05 +04:00 |
|
Nicolas Maillat
|
e6ebc29ecd
|
Merge branch 'master' into PHRAS-2196-api-stories-pagination
|
2019-11-27 13:21:31 +01:00 |
|
Nicolas Maillat
|
9731a11520
|
Merge branch 'master' into PHRAS-2680-webhook-privacy-and-security
|
2019-11-26 17:46:31 +01:00 |
|
Nicolas Maillat
|
32bd07e804
|
Merge branch 'master' into PHRAS-2814-setup-install-elasticsearch-information
|
2019-11-26 16:08:58 +01:00 |
|
Nicolas Maillat
|
77d3405149
|
Merge branch 'master' into PHRAS-2196-api-stories-pagination
|
2019-11-21 17:54:23 +01:00 |
|
Jean-Yves Gaulier
|
246ffd15ef
|
PHRAS-2796_actionbar-enhancements_4.1
port code from 4.0
|
2019-11-21 14:11:33 +01:00 |
|
Nicolas Maillat
|
0f2bfef0a6
|
Merge branch 'master' into PHRAS-2739-incorporate-subdefwebhook
|
2019-11-19 18:30:44 +01:00 |
|
Nicolas Maillat
|
022f9f56a1
|
Merge branch 'master' into PHRAS-2814-setup-install-elasticsearch-information
|
2019-11-19 18:25:26 +01:00 |
|
jygaulier
|
a2b2658c04
|
Merge branch 'master' into PHRAS-2831_port-truncation_4.1
|
2019-11-19 17:34:45 +01:00 |
|
Jean-Yves Gaulier
|
3145049247
|
PHRAS-2831_port-truncation_4.1
copy elastic/truncation code from 4.0
nb: from already exists
|
2019-11-19 16:45:46 +01:00 |
|
Nicolas Maillat
|
bbf0248602
|
Merge branch 'master' into PHRAS-2814-setup-install-elasticsearch-information
|
2019-11-19 16:30:07 +01:00 |
|
Nicolas Maillat
|
d95c56af69
|
Merge branch 'master' into PHRAS-2805_Port_41_facet-case-sensibility
|
2019-11-19 16:04:41 +01:00 |
|
aynsix
|
bc488a421d
|
on system:install add elasticsearch informations options
|
2019-11-18 17:35:36 +04:00 |
|
Nicolas Maillat
|
1d803e7afb
|
Merge branch 'master' into PHRAS-2813-redis-delete-deprecated
|
2019-11-15 23:03:35 +01:00 |
|
aynsix
|
be73baae5b
|
redis function delete is deprecated
|
2019-11-15 17:12:02 +04:00 |
|