lp:~dangarner/xibo/server-121

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:xibo/1.3 at revision 209

Xibo Maintainters: Pending requested 2011-02-10

Diff: 950 lines (+273/-106)

20 files modified

client/dotNET/FileCollector.cs (+9/-1)
client/dotNET/MainForm.cs (+43/-40)
client/dotNET/Properties/Resources.Designer.cs (+1/-1)
client/dotNET/Properties/Settings.Designer.cs (+1/-1)
client/dotNET/Properties/Settings.settings (+1/-1)
client/dotNET/Region.cs (+8/-0)
client/dotNET/RssReader.cs (+1/-1)
client/dotNET/Web References/xmds/Reference.cs (+19/-19)
client/dotNET/Web References/xmds/Reference.map (+1/-1)
client/dotNET/Web References/xmds/xmds.wsdl (+1/-1)
client/dotNET/XiboClient.csproj (+6/-5)
client/dotNET/app.config (+1/-1)
server/lib/data/display.data.class.php (+39/-5)
server/lib/data/displaygroup.data.class.php (+9/-0)
server/lib/data/schedule.data.class.php (+5/-5)
server/lib/pages/display.class.php (+95/-15)
server/lib/pages/layout.class.php (+2/-2)
server/lib/pages/module.class.php (+16/-0)
server/lib/pages/schedule.class.php (+14/-6)
server/lib/service/xmdssoap.class.php (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #652828: End time missing from repeat until on schedule	Low	Fix Released
Bug #697847: n weekly repeats not working for n > 1	Low	Fix Released
Bug #710107: User permissions to edit displays in display management	Low	Fix Released
Bug #710235: Image thumbnails missing from timeline hover	Low	Fix Released

Link a bug report

Related blueprints

209. By Dan Garner on 2011-02-10

[server] Image thumbnails. Cached after first generation.

208. By Dan Garner on 2011-02-10

[server] Authed the display list. Added a new button to edit the default layout on displays.

207. By Dan Garner on 2011-02-10

[server] Unitl time on repeating scheduled

206. By Dan Garner on 2011-02-10

[server] Made sure "repeat every" works for weeks

205. By Dan Garner on 2011-02-09

Fixed divered branch

204. By Dan Garner on 2011-02-09

Remerged client with new splash

203. By Dan Garner on 2011-02-07

Merged lp:~dangarner/xibo/client-121

202. By Dan Garner on 2011-02-07

Merged lp:~dangarner/xibo/server-668068

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