lp:~dangarner/xibo/server-132

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:xibo/1.3 at revision 232

Xibo Maintainters: Pending requested 2012-01-22

Diff: 1890 lines (+1072/-176)

30 files modified

server/install/database/43.sql (+5/-0)
server/install/database/44.sql (+48/-0)
server/lib/app/helpmanager.class.php (+1/-1)
server/lib/data/display.data.class.php (+33/-3)
server/lib/data/layout.data.class.php (+51/-2)
server/lib/data/layoutgroupsecurity.data.class.php (+39/-0)
server/lib/data/layoutmediagroupsecurity.data.class.php (+88/-0)
server/lib/data/layoutregiongroupsecurity.data.class.php (+40/-0)
server/lib/data/media.data.class.php (+67/-0)
server/lib/data/usergroup.data.class.php (+57/-1)
server/lib/include.php (+3/-3)
server/lib/js/index.js (+71/-1)
server/lib/js/mediamanager.js (+8/-33)
server/lib/js/stats.js (+7/-2)
server/lib/modules/module.class.php (+74/-4)
server/lib/pages/admin.class.php (+12/-0)
server/lib/pages/content.class.php (+12/-2)
server/lib/pages/display.class.php (+1/-1)
server/lib/pages/displaygroup.class.php (+5/-7)
server/lib/pages/index.class.php (+42/-35)
server/lib/pages/layout.class.php (+11/-1)
server/lib/pages/mediamanager.class.php (+41/-1)
server/lib/pages/region.class.php (+19/-3)
server/lib/pages/stats.class.php (+246/-35)
server/lib/pages/user.class.php (+68/-38)
server/lib/service/xmdssoap.class.php (+3/-1)
server/locale/dbtranslate.php (+2/-0)
server/modules/module_db_mysql.php (+12/-0)
server/modules/module_user_general.php (+5/-1)
server/template/header.php (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #847149: UI: Media Delete Says Operation cannot be undone	Low	Fix Released
Bug #865647: Copied layouts don't persist permissions	Medium	Fix Released
Bug #867754: Cannot set the mediamanger homepage on users	Medium	Fix Released
Bug #868649: Media Manager homepage not presented when first logged in	Low	Fix Released
Bug #879235: Delete user should remove menu / page security	Low	Fix Released

Link a bug report

Related blueprints

254. By Dan Garner on 2012-01-22

[server] Version bump in pre-display checks

253. By Dan Garner on 2012-01-07

[server] Added a setting to default the checkbox to update all layouts from library

252. By Dan Garner on 2011-12-31

[server] Minor change to ReplaceMediaInAllLayouts

251. By Dan Garner on 2011-12-31

[server] Minor changes to the stats.

250. By Dan Garner on 2011-12-31

[server] Update in all layouts

249. By Dan Garner on 2011-12-29

[server] Extra formatting

248. By Dan Garner on 2011-12-29

[server] Improvements to the stats output

247. By Dan Garner on 2011-12-11

[server] Collect MAC address of clients and number of mac address changes (useful for SAS hosting)

246. By Dan Garner on 2011-12-11

[server] Max licensed displays for SAS providers

245. By Dan Garner on 2011-12-11

[server] Added new settings. Added file size to library page and settings page.