lp:~dangarner/xibo/server162-testfix2

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:xibo/1.6 at revision 343

Xibo Maintainters: Pending requested 2014-07-17

Diff: 0 lines api

Merged into lp:xibo/1.7 at revision 338

Xibo Maintainters: Pending requested 2014-07-17

Diff: 551 lines (+264/-83) (has conflicts)

9 files modified

default.pot (+8/-0)
server/config/config.class.php (+12/-2)
server/install.php (+12/-0)
server/lib/app/pdoconnect.class.php (+11/-1)
server/manual/content/admin/release_notes_1.6.2.php (+162/-76)
server/modules/preview/HtmlTemplateForGetResource.html (+4/-0)
server/modules/preview/html-preview.js (+12/-4)
server/modules/preview/xibo-text-render.js (+31/-0)
server/upgrade.php (+12/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

343. By Dan Garner on 2014-07-17

[manual] Updated released notes to draw attention to text scaling issues on XP.

342. By Dan Garner on 2014-07-17

[dotnetclient] Last minute fix for scaling on IE8 (XP clients).

341. By Dan Garner on 2014-07-17

Merged lp:~dangarner/xibo/server162-testfix

340. By Dan Garner on 2014-07-15

[cms] Updated POT file.

339. By Dan Garner on 2014-07-15

Merged lp:~dangarner/xibo/server-162

338. By Dan Garner on 2014-07-15

Merged lp:~dangarner/xibo/client-162

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