lp:~dangarner/xibo/client-140

Branch merges

Propose for merging

No branches dependent on this one.

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

Xibo Maintainters: Pending requested 2012-10-27

Diff: 468 lines (+330/-2) (has conflicts)

11 files modified

client/dotNET/Properties/Settings.Designer.cs (+4/-0)
client/dotNET/Properties/Settings.settings (+4/-0)
client/dotNET/app.config (+13/-1)
client/offline/XiboOfflineDownload.py (+4/-0)
client/python-installer/xibo-1.4.0-ubuntu.all-pyclient.sh (+272/-0)
client/python/XiboClient.py (+4/-0)
client/python/plugins/media/BrowserMediaAnimatedBase.py (+1/-1)
server/install/database/49.sql (+4/-0)
server/install/database/50.sql (+4/-0)
server/lib/include.php (+5/-0)
server/lib/pages/content.class.php (+15/-0)

api

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

Xibo Maintainters: Pending requested 2012-10-27

Diff: 17 lines (+9/-1)

1 file modified

client/dotNET/app.config (+9/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1070227: HTTP 417 : Expectation failed on register

Medium

Fix Released

Link a bug report

Related blueprints

260. By Dan Garner on 2012-10-27

[dotnetclient] Added system.net config option

259. By Alex Harrington on 2012-10-26

[pyclient] Merged 1.4.0-bugfix branch

258. By Alex Harrington on 2012-10-25

[pyclient] Mod to installer

257. By Alex Harrington on 2012-10-25

[pyclient] Merged python client 1.4.0

256. By Dan Garner on 2012-10-18

Push versions for 1.4.0

255. By Dan Garner on 2012-09-27

Remerge due to mistake

254. By Dan Garner on 2012-09-19

HotFix.

Released 1.4.0-rc1

253. By Dan Garner on 2012-09-16

Bumped Server Version

252. By Dan Garner on 2012-09-16

Merged lp:~dangarner/xibo/client-140rc1

251. By Dan Garner on 2012-09-16

Merged lp:~dangarner/xibo/server-140rc1