lp:~dangarner/xibo/client-163
Created by
Dan Garner
and last modified
- Get this branch:
- bzr branch lp:~dangarner/xibo/client-163
Only
Dan Garner
can upload to this branch. If you are
Dan Garner
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Xibo Maintainters: Pending requested
-
Diff: 101 lines (+11/-8)5 files modifiedclient/dotNET/DataSetView.cs (+3/-1)
client/dotNET/Properties/Settings.Designer.cs (+2/-2)
client/dotNET/Properties/Settings.settings (+2/-2)
client/dotNET/Rss.cs (+2/-1)
client/dotNET/app.config (+2/-2)
Ready for review
for merging
into
lp:xibo/1.7
- Xibo Maintainters: Pending requested
-
Diff: 1542 lines (+683/-171) (has conflicts)41 files modifiedclient/dotNET/DataSetView.cs (+3/-1)
client/dotNET/Properties/Settings.Designer.cs (+8/-0)
client/dotNET/Properties/Settings.settings (+8/-0)
client/dotNET/Rss.cs (+2/-1)
client/dotNET/app.config (+8/-0)
default.pot (+8/-0)
server/config/config.class.php (+12/-2)
server/install.php (+12/-0)
server/install/database/71.sql (+4/-0)
server/install/master/data.sql (+4/-0)
server/install/master/structure.sql (+10/-0)
server/lib/app/kit.class.php (+1/-1)
server/lib/app/pdoconnect.class.php (+11/-1)
server/lib/data/dataset.data.class.php (+1/-2)
server/lib/data/datasetdata.data.class.php (+1/-1)
server/lib/data/displaygroup.data.class.php (+9/-5)
server/lib/data/region.data.class.php (+19/-8)
server/lib/data/userdata.data.class.php (+28/-0)
server/lib/data/usergroup.data.class.php (+1/-1)
server/lib/include.php (+4/-0)
server/lib/modules/module.class.php (+8/-5)
server/lib/pages/admin.class.php (+7/-7)
server/lib/pages/content.class.php (+1/-1)
server/lib/pages/display.class.php (+7/-5)
server/lib/pages/displaygroup.class.php (+1/-1)
server/lib/pages/schedule.class.php (+17/-12)
server/lib/pages/statusdashboard.class.php (+1/-1)
server/lib/pages/timeline.class.php (+6/-0)
server/lib/pages/user.class.php (+5/-17)
server/lib/service/xmdssoap.class.php (+6/-0)
server/locale/dbtranslate.php (+43/-0)
server/manual/content/admin/api_layouts.php (+39/-16)
server/manual/content/admin/release_notes_1.6.2.php (+162/-76)
server/manual/content/admin/release_notes_1.6.3.php (+83/-0)
server/manual/template.php (+4/-0)
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/modules/preview/xibo-webpage-render.js (+73/-1)
server/theme/default/html/status_dashboard.php (+7/-2)
server/upgrade.php (+12/-0)
Related bugs
Related blueprints
Branch information
Recent revisions
- 347. By Dan Garner
-
[dotnetclient] Bumped Version (1.6.3, 85)
[dotnetclient] Always re-download resource when layout changes
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:xibo/1.7