Viewing all changes in revision 297.
- 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
expand all
collapse all
added
removed
server/manual/content/admin/api_oauth_log.png
server/manual/content/admin/api_register_application.png
server/manual/content/admin/display_action_menu.png
server/manual/content/admin/eer_1.4.png
server/manual/content/admin/report_fault_wizard.png
server/manual/content/admin/sa_advanced.png
server/manual/content/admin/sa_advanced_sessions.png
server/manual/content/admin/sa_api.png
server/manual/content/admin/sa_display_delete.png
server/manual/content/admin/sa_display_edit.png
server/manual/content/admin/sa_display_group_members.png
server/manual/content/admin/sa_display_groups.png
server/manual/content/admin/sa_display_media_inventory.png
server/manual/content/admin/sa_display_statistic.png
server/manual/content/admin/sa_display_wol.png
server/manual/content/admin/sa_displays.png
server/manual/content/admin/sa_modules.png
server/manual/content/admin/sa_modules_text.png
server/manual/content/admin/sa_modules_video.png
server/manual/content/admin/theme_folder_structure.png
server/manual/content/config/pm.png
server/manual/content/config/settings_adv.png
server/manual/content/config/settings_app.png
server/manual/content/config/settings_gen.png
server/manual/content/config/settings_proxy.png
server/manual/content/config/settings_reg.png
server/manual/content/content/dataset_action_menu.png
server/manual/content/content/dataset_delete_form.png
server/manual/content/content/dataset_edit_form.png
server/manual/content/content/dataset_importcsv_form.png
server/manual/content/content/library_add_dataset.png
server/manual/content/content/library_add_image.png
server/manual/content/content/library_dataset_table.png
server/manual/content/content/library_file_upload.png
server/manual/content/content/library_media.png
server/manual/content/content/library_media_actionmenu.png
server/manual/content/content/library_media_add.png
server/manual/content/content/library_media_delete.png
server/manual/content/content/library_media_edit.png
server/manual/content/content/library_media_filter.png
server/manual/content/content/library_submenu.png
server/manual/content/content/ss_layout_add_dataset.png
server/manual/content/content/ss_layout_dataset_column.png
server/manual/content/content/ss_layout_dataset_row.png
server/manual/content/coreconcepts/change_password_form.png
server/manual/content/coreconcepts/dashboard_admin.png
server/manual/content/coreconcepts/login_box.png
server/manual/content/coreconcepts/navbar.png
server/manual/content/install/offline_download_client_operation.png
server/manual/content/install/offline_download_client_settings.png
server/manual/content/install/pm.png
server/manual/content/install/settings_adv.png
server/manual/content/install/settings_app.png
server/manual/content/install/settings_gen.png
server/manual/content/install/settings_proxy.png
server/manual/content/install/settings_reg.png
server/manual/content/install/win32_install_admin_user.png
server/manual/content/install/win32_install_admin_user_thumb.png
server/manual/content/install/win32_install_database_existing.png
server/manual/content/install/win32_install_database_existing_thumb.png
server/manual/content/install/win32_install_database_new.png
server/manual/content/install/win32_install_database_new_thumb.png
server/manual/content/install/win32_install_database_progress.png
server/manual/content/install/win32_install_database_progress_thumb.png
server/manual/content/install/win32_install_database_step1.png
server/manual/content/install/win32_install_database_step1_thumb.png
server/manual/content/install/win32_install_extracted.png
server/manual/content/install/win32_install_extracted_thumb.png
server/manual/content/install/win32_install_prereq.png
server/manual/content/install/win32_install_prereq_thumb.png
server/manual/content/install/win32_install_settings.png
server/manual/content/install/win32_install_settings_thumb.png
server/manual/content/install/win32_install_start.png
server/manual/content/install/win32_install_start_thumb.png
server/manual/content/install/win32_install_success.png
server/manual/content/install/win32_install_success_login.png
server/manual/content/install/win32_install_success_login_thumb.png
server/manual/content/install/win32_install_success_thumb.png
server/manual/content/layout/Reorder-Items-on-Timeline.png
server/manual/content/layout/Ss_layout_campaign.png
server/manual/content/layout/Ss_layout_campaign_add.png
server/manual/content/layout/Ss_layout_campaign_edit.png
server/manual/content/layout/Ss_layout_campaign_layout.png
server/manual/content/layout/Ss_layout_copy.png
server/manual/content/layout/Ss_layout_delete.png
server/manual/content/layout/Ss_layout_designer.png
server/manual/content/layout/Ss_layout_designer_add_counter.png
server/manual/content/layout/Ss_layout_designer_add_embedded.png
server/manual/content/layout/Ss_layout_designer_add_flash.png
server/manual/content/layout/Ss_layout_designer_add_image.png
server/manual/content/layout/Ss_layout_designer_add_powerpoint.png
server/manual/content/layout/Ss_layout_designer_add_region.png
server/manual/content/layout/Ss_layout_designer_add_shellcommand.png
server/manual/content/layout/Ss_layout_designer_add_text.png
server/manual/content/layout/Ss_layout_designer_add_ticker.png
server/manual/content/layout/Ss_layout_designer_add_video.png
server/manual/content/layout/Ss_layout_designer_add_webpage.png
server/manual/content/layout/Ss_layout_designer_background.png
server/manual/content/layout/Ss_layout_designer_delete_region.png
server/manual/content/layout/Ss_layout_designer_preview.png
server/manual/content/layout/Ss_layout_designer_region_timeline.png
server/manual/content/layout/Ss_layout_edit.png
server/manual/content/layout/Ss_layout_region_contentedit.png
server/manual/content/layout/Ss_layout_region_options.png
server/manual/content/layout/Ss_layout_region_permissions.png
server/manual/content/layout/TextProp.gif
server/manual/content/layout/Textcolor.gif
server/manual/content/layout/addlayout.png
server/manual/content/layout/campaign_action_menu.png
server/manual/content/layout/layout_administration.png
server/manual/content/layout/layout_administration_action.png
server/manual/content/layout/layout_administration_filter.png
server/manual/content/layout/layout_designer_options_menu.png
server/manual/content/layout/layout_designer_region_menu.png
server/manual/content/layout/layout_designer_region_resize.png
server/manual/content/layout/layout_media_delete_form.png
server/manual/content/layout/layoutpermission.png
server/manual/content/layout/region_timeline_transition_form.png
server/manual/content/layout/region_timeline_transition_menu.png
server/manual/content/layout/ss_layout_dataset_addview.png
server/manual/content/layout/ss_layout_dataset_view_edit.png
server/manual/content/layout/ss_layout_designer_add_library.png
server/manual/content/layout/ss_layout_designer_jumpto.png
server/manual/content/layout/timeline_ticker_dataset_edit.png
server/manual/content/layout/timeline_ticker_feed_edit.png
server/manual/content/layout/transition_admin.png
server/manual/content/schedule/calendar_month_view.png
server/manual/content/schedule/schedule_delete_event.png
server/manual/content/schedule/schedule_event.png
server/manual/content/schedule/schedule_now.png
server/manual/content/templates/template_edit_resolution.png
server/manual/content/templates/template_resolution.png
server/manual/content/templates/template_save_from_layout.png
server/manual/content/templates/template_standard.png
server/manual/content/users/group_admin_page.png
server/manual/content/users/group_member.png
server/manual/content/users/user_admin_page.png
server/manual/content/users/user_menu_security.png
server/manual/content/users/user_page_security.png
server/manual/content/users/user_permissions.png
server/manual/content/users/users_myapplications.png
server/manual/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
server/theme/default/img/ajax-loader.gif
server/theme/default/libraries/ckeditor/plugins/codemirror/icons/AutoComplete.png
server/theme/default/libraries/ckeditor/plugins/codemirror/icons/AutoFormat.png
server/theme/default/libraries/ckeditor/plugins/codemirror/icons/CommentSelectedRange.png
server/theme/default/libraries/ckeditor/plugins/codemirror/icons/SearchCode.png
server/theme/default/libraries/ckeditor/plugins/codemirror/icons/UncommentSelectedRange.png
server/theme/default/libraries/ckeditor/plugins/gg/images/gg.png
server/theme/default/libraries/ckeditor/plugins/icons.png
server/theme/default/libraries/ckeditor/plugins/icons_hidpi.png
server/theme/default/libraries/ckeditor/plugins/justify/icons/hidpi/justifyblock.png
server/theme/default/libraries/ckeditor/plugins/justify/icons/hidpi/justifycenter.png
server/theme/default/libraries/ckeditor/plugins/justify/icons/hidpi/justifyleft.png
server/theme/default/libraries/ckeditor/plugins/justify/icons/hidpi/justifyright.png
server/theme/default/libraries/ckeditor/plugins/justify/icons/justifyblock.png
server/theme/default/libraries/ckeditor/plugins/justify/icons/justifycenter.png
server/theme/default/libraries/ckeditor/plugins/justify/icons/justifyleft.png
server/theme/default/libraries/ckeditor/plugins/justify/icons/justifyright.png
server/theme/default/libraries/ckeditor/plugins/link/images/anchor.png
server/theme/default/libraries/ckeditor/plugins/link/images/hidpi/anchor.png
server/theme/default/libraries/ckeditor/plugins/magicline/images/hidpi/icon.png
server/theme/default/libraries/ckeditor/plugins/qrc/images/qrc.png
server/theme/default/libraries/ckeditor/plugins/qrc/images/qrc400.png
server/theme/default/libraries/ckeditor/plugins/showblocks/images/block_address.png
server/theme/default/libraries/ckeditor/plugins/showblocks/images/block_blockquote.png
server/theme/default/libraries/ckeditor/plugins/showblocks/images/block_div.png
server/theme/default/libraries/ckeditor/plugins/showblocks/images/block_h1.png
server/theme/default/libraries/ckeditor/plugins/showblocks/images/block_h2.png
server/theme/default/libraries/ckeditor/plugins/showblocks/images/block_h3.png
server/theme/default/libraries/ckeditor/plugins/showblocks/images/block_h4.png
server/theme/default/libraries/ckeditor/plugins/showblocks/images/block_h5.png
server/theme/default/libraries/ckeditor/plugins/showblocks/images/block_h6.png
server/theme/default/libraries/ckeditor/plugins/showblocks/images/block_p.png
server/theme/default/libraries/ckeditor/plugins/showblocks/images/block_pre.png
server/theme/default/libraries/ckeditor/skins/moono/icons.png
server/theme/default/libraries/ckeditor/skins/moono/icons_hidpi.png
server/theme/default/libraries/ckeditor/skins/moono/images/close.png
server/theme/default/libraries/ckeditor/skins/moono/images/hidpi/close.png
server/theme/default/libraries/ckeditor/skins/moono/images/hidpi/lock-open.png
server/theme/default/libraries/ckeditor/skins/moono/images/hidpi/lock.png
server/theme/default/libraries/ckeditor/skins/moono/images/hidpi/refresh.png
server/theme/default/libraries/ckeditor/skins/moono/images/lock-open.png
server/theme/default/libraries/ckeditor/skins/moono/images/lock.png
server/theme/default/libraries/ckeditor/skins/moono/images/refresh.png
