← Back to branch summary

~xibo-maintainers/xibo/ponswinnecke

~xibo-maintainers/xibo/ponswinnecke

Viewing all changes in revision 317.

Committer: Dan Garner
Date: 2014-03-29 13:42:03 UTC
mfrom: (313.2.33 server-160rc2)
Revision ID: dan@xibo.org.uk-20140329134203-xll0nnamii5tp6p4

Merged lp:~dangarner/xibo/server-160rc2

files added:
server/install/database/67.sql

server/lib/data/lkmediadisplaygroup.data.class.php

server/manual/content/admin/file_associations_form.png

server/manual/content/admin/file_associations_menu.png

server/manual/content/admin/fileassociations.php

server/manual/content/content/content_genericfile.php

server/modules/genericfile.module.php

server/theme/default/html/display_form_version_instructions.php

server/theme/default/html/displaygroup_fileassociations_form_assign.php

server/theme/default/html/displaygroup_fileassociations_form_assign_list.php

server/theme/default/libraries/bootstrap/js/bootstrap-ckeditor-fix.js

files modified:
server/3rdparty/simplepie/library/SimplePie/File.php

server/install/database/46.php

server/install/database/66.sql

server/install/master/data.sql

server/install/master/structure.sql

server/lib/app/kit.class.php

server/lib/app/modulemanager.class.php

server/lib/app/pagemanager.class.php

server/lib/app/thememanager.class.php

server/lib/data/display.data.class.php

server/lib/data/displaygroup.data.class.php

server/lib/data/layout.data.class.php

server/lib/data/media.data.class.php

server/lib/data/schedule.data.class.php

server/lib/include.php

server/lib/modules/module.class.php

server/lib/pages/content.class.php

server/lib/pages/display.class.php

server/lib/pages/displaygroup.class.php

server/lib/pages/layout.class.php

server/lib/pages/module.class.php

server/lib/pages/schedule.class.php

server/lib/pages/stats.class.php

server/lib/pages/statusdashboard.class.php

server/lib/service/xmdssoap.class.php

server/locale/dbtranslate.php

server/manual/content/routes.php

server/manual/content/toc_library.php

server/manual/content/toc_user_and_display.php

server/modules/datasetview.module.php

server/modules/module_user_general.php

server/modules/preview/HtmlTemplateForGetResource.html

server/modules/preview/html-preview.js

server/modules/preview/xibo-text-render.js

server/modules/text.module.php

server/modules/ticker.module.php

server/theme/default/css/xibo.css

server/theme/default/html/footer.php

server/theme/default/html/library_form_media_add.php

server/theme/default/html/library_form_media_edit.php

server/theme/default/html/media_form_ticker_add.php

server/theme/default/html/media_form_ticker_edit.php

server/theme/default/html/media_form_webpage_add.php

server/theme/default/html/media_form_webpage_edit.php

server/theme/default/html/module_page_grid.php

server/theme/default/js/xibo-forms.js

server/theme/default/js/xibo-layout-designer.js

server/theme/default/libraries/ckeditor/config.js

Show diffs side-by-side

added added

removed removed

server/3rdparty/simplepie/library/SimplePie/File.php

server/install/database/46.php

server/install/database/66.sql

server/install/database/67.sql

server/install/master/data.sql

server/install/master/structure.sql

server/lib/app/kit.class.php

server/lib/app/modulemanager.class.php

server/lib/app/pagemanager.class.php

server/lib/app/thememanager.class.php

server/lib/data/display.data.class.php

server/lib/data/displaygroup.data.class.php

server/lib/data/layout.data.class.php

server/lib/data/lkmediadisplaygroup.data.class.php

server/lib/data/media.data.class.php

server/lib/data/schedule.data.class.php

server/lib/include.php

server/lib/modules/module.class.php

server/lib/pages/content.class.php

server/lib/pages/display.class.php

server/lib/pages/displaygroup.class.php

server/lib/pages/layout.class.php

server/lib/pages/module.class.php

server/lib/pages/schedule.class.php

server/lib/pages/stats.class.php

server/lib/pages/statusdashboard.class.php

server/lib/service/xmdssoap.class.php

server/locale/dbtranslate.php

server/manual/content/admin/file_associations_form.png

server/manual/content/admin/file_associations_menu.png

server/manual/content/admin/fileassociations.php

server/manual/content/content/content_genericfile.php

server/manual/content/routes.php

server/manual/content/toc_library.php

server/manual/content/toc_user_and_display.php

server/modules/datasetview.module.php

server/modules/genericfile.module.php

server/modules/module_user_general.php

server/modules/preview/HtmlTemplateForGetResource.html

server/modules/preview/html-preview.js

server/modules/preview/xibo-text-render.js

server/modules/text.module.php

server/modules/ticker.module.php

server/theme/default/css/xibo.css

server/theme/default/html/display_form_version_instructions.php

server/theme/default/html/displaygroup_fileassociations_form_assign.php

server/theme/default/html/displaygroup_fileassociations_form_assign_list.php

server/theme/default/html/library_form_media_add.php

server/theme/default/html/library_form_media_edit.php

server/theme/default/html/media_form_ticker_add.php

server/theme/default/html/media_form_ticker_edit.php

server/theme/default/html/media_form_webpage_add.php

server/theme/default/html/media_form_webpage_edit.php

server/theme/default/html/module_page_grid.php

server/theme/default/js/xibo-forms.js

server/theme/default/js/xibo-layout-designer.js

server/theme/default/libraries/bootstrap/js/bootstrap-ckeditor-fix.js

server/theme/default/libraries/ckeditor/config.js

Older »