hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,405 Commits 268 Branches 107 Tags
2fd5b6cba2f9ce664f861e26907217d6e567e4c4
Commit Graph

5035 Commits

Author SHA1 Message Date
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
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
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
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
Harrys Ravalomanana
5e4da5f28f PHRAS-2805 #comment Port41 of Facet-case-sensibility 2019-11-14 15:02:04 +04:00
Nicolas Maillat
5378d593ca Merge branch 'master' into PHRAS-2815_generate-cterms-multi-db_4.1 2019-11-13 15:16:06 +01:00
Harrys Ravalomanana
5f2617e5f7 PHRAS-2816 #comment add attribute gui_visible to show fields on roll over and detailled view #time 2h 2019-11-12 18:13:05 +04:00
Harrys Ravalomanana
beb57b3af2 PHRAS-2816 #comment hidden fields on roll over and detailled view depending on gui_editable attribute #time 6h 2019-11-11 15:47:11 +04:00
Nicolas Maillat
8279fb64ec Merge branch 'master' into PHRAS-2815_generate-cterms-multi-db_4.1 2019-11-08 17:37:17 +01:00
Jean-Yves Gaulier
cba5f8a1a2 PHRAS-2815_generate-cterms-multi-db_4.1 
fix : the "generate cterms" setting is applied by db
how : the "global_structure" (fields merged) now also contains field settings by db
 2019-11-07 17:24:57 +01:00
Jean-Yves Gaulier
da532cc36a PHRAS-2748_bad-chars-cterms_4.1 
fix : remove bad ascii chars (0...31 except tab; cr; lf) from cterms values
todo ? : also cleanup bad chars from prod/editing and api/editing ?
 2019-11-05 17:59:03 +01:00
Nicolas Maillat
11ed5c08c8 Merge branch 'master' into PHRAS-2761_add_status_change_capabilities-to_quarantine 2019-11-05 12:47:27 +01:00
Nicolas Maillat
c9a0a0490c Merge branch 'master' into PHRAS-2761_add_status_change_capabilities-to_quarantine 2019-11-05 12:26:43 +01:00
Nicolas Maillat
d36517982c Merge branch 'master' into PHRAS-2785_facets_on_date_restitued_in_wicked_way 2019-11-05 12:14:41 +01:00
Jean-Yves Gaulier
21bb2ffae4 PHRAS-2808-2806_disable-cterms_mask-writable-fields_4.1 
fix php syntax error during circleci test (ok on devjy ?)
todo : implement "gui_editable" in edit ux (hide field when =false)
todo : 2 new strings (ckbox labels) to trans
 2019-11-04 10:35:16 +01:00
Jean-Yves Gaulier
b4e848a5e9 PHRAS-2808-2806_disable-cterms_mask-writable-fields_4.1 
new : checkbox in admin/field to allow gui (prod) editing, default=checked.
rename "publish_cterms" to "generate_cterms"
todo : implement "gui_editable" in edit ux (hide field when =false)
todo : 2 new strings (ckbox labels) to trans
 2019-10-31 19:31:12 +01:00
Jean-Yves Gaulier
ce13112105 PHRAS-2808_disable-cterms_4.1 
new : checkbox in admin/field to disable cterms generation.
fix : when cterms is cleared (during reindex), rejected terms are kept
WIP
 2019-10-31 18:12:26 +01:00
Harrys Ravalomanana
df86aac2ba PHRAS-2766 #comment port 41 Add status change capabilities to quarantine #time 3h 2019-10-29 16:48:14 +04:00
Nicolas Maillat
8551469c1f Merge branch 'master' into PHRAS-2785_facets_on_date_restitued_in_wicked_way 2019-10-09 10:52:03 +02:00
Jean-Yves Gaulier
a4631cb434 PHRAS-2751_geoloc-search-403err_master 
fix : geoloc search should work again (missed method during PHRAS-2707)
 2019-10-08 15:30:19 +02:00
Harrys Ravalomanana
ce67d5f62d PHRAS-2785 #comment Port41 of PHRAS-2758 #time 1h 2019-10-08 16:40:07 +04:00
Nicolas Maillat
90959422eb Merge branch 'master' into PHRAS-2754-reactivate-permalink-41 2019-09-27 16:10:59 +02:00
aynsix
dbaca5bb94 reactivate permalink when record moved from TRASH 4.1 2019-09-27 11:49:09 +04:00
Nicolas Maillat
fcb275da4c Merge branch 'master' into PHRAS-2686_paging_new_design 2019-09-23 12:24:00 +02:00
jygaulier
704e119f6b Merge branch 'master' into PHRAS-2666_slow-notifications_4.1 2019-09-23 12:04:11 +02:00
aynsix
70c79d8118 merge 2019-09-23 10:52:31 +04:00