Commit Graph

2095 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
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
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
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
Harrys Ravalomanana
5e4da5f28f PHRAS-2805 #comment Port41 of Facet-case-sensibility 2019-11-14 15:02:04 +04: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
aynsix
37475fdde5 merge master 2019-11-05 15:35:02 +04:00
Nicolas Maillat
c9a0a0490c Merge branch 'master' into PHRAS-2761_add_status_change_capabilities-to_quarantine 2019-11-05 12:26:43 +01:00
aynsix
378f67c203 PHRAS-2769 delete record 2019-11-04 17:19:18 +04: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
8019cc3bd0 Merge branch 'master' into PHRAS-2680-webhook-privacy-and-security 2019-09-30 15:49:33 +02:00
Nicolas Maillat
b94e594f81 Merge branch 'master' into PHRAS-2741-worker-service-part1 2019-09-30 15:37:53 +02:00
Nicolas Maillat
b4e47d45ec Merge branch 'master' into PHRAS-2184-list-manager-email-domain-filter 2019-09-27 16:40:56 +02: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
aynsix
e6fe8f98b6 change event name 2019-09-24 11:28:31 +04:00
Nicolas Maillat
fcb275da4c Merge branch 'master' into PHRAS-2686_paging_new_design 2019-09-23 12:24:00 +02:00
Nicolas Maillat
b30d458b64 Merge branch 'master' into PHRAS-2741-worker-service-part1 2019-09-23 12:23:46 +02:00
jygaulier
704e119f6b Merge branch 'master' into PHRAS-2666_slow-notifications_4.1 2019-09-23 12:04:11 +02:00
aynsix
5d8132b08d user webhook: registration and delete 2019-09-20 18:01:23 +04:00
aynsix
65d7affcb5 export mail : make it event oriented to facilitate worker treatement 2019-09-20 16:15:49 +04:00
aynsix
7541885637 buildsubdef with worker 2019-09-20 16:01:48 +04:00
Harrys Ravalomanana
c16dc45208 PHRAS-2686 2019-09-20 11:10:26 +04:00
Harrys Ravalomanana
b3af2c26b2 PHRAS-2686 2019-09-18 17:43:42 +04:00
Nicolas Maillat
4ce653b228 Merge branch 'master' into PHRAS-2127/fix-geoname-on-registration 2019-09-10 12:53:35 +02:00
Nicolas Maillat
b124aaed91 Merge branch 'master' into PHRAS-2688_Pord_41_Prod_workzone_change_type_of_numbering 2019-09-06 16:25:44 +02:00
Nicolas Maillat
990378d9b0 Merge branch 'master' into PHRAS-2127/fix-geoname-on-registration 2019-09-06 15:03:21 +02:00
Nicolas Maillat
b260bc0688 Merge branch 'master' into PHRAS-2741-api-leaves-temporary-file-41 2019-09-06 15:00:20 +02:00
Nicolas Maillat
5e3a9c7bee Merge branch 'master' into PHRAS-2724-port-PHRAS-2723 2019-09-06 13:04:03 +02:00
Nicolas Maillat
84f5cc4857 Merge branch 'master' into PHRAS-2666_slow-notifications_4.1 2019-09-06 13:02:44 +02:00
aynsix
fe087a9dc5 fix user creation from push and feedback window 2019-09-04 12:09:53 +04:00
Jean-Yves Gaulier
53272de3f5 PHRAS-2726_setstatus-api_4.1 : port of PHRAS-2716
setstatus api did change unspecified bits due to string offset error
2019-09-03 18:07:36 +02:00
aynsix
645ae0e777 fix api: remove temporary file when upload 2019-08-28 16:41:34 +04:00
Xavier Rousset
80b4c9a6a6 PHRAS-2127 | Add https in default geoname server url, remove url formatter in register controller 2019-08-14 15:49:25 +02:00
Harrys Ravalomanana
8987e2dba5 PHRAS-2688 commit to run ccircle ci test 2019-08-13 11:39:57 +04:00