← Back to branch summary

~dangarner/xibo/client-132

~dangarner/xibo/client-132

Viewing all changes in revision 220.

Committer: Dan Garner
Date: 2011-08-18 23:37:35 UTC
mfrom: (219.1.36 server-layout-media-permissions)
Revision ID: dan@xibo.org.uk-20110818233735-kun5v3ug5jttc7ie

Merged ~dangarner/xibo/server-layout-media-permissions

files added:
server/lib/app/permissionmanager.class.php

server/lib/data/dataset.data.class.php

server/lib/data/datasetcolumn.data.class.php

server/lib/data/datasetdata.data.class.php

server/lib/data/datasetgroupsecurity.data.class.php

server/lib/data/layoutgroupsecurity.data.class.php

server/lib/data/layoutmediagroupsecurity.data.class.php

server/lib/data/layoutregiongroupsecurity.data.class.php

server/lib/data/mediagroupsecurity.data.class.php

server/lib/data/templategroupsecurity.data.class.php

server/lib/js/dataset.js

server/lib/pages/dataset.class.php

server/modules/counter.module.php

server/template/pages/dataset_view.php

files modified:
server/img/forms/background_timeline.png

server/install/database/41.sql

server/lib/app/kit.class.php

server/lib/app/responsemanager.class.php

server/lib/app/translationengine.class.php

server/lib/data/layout.data.class.php

server/lib/data/media.data.class.php

server/lib/data/schedule.data.class.php

server/lib/include.php

server/lib/js/core.js

server/lib/js/layout.js

server/lib/js/mediamanager.js

server/lib/modules/module.class.php

server/lib/pages/content.class.php

server/lib/pages/display.class.php

server/lib/pages/displaygroup.class.php

server/lib/pages/group.class.php

server/lib/pages/index.class.php

server/lib/pages/layout.class.php

server/lib/pages/mediamanager.class.php

server/lib/pages/oauth.class.php

server/lib/pages/region.class.php

server/lib/pages/schedule.class.php

server/lib/pages/template.class.php

server/lib/pages/user.class.php

server/lib/service/rest.class.php

server/lib/xmds.inc.php

server/locale/dbtranslate.php

server/modules/embedded.module.php

server/modules/flash.module.php

server/modules/image.module.php

server/modules/microblog.module.php

server/modules/module_user_general.php

server/modules/powerpoint.module.php

server/modules/text.module.php

server/modules/ticker.module.php

server/modules/video.module.php

server/modules/webpage.module.php

server/template/css/calendar.css

server/template/css/links.css

server/template/css/presentation.css

server/template/css/xibo.css

server/template/footer.php

server/template/header.php

server/template/pages/layout_edit.php

server/template/pages/mediamanager.php

Show diffs side-by-side

added added

removed removed

server/img/forms/background_timeline.png

server/install/database/41.sql

server/lib/app/kit.class.php

server/lib/app/permissionmanager.class.php

server/lib/app/responsemanager.class.php

server/lib/app/translationengine.class.php

server/lib/data/dataset.data.class.php

server/lib/data/datasetcolumn.data.class.php

server/lib/data/datasetdata.data.class.php

server/lib/data/datasetgroupsecurity.data.class.php

server/lib/data/layout.data.class.php

server/lib/data/layoutgroupsecurity.data.class.php

server/lib/data/layoutmediagroupsecurity.data.class.php

server/lib/data/layoutregiongroupsecurity.data.class.php

server/lib/data/media.data.class.php

server/lib/data/mediagroupsecurity.data.class.php

server/lib/data/schedule.data.class.php

server/lib/data/templategroupsecurity.data.class.php

server/lib/include.php

server/lib/js/core.js

server/lib/js/dataset.js

server/lib/js/layout.js

server/lib/js/mediamanager.js

server/lib/modules/module.class.php

server/lib/pages/content.class.php

server/lib/pages/dataset.class.php

server/lib/pages/display.class.php

server/lib/pages/displaygroup.class.php

server/lib/pages/group.class.php

server/lib/pages/index.class.php

server/lib/pages/layout.class.php

server/lib/pages/mediamanager.class.php

server/lib/pages/oauth.class.php

server/lib/pages/region.class.php

server/lib/pages/schedule.class.php

server/lib/pages/template.class.php

server/lib/pages/user.class.php

server/lib/service/rest.class.php

server/lib/xmds.inc.php

server/locale/dbtranslate.php

server/modules/counter.module.php

server/modules/embedded.module.php

server/modules/flash.module.php

server/modules/image.module.php

server/modules/microblog.module.php

server/modules/module_user_general.php

server/modules/powerpoint.module.php

server/modules/text.module.php

server/modules/ticker.module.php

server/modules/video.module.php

server/modules/webpage.module.php

server/template/css/calendar.css

server/template/css/links.css

server/template/css/presentation.css

server/template/css/xibo.css

server/template/pages/dataset_view.php

server/template/pages/layout_edit.php

server/template/pages/mediamanager.php

Older »