aynsix
|
a340e026bb
|
Merge branch 'PHRAS-2196-api-stories-pagination' of https://github.com/aynsix/Phraseanet into PHRAS-2196-api-stories-pagination
|
2019-12-06 14:25:15 +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 |
|
Harrys Ravalomanana
|
5309794f33
|
PHRAS-2848 remove basket description
|
2019-12-06 12:16:47 +04:00 |
|
Nicolas Maillat
|
a59c163bf2
|
Merge branch 'master' into PHRAS-2196-api-stories-pagination
|
2019-12-05 20:26:12 +01:00 |
|
Nicolas Maillat
|
700d01226c
|
Merge pull request #3250 from alchemy-fr/PHRAS-1324-add-libfaac
PHRAS-1324 #comment merge add libfdk_aac and change presets name
|
2019-12-05 20:24:46 +01:00 |
|
Nicolas Maillat
|
2f05804c52
|
Merge branch 'master' into PHRAS-1324-add-libfaac
|
2019-12-05 18:44:05 +01:00 |
|
Nicolas Maillat
|
d61c4ceafb
|
Merge pull request #3256 from HRavalomanana/PHRAS-2850_Fix_icomoon_error
PHRAS-2850 #comment merge of 404 on icomoon.ttf when "Prod" loading.
|
2019-12-05 18:43:43 +01:00 |
|
Nicolas Maillat
|
1371c607a6
|
Merge branch 'master' into PHRAS-2850_Fix_icomoon_error
|
2019-12-05 17:56:10 +01:00 |
|
Nicolas Maillat
|
80392c6742
|
Merge pull request #3258 from jygaulier/PHRAS-2631_feedback-icon
PHRAS-2631 #comment merge _basket-feedback-icon
|
2019-12-05 17:52: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 |
|
Harrys Ravalomanana
|
1313d8ff82
|
PHRAS-2850 #comment fix error icomoon #time 2h
|
2019-12-05 14:13:23 +04:00 |
|
Harrys Ravalomanana
|
4fd9f49ec2
|
PHRAS-2848 #comment some
|
2019-12-05 13:25:19 +04:00 |
|
aynsix
|
e4b29d70c5
|
route search and storie on api/v3
|
2019-12-05 12:30:23 +04:00 |
|
aynsix
|
5929690333
|
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2196-api-stories-pagination
|
2019-12-05 10:05:54 +04:00 |
|
Nicolas Maillat
|
17610e22ab
|
Merge branch 'master' into PHRAS-1324-add-libfaac
|
2019-12-04 16:53:52 +01:00 |
|
Harrys Ravalomanana
|
1a5e643deb
|
Merge branch 'master' into PHRAS-2848_Lightbox_mobile_design_refacto
|
2019-12-04 17:24:48 +04:00 |
|
Harrys Ravalomanana
|
3b8edf8e67
|
PHRAS-2848
|
2019-12-04 17:24:12 +04:00 |
|
Nicolas Maillat
|
0ad050658f
|
Merge pull request #3253 from HRavalomanana/PHRAS-2375_Fix_prod_Roll_over_PDF
PHRAS-2375 #comment merge fix prod Roll over PDF
|
2019-12-04 13:55:31 +01:00 |
|
Harrys Ravalomanana
|
2960ba8d84
|
PHRAS-2375 #comment fix prod Roll over PDF #time 1h
|
2019-12-04 10:46:46 +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 |
|
Harrys Ravalomanana
|
c691be541c
|
PHRAS-2848 #comment Lightbox mobile design refacto #time 8h
|
2019-12-03 18:05:01 +04:00 |
|
aynsix
|
cac34cc3a4
|
add libfdk_aac and change presets name
|
2019-12-02 16:34:49 +04:00 |
|
Nicolas Maillat
|
8227b86c3e
|
Merge pull request #3248 from alchemy-fr/revert-3241-PHRAS-1324-libfaac-abandoned-4-1
PHRAS-1324 #comment merge Revert libfaac abandoned 4.1
|
2019-11-29 17:43:31 +01:00 |
|
Nicolas Maillat
|
5342f07a82
|
Revert "PHRAS-1324 : libfaac abandoned 4.1"
|
2019-11-29 16:38:47 +01:00 |
|
Nicolas Maillat
|
f05aab3f6f
|
Merge pull request #3245 from aynsix/PHRAS-1154-remove-all-last-default-query
PHRAS-1154 #comment merge Migration 3.XX vers 4.XX - remove 'all' and 'last' in default query pref
|
2019-11-29 16:32:17 +01:00 |
|
Nicolas Maillat
|
913fdbefc4
|
Merge branch 'master' into PHRAS-1154-remove-all-last-default-query
|
2019-11-29 15:44:02 +01:00 |
|
Nicolas Maillat
|
d228bf0932
|
Merge pull request #3246 from HRavalomanana/PHRAS-2846-Prod_Push_windows_fix_butto_style
PHRAS-2846 #comment merge Prod-push feedback window :fix button style
|
2019-11-29 15:21:19 +01:00 |
|
Nicolas Maillat
|
b3956f28a5
|
Merge branch 'master' into PHRAS-2846-Prod_Push_windows_fix_butto_style
|
2019-11-29 14:35:08 +01:00 |
|
Nicolas Maillat
|
a5adab6cf4
|
Merge pull request #3243 from HRavalomanana/PHRAS-2774_Prod_answer_grid_Add_margin-bottom
PHRAS-2774 #comment mergeof Prod answer grid: add margin-bottom (upgrade ppc@0.34.81-d)
|
2019-11-29 14:31:31 +01:00 |
|
Nicolas Maillat
|
4d3b7b3b05
|
Merge branch 'master' into PHRAS-2774_Prod_answer_grid_Add_margin-bottom
|
2019-11-29 13:14:38 +01:00 |
|
Nicolas Maillat
|
f28488b6ec
|
Merge branch 'master' into PHRAS-1154-remove-all-last-default-query
|
2019-11-29 13:14:21 +01:00 |
|
Nicolas Maillat
|
b515ff7e7d
|
Merge pull request #3241 from alchemy-fr/PHRAS-1324-libfaac-abandoned-4-1
PHRAS-1324 #comment merge libfaac abandoned 4.1
|
2019-11-29 13:13:55 +01:00 |
|
Nicolas Maillat
|
016f331906
|
Merge branch 'master' into PHRAS-2774_Prod_answer_grid_Add_margin-bottom
|
2019-11-29 11:22:41 +01:00 |
|
Nicolas Maillat
|
5224ba5ea2
|
Merge branch 'master' into PHRAS-2846-Prod_Push_windows_fix_butto_style
|
2019-11-29 11:22:09 +01:00 |
|
Nicolas Maillat
|
61dd9b899f
|
Merge branch 'master' into PHRAS-1324-libfaac-abandoned-4-1
|
2019-11-29 10:41:55 +01:00 |
|
Nicolas Maillat
|
2eb9a24aef
|
Merge pull request #3244 from alchemy-fr/PHRDPL-82_opmimize_dockerfile
PHRDPL-82 #comment merge Optimize docker build speed
|
2019-11-29 10:41:01 +01:00 |
|
Harrys Ravalomanana
|
16a9863b0f
|
PHRAS-2846 #comment fix button style on Prod-push window #time 2h
|
2019-11-29 12:31:14 +04:00 |
|
aynsix
|
166c302889
|
remove all and last in default query pref
|
2019-11-29 12:22:24 +04:00 |
|
Nicolas Maillat
|
772cdf846e
|
Merge branch 'master' into PHRAS-1324-libfaac-abandoned-4-1
|
2019-11-28 21:08:11 +01:00 |
|
Alexandre BRACH
|
94f6fe9265
|
PHRDPL-82 #comment Optimize docker build speed
|
2019-11-28 17:19:58 +01:00 |
|
aynsix
|
c9356ec206
|
max_items depends on header application/vnd.phraseanet.story-paginate
|
2019-11-28 18:15:55 +04:00 |
|
aynsix
|
4acc98574b
|
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2196-api-stories-pagination
|
2019-11-28 18:14:19 +04:00 |
|
Nicolas Maillat
|
f2874aa5c2
|
Merge branch 'master' into PHRAS-2774_Prod_answer_grid_Add_margin-bottom
|
2019-11-28 15:03:38 +01:00 |
|
Nicolas Maillat
|
31d45b296e
|
Merge pull request #3233 from alchemy-fr/circleci_use_cache
PHRAS-2845 #comment Circleci refactor build image
|
2019-11-28 15:02:40 +01:00 |
|