Merge lp://staging/~dangarner/xibo/server-164 into lp://staging/xibo/1.6
Proposed by
Dan Garner
| Status: | Merged | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 350 | ||||||||||||||||||||
| Proposed branch: | lp://staging/~dangarner/xibo/server-164 | ||||||||||||||||||||
| Merge into: | lp://staging/xibo/1.6 | ||||||||||||||||||||
| Diff against target: |
570 lines (+153/-94) 12 files modified
server/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) |
||||||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~dangarner/xibo/server-164 | ||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Xibo Maintainters | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
