* WIP DO NOT MERGE
add: stamp subdefs of class "preview"
apply watermark on stamped subdef (cache to be fixed)
fix: admin/collection settings (new ux, clean xml)
* WIP DO NOT MERGE
add: stamp subdefs of class "preview"
apply watermark on stamped subdef (cache to be fixed)
fix: admin/collection settings (new ux, clean xml)
* conf.export_stamp_choice now supports 'manage_collection' and 'manage_databox' (and bc true) to restrict right to remove stamp.
* fix test
* WIP DO NOT MERGE
add: stamp subdefs of class "preview"
apply watermark on stamped subdef (cache to be fixed)
fix: admin/collection settings (new ux, clean xml)
* conf.export_stamp_choice now supports 'manage_collection' and 'manage_databox' (and bc true) to restrict right to remove stamp.
* fix test
* fix compatibility with download-async ; add registry/actions/stamp-subdefs=false to conf
* PHRAS-1304_AUTO-COMPLETION_MASTER
ported from 4.0
* PHRAS-1304_AUTO-COMPLETION_MASTER
fix
* PHRAS-1304_AUTO-COMPLETION_MASTER
fix
* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 (5.5.21 is obsolete in cicleci)
* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 : php.ini moved in circelci
* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq & date to php for circleci
* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq
* PHRAS-1304_AUTO-COMPLETION_MASTER
bump amqp
* PHRAS-1304_AUTO-COMPLETION_MASTER
downgrade amqp to 1.2 to test compilation against old librabbit 0.4 (ubuntu)
* PHRAS-1304_AUTO-COMPLETION_MASTER
add amqp.so to php.ini, (re)bump amqp to 1.6
* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git
* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again
* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again and again
* PHRAS-1304_AUTO-COMPLETION_MASTER
fix test on media rotation 600*400 -> 400*599 !!!
* PHRAS-1304_AUTO-COMPLETION_MASTER
restore facebook sdk to 4.0.1 due to mistake
* PHRAS-1304_AUTO-COMPLETION_MASTER
deleted unwanted file
