Merge lp://staging/~dangarner/xibo/client-163 into lp://staging/xibo/1.7
Proposed by
Dan Garner
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~dangarner/xibo/client-163 |
Merge into: | lp://staging/xibo/1.7 |
Diff against target: |
1542 lines (+683/-171) (has conflicts) 41 files modified
client/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) Text conflict in client/dotNET/Properties/Settings.Designer.cs Text conflict in client/dotNET/Properties/Settings.settings Text conflict in client/dotNET/app.config Contents conflict in default.mo Text conflict in default.pot Text conflict in server/config/config.class.php Text conflict in server/install.php Text conflict in server/install/master/data.sql Text conflict in server/lib/data/region.data.class.php Text conflict in server/lib/include.php Text conflict in server/lib/service/xmdssoap.class.php Text conflict in server/manual/content/admin/release_notes_1.6.2.php Text conflict in server/manual/template.php Text conflict in server/modules/preview/HtmlTemplateForGetResource.html Text conflict in server/modules/preview/html-preview.js Text conflict in server/modules/preview/xibo-text-render.js Text conflict in server/modules/preview/xibo-webpage-render.js Text conflict in server/theme/default/html/status_dashboard.php Text conflict in server/upgrade.php |
To merge this branch: | bzr merge lp://staging/~dangarner/xibo/client-163 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Xibo Maintainters | Pending | ||
Review via email: mp+231789@code.staging.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 347. By Dan Garner
-
[dotnetclient] Bumped Version (1.6.3, 85)
[dotnetclient] Always re-download resource when layout changes - 346. By Dan Garner
-
Merged ~dangarner/
xibo/server- 163-final/