lp://staging/~dangarner/xibo/server-668068

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/xibo/1.2 at revision 202

Xibo Maintainters: Pending requested 2010-12-30

Diff: 91 lines (+22/-7)

3 files modified

server/lib/data/display.data.class.php (+11/-5)
server/lib/data/displaygroup.data.class.php (+9/-0)
server/lib/pages/display.class.php (+2/-2)

api

Merged into lp://staging/xibo/1.3 at revision 207

Xibo Maintainters: Pending requested 2010-12-30

Diff: 91 lines (+22/-7)

3 files modified

server/lib/data/display.data.class.php (+11/-5)
server/lib/data/displaygroup.data.class.php (+9/-0)
server/lib/pages/display.class.php (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #668068: Display not visible in display management when deleted if delete fails	Medium	Fix Released
Bug #695806: Cannot add displays with ' in the name	Low	Fix Released

Link a bug report

Related blueprints

204. By Dan Garner on 2010-12-30

[server] Changed delete message

203. By Dan Garner on 2010-12-30

[server] Also delete blacklist records before deleting display.

202. By Dan Garner on 2010-12-30

[server] Deleting displays. Adding displays with ' in the name.

201. By Alex Harrington on 2010-12-10

[server] Merged fix for lp:659524

200. By Alex Harrington on 2010-12-10

[server] Merged fix for lp:669579

199. By Alex Harrington on 2010-12-10

[server] Merged fix for lp:687239

198. By Alex Harrington on 2010-12-10

[server] Merged fix for lp:588568

197. By Alex Harrington on 2010-12-01

[server] Merged fix for lp:670351

196. By Alex Harrington on 2010-10-26

[server] Merged fix for lp:654536

195. By Alex Harrington on 2010-10-03

[server] [pyclient] Merged fix for lp:652831