lp:~dangarner/xibo/client-141

Branch merges

Propose for merging

No branches dependent on this one.

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

Xibo Maintainters: Pending requested 2012-12-02

Diff: 2701 lines (+1471/-272) (has conflicts)

40 files modified

client/dotNET/MainForm.cs (+40/-3)
client/dotNET/OptionForm.Designer.cs (+46/-18)
client/dotNET/OptionForm.cs (+2/-0)
client/dotNET/Properties/Settings.Designer.cs (+13/-1)
client/dotNET/Properties/Settings.settings (+4/-1)
client/dotNET/Region.cs (+2/-0)
client/dotNET/Resources/HtmlTemplate.htm (+24/-16)
client/dotNET/Rss.cs (+45/-31)
client/dotNET/Text.cs (+7/-4)
client/dotNET/Video.cs (+4/-1)
client/dotNET/WebContent.cs (+20/-3)
client/dotNET/XiboClient.csproj (+12/-0)
client/dotNET/app.config (+4/-1)
client/offline/XiboOfflineDownload.py (+1/-1)
client/python-installer/xibo-1.4.0-ubuntu.all-pyclient.sh (+1/-1)
client/python/XiboClient.py (+4/-0)
server/install/database/60.sql (+33/-0)
server/lib/app/kit.class.php (+28/-2)
server/lib/app/session.class.php (+14/-0)
server/lib/include.php (+2/-2)
server/lib/js/core.js (+11/-1)
server/lib/js/layout.js (+40/-8)
server/lib/js/mediamanager.js (+23/-1)
server/lib/modules/module.class.php (+188/-0)
server/lib/pages/content.class.php (+41/-28)
server/lib/pages/group.class.php (+7/-1)
server/lib/pages/layout.class.php (+278/-120)
server/lib/pages/module.class.php (+1/-4)
server/lib/pages/region.class.php (+102/-1)
server/lib/pages/report.class.php (+16/-3)
server/lib/pages/template.class.php (+8/-1)
server/lib/pages/transition.class.php (+257/-0)
server/lib/pages/user.class.php (+9/-2)
server/locale/dbtranslate.php (+8/-0)
server/modules/module_user_general.php (+64/-0)
server/template/css/xibo.css (+35/-8)
server/template/pages/campaign_view.php (+0/-1)
server/template/pages/dataset_view.php (+0/-1)
server/template/pages/layout_edit.php (+1/-7)
server/template/pages/transition_view.php (+76/-0)

api

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

Xibo Maintainters: Pending requested 2012-12-02

Diff: 678 lines (+223/-79)

13 files modified

client/dotNET/MainForm.cs (+40/-3)
client/dotNET/OptionForm.Designer.cs (+46/-18)
client/dotNET/OptionForm.cs (+2/-0)
client/dotNET/Properties/Settings.Designer.cs (+13/-1)
client/dotNET/Properties/Settings.settings (+4/-1)
client/dotNET/Region.cs (+2/-0)
client/dotNET/Resources/HtmlTemplate.htm (+24/-16)
client/dotNET/Rss.cs (+45/-31)
client/dotNET/Text.cs (+7/-4)
client/dotNET/Video.cs (+4/-1)
client/dotNET/WebContent.cs (+20/-3)
client/dotNET/XiboClient.csproj (+12/-0)
client/dotNET/app.config (+4/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1072857: Make the hidden mouse pointer position configurable	Wishlist	Fix Released
Bug #1074654: Video only works with duration = 0	High	Fix Released
Bug #1076266: Scale percentage on web media doesnt work on windows	Wishlist	Fix Released
Bug #1076745: Text Scaling is not consistent	Critical	Fix Released
Bug #1076772: Ticker fails is LINK attribute is missing	High	Fix Released
Bug #1078491: Single mode doesn't work	High	Fix Released

Link a bug report

Related blueprints

267. By Dan Garner on 2012-12-01

[dotnetclient] Code for web content scale percentage

266. By Dan Garner on 2012-11-22

[dotnetclient] Final tweak to rss scrolling and scaling

265. By Dan Garner on 2012-11-21

[dotnetclient] Changed height of marquee for IE

264. By Dan Garner on 2012-11-15

[dotnetclient] Fix for embedded scaling. Fix for RSS scroll speed and bump version #

263. By Dan Garner on 2012-11-13

[dotnetclient] Fixed Single Mode

262. By Dan Garner on 2012-11-09

[dotnetclient] Replaced feed parsing library

261. By Dan Garner on 2012-11-08

[dotnetclient] Possible fix for text scaling issues

260. By Dan Garner on 2012-11-03

[dotnetclient] Cursor start position

259. By Dan Garner on 2012-11-03

[dotnetclient] Fix for video end detection

258. By Dan Garner on 2012-10-27

Merged client-140