lp:~dangarner/xibo/server-161

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:xibo/1.6 at revision 333

Xibo Maintainters: Pending requested 2014-05-26

Diff: 1043 lines (+341/-258)

24 files modified

server/lib/app/kit.class.php (+5/-0)
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

Merged into lp:xibo/1.7 at revision 333

Xibo Maintainters: Pending requested 2014-05-26

Diff: 1043 lines (+341/-258)

24 files modified

server/lib/app/kit.class.php (+5/-0)
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 #1309262: Show schedule only with permission EDIT on Display	Low	Fix Released
Bug #1316231: mysql_connect will be depricated	Low	Fix Released
Bug #1317384: Fit Text doesn't work	Undecided	Fix Released
Bug #1318785: Update this media in all layouts it is assigned to doesn't work	Undecided	Fix Released
Bug #1319090: Save Position on Layout Designer can send incorrect co-ordinates	Undecided	Fix Released
Bug #1322828: XMDS doesn't return resource nodes for DataSetViews	Undecided	Fix Released
Bug #1322999: Export stats button doesn't work on Chrome	Undecided	Fix Released
Bug #1323216: Dataset Filters won't accept > or < symbols	Low	Fix Released

Link a bug report

Related blueprints

345. By Dan Garner on 2014-05-26

[cms] Release notes

344. By Dan Garner on 2014-05-26

[cms] < and > being lost from the filter on datasetview.module.php and ticker.module.php

343. By Dan Garner on 2014-05-25

[cms] Fixed stats filtered for the same day.

342. By Dan Garner on 2014-05-25

[cms] Missing file from prior commit

341. By Dan Garner on 2014-05-25

[cms] Permissions on stats, export button on Chrome.
[cms] Fix for mysql depricated erro from oauth

340. By Dan Garner on 2014-05-25

Forgot to tag bug

339. By Dan Garner on 2014-05-25

[cms] Patched display list.

338. By Dan Garner on 2014-05-24

[cms] Problem viewing events schedules for displays with "view" permission.

337. By Dan Garner on 2014-05-24

[cms] Fixed problem with resource nodes and datasetviews

336. By Dan Garner on 2014-05-13

[cms] Get region positions as _DOUBLE