« back to all changes in this revision
Viewing changes to server/manual/content/admin/settings_overview.png
- 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
added
removed
server/manual/content/admin/settings_overview.png
