← Back to branch summary

~dangarner/xibo/client-141

~dangarner/xibo/client-141

Viewing all changes in revision 254.

Committer: Dan Garner
Date: 2012-10-13 19:39:08 UTC
mfrom: (252.1.6 server-150)
Revision ID: dan@xibo.org.uk-20121013193908-l939tsimg4k191jl

Merged server-150 changes

files modified:
server/lib/app/kit.class.php

server/lib/app/session.class.php

server/lib/data/display.data.class.php

server/lib/data/displaygroup.data.class.php

server/lib/data/displaygroupsecurity.data.class.php

server/lib/js/core.js

server/lib/js/layout.js

server/lib/pages/content.class.php

server/lib/pages/display.class.php

server/lib/pages/group.class.php

server/lib/pages/layout.class.php

server/lib/pages/report.class.php

server/lib/pages/template.class.php

server/lib/pages/user.class.php

server/template/css/xibo.css

server/template/pages/campaign_view.php

server/template/pages/dataset_view.php

server/template/pages/layout_edit.php

Show diffs side-by-side

added added

removed removed

server/lib/app/kit.class.php

server/lib/app/session.class.php

server/lib/data/display.data.class.php

server/lib/data/displaygroup.data.class.php

server/lib/data/displaygroupsecurity.data.class.php

server/lib/js/core.js

server/lib/js/layout.js

server/lib/pages/content.class.php

server/lib/pages/display.class.php

server/lib/pages/group.class.php

server/lib/pages/layout.class.php

server/lib/pages/report.class.php

server/lib/pages/template.class.php

server/lib/pages/user.class.php

server/template/css/xibo.css

server/template/pages/campaign_view.php

server/template/pages/dataset_view.php

server/template/pages/layout_edit.php

Older »