Merge lp://qastaging/~dangarner/xibo/server-141 into lp://qastaging/~xibo-maintainers/xibo/brorsen
Proposed by
Dan Garner
| Status: | Merged | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 266 | ||||||||||||||||||||
| Proposed branch: | lp://qastaging/~dangarner/xibo/server-141 | ||||||||||||||||||||
| Merge into: | lp://qastaging/~xibo-maintainers/xibo/brorsen | ||||||||||||||||||||
| Diff against target: |
372 lines (+94/-30) 14 files modified
server/install/database/50.php (+26/-0) server/install/database/51.sql (+6/-0) server/lib/include.php (+2/-2) server/lib/js/layout.js (+15/-15) server/lib/modules/module.class.php (+3/-1) server/lib/pages/display.class.php (+1/-1) server/lib/pages/module.class.php (+20/-9) server/modules/counter.module.php (+3/-0) server/modules/datasetview.module.php (+3/-2) server/modules/image.module.php (+3/-0) server/modules/shellcommand.module.php (+3/-0) server/modules/text.module.php (+3/-0) server/modules/ticker.module.php (+3/-0) server/modules/webpage.module.php (+3/-0) |
||||||||||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~dangarner/xibo/server-141 | ||||||||||||||||||||
| 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
