« back to all changes in this revision
Viewing changes to server/manual/content/users/user_admin_page.png
- Committer: Dan Garner
- Date: 2014-01-19 14:06:56 UTC
- mfrom: (292.1.48 server-160rc1)
- Revision ID: dan@xibo.org.uk-20140119140656-4xqs9tjqlgcbaaq9
Merged 1.6.0rc1 manual branch.
- files added:
- server/install/database/66.sql
- server/manual/lib/bootstrap
- server/manual/lib/bootstrap/css
- server/manual/lib/bootstrap/fonts
- server/manual/lib/bootstrap/js
- server/manual/lib/jquery
- server/theme/default/libraries/ckeditor/plugins/codemirror
- server/theme/default/libraries/ckeditor/plugins/codemirror/css
- server/theme/default/libraries/ckeditor/plugins/codemirror/icons
- server/theme/default/libraries/ckeditor/plugins/codemirror/js
- server/theme/default/libraries/ckeditor/plugins/codemirror/theme
- server/theme/default/libraries/ckeditor/plugins/div
- server/theme/default/libraries/ckeditor/plugins/div/dialogs
- server/theme/default/libraries/ckeditor/plugins/gg
- server/theme/default/libraries/ckeditor/plugins/gg/images
- server/theme/default/libraries/ckeditor/plugins/justify
- server/theme/default/libraries/ckeditor/plugins/justify/icons
- server/theme/default/libraries/ckeditor/plugins/justify/icons/hidpi
- server/theme/default/libraries/ckeditor/plugins/justify/lang
- server/theme/default/libraries/ckeditor/plugins/link/images/hidpi
- server/theme/default/libraries/ckeditor/plugins/magicline/images/hidpi
- server/theme/default/libraries/ckeditor/plugins/qrc
- server/theme/default/libraries/ckeditor/plugins/qrc/images
- server/theme/default/libraries/ckeditor/plugins/showblocks
- server/theme/default/libraries/ckeditor/plugins/showblocks/images
- server/theme/default/libraries/ckeditor/skins/moono/images/hidpi
- files removed:
- server/manual/content/admin/sa_modules_text.png
- server/manual/content/config
- server/manual/template
- files renamed:
- server/manual/content/admin/api.php => server/manual/content/admin/api_overview.php
- server/manual/content/layout/content_flash.php => server/manual/content/content/content_flash.php
- server/manual/content/layout/content_image.php => server/manual/content/content/content_image.php
- server/manual/content/layout/content_powerpoint.php => server/manual/content/content/content_powerpoint.php
- server/manual/content/layout/content_video.php => server/manual/content/content/content_video.php
- server/manual/content/layout/ss_layout_add_dataset.png => server/manual/content/content/ss_layout_add_dataset.png
- server/manual/content/layout/ss_layout_dataset_column.png => server/manual/content/content/ss_layout_dataset_column.png
- server/manual/content/layout/ss_layout_dataset_row.png => server/manual/content/content/ss_layout_dataset_row.png
- server/manual/content/dashboard/ => server/manual/content/coreconcepts/
- files modified:
- server/README.TXT
added
removed
server/manual/content/users/user_admin_page.png
