lp:~dangarner/xibo/client-162

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:xibo/1.6 at revision 338

Xibo Maintainters: Pending requested 2014-07-15

Diff: 213 lines (+40/-25)

8 files modified

client/dotNET/MainForm.cs (+9/-8)
client/dotNET/Properties/Settings.Designer.cs (+2/-2)
client/dotNET/Properties/Settings.settings (+2/-2)
client/dotNET/RequiredFiles.cs (+16/-1)
client/dotNET/Text.cs (+1/-1)
client/dotNET/WebContent.cs (+7/-8)
client/dotNET/XmdsAgents/RequiredFilesAgent.cs (+1/-1)
client/dotNET/app.config (+2/-2)

api

Merged into lp:xibo/1.7 at revision 335

Xibo Maintainters: Pending requested 2014-07-15

Diff: 1957 lines (+737/-367)

39 files modified

client/dotNET/KeyStore.cs (+178/-0)
client/dotNET/MainForm.cs (+62/-47)
client/dotNET/OptionForm.Designer.cs (+76/-41)
client/dotNET/OptionForm.cs (+5/-1)
client/dotNET/Properties/Settings.Designer.cs (+26/-2)
client/dotNET/Properties/Settings.settings (+8/-2)
client/dotNET/RequiredFiles.cs (+16/-1)
client/dotNET/Text.cs (+1/-1)
client/dotNET/WebContent.cs (+7/-8)
client/dotNET/XiboClient.csproj (+1/-0)
client/dotNET/XmdsAgents/RequiredFilesAgent.cs (+1/-1)
client/dotNET/app.config (+8/-2)
server/install/database/69.sql (+4/-0)
server/install/master/data.sql (+1/-1)
server/lib/app/kit.class.php (+5/-0)
server/lib/include.php (+2/-2)
server/lib/modules/module.class.php (+93/-61)
server/lib/oauth.inc.php (+1/-1)
server/lib/pages/dataset.class.php (+2/-2)
server/lib/pages/displaygroup.class.php (+33/-24)
server/lib/pages/schedule.class.php (+4/-1)
server/lib/pages/stats.class.php (+43/-3)
server/lib/pages/timeline.class.php (+4/-4)
server/lib/service/xmdssoap.class.php (+1/-1)
server/manual/content/admin/release_notes_1.6.1.php (+78/-0)
server/manual/content/routes.php (+1/-0)
server/manual/content/toc_developer_releasenotes.php (+1/-0)
server/manual/template.php (+1/-1)
server/modules/datasetview.module.php (+2/-23)
server/modules/flash.module.php (+6/-21)
server/modules/genericfile.module.php (+6/-27)
server/modules/image.module.php (+6/-21)
server/modules/module_user_general.php (+23/-4)
server/modules/powerpoint.module.php (+7/-22)
server/modules/preview/HtmlTemplateForGetResource.html (+1/-1)
server/modules/preview/xibo-text-render.js (+13/-16)
server/modules/ticker.module.php (+2/-2)
server/modules/video.module.php (+6/-21)
server/theme/default/html/displaygroup_form_display_assign.php (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1334441: WebMedia when client offline stops the layout	Medium	Fix Released
Bug #1335851: Regional Settings with a , break webpage scale/offset	Medium	Fix Released
Bug #1336830: Windows Client can't parse layouts that have decimal separator "," in the region dimensions	Medium	Fix Released

Link a bug report

Related blueprints

342. By Dan Garner on 2014-07-12

[dotnetclient] CultureInfo.InvariantCulture when parsing layouts and layout regions.

341. By Dan Garner on 2014-07-12

[dotnetclient] Use invariant culture

340. By Dan Garner on 2014-06-30

[dotnetclient] Better wording.

339. By Dan Garner on 2014-06-30

[cms] Update for syncing datasets in background (flag for update when they change).

338. By Dan Garner on 2014-06-29

[dotnetclient] Start the timer for web media outside the documentcompleted event... just it case it doesnt return.

337. By Dan Garner on 2014-05-26

Released 1.6.1

336. By Dan Garner on 2014-05-26

Push version in master

335. By Dan Garner on 2014-05-26

Bump version.

334. By Dan Garner on 2014-05-26

Merged lp:~dangarner/xibo/client-161

333. By Dan Garner on 2014-05-26

Merged lp:~dangarner/xibo/server-161