lp:~dangarner/xibo/server-160rc2
Created by
Dan Garner
and last modified
- Get this branch:
- bzr branch lp:~dangarner/xibo/server-160rc2
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: 7269 lines (+2762/-2878)59 files modifiedserver/3rdparty/simplepie/library/SimplePie/File.php (+9/-0)
server/install.php (+0/-748)
server/install/database/46.php (+3/-3)
server/install/database/66.sql (+2/-2)
server/install/database/67.sql (+30/-0)
server/install/master/data.sql (+9/-4)
server/install/master/structure.sql (+14/-1)
server/lib/app/kit.class.php (+69/-64)
server/lib/app/modulemanager.class.php (+80/-80)
server/lib/app/pagemanager.class.php (+9/-7)
server/lib/app/thememanager.class.php (+5/-2)
server/lib/data/display.data.class.php (+64/-12)
server/lib/data/displaygroup.data.class.php (+303/-202)
server/lib/data/layout.data.class.php (+51/-0)
server/lib/data/lkmediadisplaygroup.data.class.php (+113/-0)
server/lib/data/media.data.class.php (+31/-2)
server/lib/data/schedule.data.class.php (+2/-2)
server/lib/include.php (+1/-1)
server/lib/modules/module.class.php (+9/-5)
server/lib/pages/content.class.php (+11/-2)
server/lib/pages/display.class.php (+16/-2)
server/lib/pages/displaygroup.class.php (+599/-328)
server/lib/pages/layout.class.php (+2/-2)
server/lib/pages/module.class.php (+5/-2)
server/lib/pages/schedule.class.php (+3/-3)
server/lib/pages/stats.class.php (+3/-3)
server/lib/pages/statusdashboard.class.php (+1/-1)
server/lib/service/xmdssoap.class.php (+113/-63)
server/locale/dbtranslate.php (+4/-0)
server/manual/content/admin/fileassociations.php (+33/-0)
server/manual/content/content/content_genericfile.php (+25/-0)
server/manual/content/routes.php (+2/-0)
server/manual/content/toc_library.php (+1/-0)
server/manual/content/toc_user_and_display.php (+1/-0)
server/modules/datasetview.module.php (+16/-7)
server/modules/genericfile.module.php (+128/-0)
server/modules/module_user_general.php (+615/-582)
server/modules/preview/HtmlTemplateForGetResource.html (+3/-1)
server/modules/preview/html-preview.js (+3/-3)
server/modules/preview/xibo-text-render.js (+49/-17)
server/modules/text.module.php (+3/-1)
server/modules/ticker.module.php (+3/-1)
server/theme/default/css/xibo.css (+46/-27)
server/theme/default/html/display_form_version_instructions.php (+56/-0)
server/theme/default/html/displaygroup_fileassociations_form_assign.php (+58/-0)
server/theme/default/html/displaygroup_fileassociations_form_assign_list.php (+39/-0)
server/theme/default/html/footer.php (+2/-1)
server/theme/default/html/library_form_media_add.php (+6/-6)
server/theme/default/html/library_form_media_edit.php (+2/-1)
server/theme/default/html/media_form_ticker_add.php (+2/-2)
server/theme/default/html/media_form_ticker_edit.php (+1/-1)
server/theme/default/html/media_form_webpage_add.php (+1/-1)
server/theme/default/html/media_form_webpage_edit.php (+1/-1)
server/theme/default/html/module_page_grid.php (+2/-0)
server/theme/default/js/xibo-forms.js (+68/-0)
server/theme/default/js/xibo-layout-designer.js (+18/-0)
server/theme/default/libraries/bootstrap/js/bootstrap-ckeditor-fix.js (+15/-0)
server/theme/default/libraries/ckeditor/config.js (+2/-2)
server/upgrade.php (+0/-683)
Related bugs
Related blueprints
Add Clock Media Type
(Undefined)
Branch information
Recent revisions
- 343. By Dan Garner
-
[cms] Fix for manual position form. Dynamically get layout details rather than rely on first load.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:xibo/1.6