Merge lp://staging/~dangarner/xibo/server-layout-media-permissions into lp://staging/xibo/1.3
Proposed by
Dan Garner
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 220 | ||||||||
Proposed branch: | lp://staging/~dangarner/xibo/server-layout-media-permissions | ||||||||
Merge into: | lp://staging/xibo/1.3 | ||||||||
Diff against target: |
14520 lines (+7237/-5111) 59 files modified
server/install/database/41.sql (+218/-0) server/lib/app/kit.class.php (+13/-0) server/lib/app/permissionmanager.class.php (+83/-0) server/lib/app/responsemanager.class.php (+11/-5) server/lib/app/translationengine.class.php (+1/-1) server/lib/data/dataset.data.class.php (+148/-0) server/lib/data/datasetcolumn.data.class.php (+127/-0) server/lib/data/datasetdata.data.class.php (+84/-0) server/lib/data/datasetgroupsecurity.data.class.php (+149/-0) server/lib/data/layout.data.class.php (+21/-10) server/lib/data/layoutgroupsecurity.data.class.php (+149/-0) server/lib/data/layoutmediagroupsecurity.data.class.php (+194/-0) server/lib/data/layoutregiongroupsecurity.data.class.php (+150/-0) server/lib/data/media.data.class.php (+9/-11) server/lib/data/mediagroupsecurity.data.class.php (+188/-0) server/lib/data/schedule.data.class.php (+2/-0) server/lib/data/templategroupsecurity.data.class.php (+130/-0) server/lib/include.php (+1/-0) server/lib/js/core.js (+12/-3) server/lib/js/dataset.js (+69/-0) server/lib/js/layout.js (+3/-3) server/lib/js/mediamanager.js (+65/-117) server/lib/modules/module.class.php (+1164/-74) server/lib/pages/content.class.php (+120/-104) server/lib/pages/dataset.class.php (+1022/-0) server/lib/pages/display.class.php (+9/-9) server/lib/pages/displaygroup.class.php (+1/-1) server/lib/pages/group.class.php (+1/-1) server/lib/pages/index.class.php (+1/-1) server/lib/pages/layout.class.php (+664/-261) server/lib/pages/mediamanager.class.php (+165/-49) server/lib/pages/oauth.class.php (+1/-1) server/lib/pages/region.class.php (+94/-30) server/lib/pages/schedule.class.php (+109/-15) server/lib/pages/template.class.php (+225/-50) server/lib/pages/user.class.php (+66/-111) server/lib/service/rest.class.php (+3/-6) server/lib/xmds.inc.php (+1/-0) server/locale/dbtranslate.php (+1/-0) server/modules/counter.module.php (+340/-0) server/modules/embedded.module.php (+70/-32) server/modules/flash.module.php (+88/-914) server/modules/image.module.php (+92/-934) server/modules/microblog.module.php (+55/-14) server/modules/module_user_general.php (+382/-150) server/modules/powerpoint.module.php (+88/-914) server/modules/text.module.php (+313/-273) server/modules/ticker.module.php (+52/-17) server/modules/video.module.php (+88/-900) server/modules/webpage.module.php (+74/-46) server/template/css/calendar.css (+1/-0) server/template/css/links.css (+14/-0) server/template/css/presentation.css (+31/-1) server/template/css/xibo.css (+7/-2) server/template/footer.php (+1/-1) server/template/header.php (+10/-13) server/template/pages/dataset_view.php (+51/-0) server/template/pages/layout_edit.php (+1/-0) server/template/pages/mediamanager.php (+5/-37) |
||||||||
To merge this branch: | bzr merge lp://staging/~dangarner/xibo/server-layout-media-permissions | ||||||||
Related bugs: |
|
||||||||
Related blueprints: |
Schedule Now
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dan Garner | Approve | ||
Review via email:
|
To post a comment you must log in.