lp:~dangarner/xibo/server-164
Created by
Dan Garner
and last modified
- Get this branch:
- bzr branch lp:~dangarner/xibo/server-164
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: 570 lines (+153/-94)12 files modifiedserver/install/database/72.sql (+6/-0)
server/install/master/data.sql (+1/-1)
server/install/master/structure.sql (+2/-1)
server/lib/data/datasetdata.data.class.php (+1/-1)
server/lib/modules/module.class.php (+16/-4)
server/lib/pages/schedule.class.php (+15/-6)
server/lib/service/xmdssoap.class.php (+68/-38)
server/maintenance.php (+2/-2)
server/modules/module_user_general.php (+1/-1)
server/modules/preview/HtmlTemplateForGetResource.html (+1/-1)
server/modules/preview/HtmlTemplateSimple.html (+1/-1)
server/theme/default/html/status_dashboard.php (+39/-38)
Rejected
for merging
into
lp:xibo/1.7
- Xibo Maintainters: Pending requested
-
Diff: 4095 lines (+3648/-18) (has conflicts)22 files modifiedclient/dotNET/DataSetView.cs.OTHER (+237/-0)
client/dotNET/Properties/Settings.Designer.cs (+546/-0)
client/dotNET/Properties/Settings.settings (+149/-0)
client/dotNET/Rss.cs.OTHER (+673/-0)
client/dotNET/app.config (+170/-0)
server/install/database/71.sql (+4/-0)
server/install/database/72.sql (+6/-0)
server/install/master/data.sql (+4/-0)
server/install/master/structure.sql (+2/-1)
server/lib/data/datasetdata.data.class.php (+1/-1)
server/lib/include.php (+4/-0)
server/lib/pages/schedule.class.php (+1255/-0)
server/lib/service/xmdssoap.class.php (+281/-15)
server/manual/content/admin/release_notes_1.6.3.php (+83/-0)
server/manual/content/admin/release_notes_1.6.4.php (+83/-0)
server/manual/content/routes.php (+5/-0)
server/manual/content/toc_developer_releasenotes.php (+7/-1)
server/manual/template.php (+4/-0)
server/modules/preview/HtmlTemplateForGetResource.html (+4/-0)
server/modules/preview/HtmlTemplateSimple.html (+4/-0)
server/modules/ticker.module.php (+83/-0)
server/theme/default/html/status_dashboard.php (+43/-0)
Related bugs
Bug #1321509: Scheduling Layout with Read-only access | Low | Fix Committed | |
Bug #1362353: Xibo 1.6.3 - Editing media does not work, can cause crash, xibo default screen, or no change in media. | Low | Fix Committed | |
Bug #1366323: ImportCSV doesn't update the watermark on the dataset | Low | Fix Released | |
Bug #1368163: XMDS should use MySQL query cache where possible | Undecided | Fix Committed | |
Bug #1371882: SimplePie doesn't parse some feeds that the .NET library used to | Medium | Fix Released |
Related blueprints
Branch information
Recent revisions
- 355. By Dan Garner
-
[cms] Parameter added to maintenance.php which skips the log and stat purge for a "quick" run.
- 351. By Dan Garner
-
[cms] Layouts should be visible in Schedule Form (i.e. can schedule layouts with view permissions).
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