lp://qastaging/~dangarner/xibo/server-141

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/~xibo-maintainers/xibo/brorsen at revision 266

Xibo Maintainters: Pending requested 2012-12-02

Diff: 372 lines (+94/-30)

14 files modified

server/install/database/50.php (+26/-0)
server/install/database/51.sql (+6/-0)
server/lib/include.php (+2/-2)
server/lib/js/layout.js (+15/-15)
server/lib/modules/module.class.php (+3/-1)
server/lib/pages/display.class.php (+1/-1)
server/lib/pages/module.class.php (+20/-9)
server/modules/counter.module.php (+3/-0)
server/modules/datasetview.module.php (+3/-2)
server/modules/image.module.php (+3/-0)
server/modules/shellcommand.module.php (+3/-0)
server/modules/text.module.php (+3/-0)
server/modules/ticker.module.php (+3/-0)
server/modules/webpage.module.php (+3/-0)

api

Merged into lp://qastaging/~xibo-maintainers/xibo/d-arrest at revision 263

Xibo Maintainters: Pending requested 2012-12-02

Diff: 371 lines (+96/-24) (has conflicts)

14 files modified

server/install/database/50.php (+26/-0)
server/install/database/51.sql (+6/-0)
server/lib/include.php (+5/-0)
server/lib/js/layout.js (+15/-15)
server/lib/modules/module.class.php (+3/-1)
server/lib/pages/display.class.php (+1/-1)
server/lib/pages/module.class.php (+19/-5)
server/modules/counter.module.php (+3/-0)
server/modules/datasetview.module.php (+3/-2)
server/modules/image.module.php (+3/-0)
server/modules/shellcommand.module.php (+3/-0)
server/modules/text.module.php (+3/-0)
server/modules/ticker.module.php (+3/-0)
server/modules/webpage.module.php (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1073667: Upgrade should have reasserted all user/user group page security links	Low	Fix Released
Bug #1074134: Edit display form wont open	High	Fix Released
Bug #1074366: Add from library broken on Internet Explorer	Medium	Fix Released
Bug #1079727: Assigning images from the library to a region	Medium	Fix Released
Bug #1084191: Option to disable region preview	Low	Fix Released

Link a bug report

Related blueprints

269. By Dan Garner on 2012-12-01

[server] Disabled Preview on a module by module basis

268. By Dan Garner on 2012-12-01

[server] Bumped version

267. By Dan Garner on 2012-12-01

[server] Added new upgrade step at 50.php - reassert page security

266. By Dan Garner on 2012-12-01

[server] reworked js to on LibraryAssignForm

265. By Dan Garner on 2012-12-01

[server] Removed console.log messages.

264. By Dan Garner on 2012-12-01

[server] Missing _ on translate

263. By Alex Harrington on 2012-11-18

[pyclient] Merged Python Client v1.4.1

262. By Alex Harrington on 2012-11-09

[pyclient] Sync in text scaling improvements from .net client 1.4.1

261. By Alex Harrington on 2012-10-28

[pyclient] Merged 1.4.0-bugfix branch

260. By Dan Garner on 2012-10-27

Merged client-140