lp:~dangarner/xibo/1.2.2-pre

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:xibo/1.2 at revision 213

Xibo Maintainters: Pending requested 2011-02-28

Diff: 1513 lines (+770/-99)

24 files modified

client/dotNET/CacheManager.cs (+75/-1)
client/dotNET/FileCollector.cs (+50/-29)
client/dotNET/MainForm.cs (+45/-22)
client/dotNET/Properties/Settings.Designer.cs (+13/-1)
client/dotNET/Properties/Settings.settings (+4/-1)
client/dotNET/Region.cs (+6/-7)
client/dotNET/RequiredFiles.cs (+206/-0)
client/dotNET/Schedule.cs (+1/-1)
client/dotNET/ScheduleManager.cs (+16/-1)
client/dotNET/Web References/xmds/Reference.cs (+67/-0)
client/dotNET/Web References/xmds/xmds.wsdl (+23/-0)
client/dotNET/XiboClient.csproj (+1/-0)
client/dotNET/app.config (+4/-1)
client/dotNET/bin/Release/XiboClient.exe.config (+4/-1)
client/dotNET/bin/Release/XiboClient.vshost.exe.config (+4/-1)
server/install/database/27.sql (+9/-0)
server/lib/app/kit.class.php (+9/-13)
server/lib/data/display.data.class.php (+60/-16)
server/lib/data/schedule.data.class.php (+5/-0)
server/lib/pages/display.class.php (+74/-4)
server/lib/pages/layout.class.php (+6/-0)
server/lib/pages/region.class.php (+5/-0)
server/lib/service/service.wsdl (+23/-0)
server/lib/service/xmdssoap.class.php (+60/-0)

api

Merged into lp:xibo/1.3 at revision 211

Dan Garner: Approve on 2011-02-28

Diff: 7154 lines (+4782/-473) (has conflicts)

36 files modified

client/dotNET/CacheManager.cs (+75/-1)
client/dotNET/FileCollector.cs (+57/-28)
client/dotNET/MainForm.cs (+88/-62)
client/dotNET/Properties/Resources.Designer.cs (+1/-1)
client/dotNET/Properties/Settings.Designer.cs (+14/-2)
client/dotNET/Properties/Settings.settings (+5/-2)
client/dotNET/Region.cs (+8/-1)
client/dotNET/RequiredFiles.cs (+206/-0)
client/dotNET/RssReader.cs (+1/-1)
client/dotNET/Schedule.cs (+1/-1)
client/dotNET/ScheduleManager.cs (+16/-1)
client/dotNET/Web References/xmds/Reference.cs (+86/-19)
client/dotNET/Web References/xmds/Reference.map (+1/-1)
client/dotNET/Web References/xmds/xmds.wsdl (+24/-1)
client/dotNET/XiboClient.csproj (+7/-5)
client/dotNET/app.config (+5/-2)
client/dotNET/bin/Release/XiboClient.exe.config (+24/-3)
client/dotNET/bin/Release/XiboClient.vshost.exe.config (+24/-3)
client/python/XiboClient.py (+196/-0)
client/python/client.conf (+25/-0)
client/python/configure.py (+1753/-0)
client/python/gui.glade (+1451/-0)
default.pot (+293/-283)
server/README.TXT (+4/-4)
server/install/database/27.sql (+9/-0)
server/lib/app/kit.class.php (+9/-13)
server/lib/data/display.data.class.php (+84/-6)
server/lib/data/displaygroup.data.class.php (+9/-0)
server/lib/data/schedule.data.class.php (+10/-5)
server/lib/pages/display.class.php (+169/-19)
server/lib/pages/layout.class.php (+8/-2)
server/lib/pages/module.class.php (+16/-0)
server/lib/pages/region.class.php (+5/-0)
server/lib/pages/schedule.class.php (+14/-6)
server/lib/service/service.wsdl (+23/-0)
server/lib/service/xmdssoap.class.php (+61/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #719941: Video End Detection broken

Medium

Fix Released

Link a bug report

Related blueprints

217. By Dan Garner on 2011-02-17

[dotnetclient] ScheduleManager wasnt checking the default layout was valid.

216. By Dan Garner on 2011-02-16

[dotnetclient] Check layout is valid before adding to current schedule

215. By Dan Garner on 2011-02-16

[dotnetclient] Peliminary code to validate layouts before they are shown

214. By Dan Garner on 2011-02-16

[dotnetclient] Start of cachemanager regeneration from RequiredFiles. Fixed 0 duration bug on video

213. By Dan Garner on 2011-02-14

[all] Pulled back in changes to dotnetclient after release (1.2.1.1)

212. By Dan Garner on 2011-02-13

[dotnetclient] Compile time error

211. By Dan Garner on 2011-02-13

[server][dotnetclient] Merged media inventory status

210. By Dan Garner on 2011-02-11

Released 1.2.1

209. By Dan Garner on 2011-02-11

[server] Updated POT file for 1.2.1

208. By Alex Harrington on 2011-02-11

[pyclient] Merged in Python Client Config App by Matt Holder.