Commit Graph

6 Commits

Author SHA1 Message Date
Jocelyn Fiat
882922cea5 Merge branch 'master' into es17.01 2017-03-30 17:33:00 +02:00
Jocelyn Fiat
230ef8ed18 Fixed video filter to support STRING_GENERAL . 2017-03-30 16:48:11 +02:00
Jocelyn Fiat
00edd5aae2 Merge branch 'master' into es17.01 2017-03-30 15:41:30 +02:00
Jocelyn Fiat
a01d161864 Improved video content filter to be more flexible, and allow custom template. 2017-03-30 15:41:04 +02:00
Jocelyn Fiat
c261554a39 Merge branch 'master' into es17.01
# Conflicts:
#	examples/demo/demo.ecf
#	modules/admin/admin-safe.ecf
2017-03-30 12:03:41 +02:00
Jocelyn Fiat
0ce7d11e52 Implemented custom cms format, and associated administration pages.
Applied to existing filter and format.
Added embedded_video filter (initially contribute by Javier Velilla).
2017-03-30 11:58:44 +02:00