Viewing all changes in revision 341.
- Committer: Dan Garner
- Date: 2014-09-19 11:56:41 UTC
- mfrom: (332.8.73 server-170-alpha)
- Revision ID: dan@xibo.org.uk-20140919115641-pwvuhq0cy4xkmytq
Merged lp:~dangarner/xibo/server-170alpha
- files added:
- Vagrantfile
- library
- server-tests
- server-tests/features
- server-tests/features/step_definitions
- server-tests/features/support
- server/modules/theme
- server/theme/default/fonts
- server/theme/default/img/screenshots
- server/theme/default/libraries/bootstrap-colorpicker
- server/theme/default/libraries/bootstrap-colorpicker/css
- server/theme/default/libraries/bootstrap-colorpicker/img
- server/theme/default/libraries/bootstrap-colorpicker/img/bootstrap-colorpicker
- server/theme/default/libraries/bootstrap-colorpicker/js
- server/theme/default/libraries/bootstrap-datetimepicker
- server/theme/default/libraries/bootstrap-datetimepicker/css
- server/theme/default/libraries/bootstrap-datetimepicker/js
- server/theme/default/libraries/bootstrap-datetimepicker/js/locales
- server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.pt-BR.js
- server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js
- server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.zh-TW.js
- server/theme/default/libraries/bootstrap-select
- server/theme/default/libraries/bootstrap-select/css
- server/theme/default/libraries/bootstrap-select/js
- server/theme/default/libraries/bootstrap/fonts
- server/theme/default/libraries/calendar
- server/theme/default/libraries/calendar/css
- server/theme/default/libraries/calendar/img
- server/theme/default/libraries/calendar/js
- server/theme/default/libraries/calendar/js/language
- server/theme/default/libraries/calendar/tmpls
- server/theme/default/libraries/font-awesome
- server/theme/default/libraries/font-awesome/css
- server/theme/default/libraries/font-awesome/fonts
- server/theme/default/libraries/jstimezonedetect
- server/theme/default/libraries/morrisjs
- server/theme/default/libraries/underscore
- files removed:
- server/install/dot_amber.gif
- server/theme/default/libraries/bootstrap/img
- server/theme/default/libraries/flot
- files renamed:
- server/install/install.css => server/theme/default/css/install.css
- server/theme/default/html/library_form_media_edit.php => server/theme/default/html/form_file_upload_single.php
- server/install/footer.inc => server/theme/default/html/install_footer.php
- server/install/header.inc => server/theme/default/html/install_header.php
- files modified:
- .bzrignore
expand all
collapse all
added
removed
server/install/dot_amber.gif
server/install/dot_green.gif
server/install/dot_red.gif
server/manual/content/admin/display_profile_edit.png
server/manual/content/admin/display_profile_grid.png
server/manual/content/admin/display_profile_set_on_display.png
server/manual/content/admin/modules_install_list.png
server/manual/content/admin/sa_setting_content.png
server/manual/content/admin/sa_setting_default.png
server/manual/content/admin/sa_setting_error.png
server/manual/content/admin/sa_setting_general.png
server/manual/content/admin/sa_setting_maintenance.png
server/manual/content/admin/sa_setting_path.png
server/manual/content/admin/sa_setting_permissions.png
server/manual/content/admin/settings_overview.png
server/manual/content/install/settings_gen.png
server/manual/content/layout/addlayout.png
server/manual/content/templates/template_resolution.png
server/manual/content/templates/template_standard.png
server/modules/theme/clock_bg_modern_dark.png
server/modules/theme/clock_bg_modern_light.png
server/theme/default/fonts/montserrat-regular-webfont.svg
server/theme/default/img/ajax-loader.gif
server/theme/default/img/avatar.jpg
server/theme/default/img/screenshots/calendar_screenshot.png
server/theme/default/img/screenshots/display_add_screenshot.png
server/theme/default/img/screenshots/layout_design_screenshot.png
server/theme/default/img/timeline/blue_bar.gif
server/theme/default/img/timeline/green_bar.gif
server/theme/default/img/timeline/grey_bar.gif
server/theme/default/img/timeline/orange_bar.gif
server/theme/default/img/timeline/purple_bar.gif
server/theme/default/img/timeline/red_bar.gif
server/theme/default/img/timeline/yellow_bar.gif
server/theme/default/libraries/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
server/theme/default/libraries/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
server/theme/default/libraries/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png
server/theme/default/libraries/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
server/theme/default/libraries/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
server/theme/default/libraries/bootstrap/fonts/glyphicons-halflings-regular.svg
server/theme/default/libraries/bootstrap/img/glyphicons-halflings-white.png
server/theme/default/libraries/bootstrap/img/glyphicons-halflings.png
server/theme/default/libraries/calendar/img/dark_wood.png
server/theme/default/libraries/calendar/img/slide-bg.png
server/theme/default/libraries/calendar/img/tick.png
server/theme/default/libraries/font-awesome/fonts/fontawesome-webfont.svg
