Lorenzo Giacomelli d8df7a67c9 Merge branch 'master' of ...

ssh://gitolite@asdynamics.com:50005/projects/fdn2.git

Conflicts:
	private/lib/media/mediaRenderers/MediaImage.php

2016-01-26 15:01:14 +01:00

..

mediaRenderers

Merge branch 'master' of

2016-01-26 15:01:14 +01:00

HasMediaInterface.php

MediaHandler, Mediamodel, HasMediaModel testate e SEMBRANO funzionare

2016-01-14 13:26:21 +01:00

lib.inclusion.php

incluso jquery datatables

2016-01-14 15:12:14 +01:00

MediaException.php

Media model e interfaces (in lavorazione)

2016-01-12 15:35:37 +01:00

MediaHandlerInterface.php

incluso jquery datatables

2016-01-14 15:12:14 +01:00

MediaInterface.php

incluso jquery datatables

2016-01-14 15:12:14 +01:00

MediaRendererInterface.php

Fix asText dei mediaRender ora richiede array default nullo

2016-01-26 14:59:13 +01:00