Viewing all changes in revision 271.
- Committer: Dan Garner
- Date: 2013-04-11 16:58:02 UTC
- mfrom: (270.1.37 server-150-theme-pt2)
- Revision ID: dan@xibo.org.uk-20130411165802-pi5mde5d8aydrw91
Merged lp:~dangarner/xibo/server-150-theme-pt2
- files added:
- server/install/database/61.sql
- server/manual
- server/manual/content
- server/manual/content/admin
- server/manual/content/config
- server/manual/content/content
- server/manual/content/dashboard
- server/manual/content/install
- server/manual/content/layout
- server/manual/content/license
- server/manual/content/schedule
- server/manual/content/templates
- server/manual/content/users
- server/manual/css
- server/manual/img
- server/manual/lib
- server/manual/template
- server/theme/default/3rdparty
- files removed:
- server/template
- server/template/pages
- files renamed:
- server/3rdparty/ckeditor/ => server/theme/default/3rdparty/ckeditor/
- server/3rdparty/jQuery/ => server/theme/default/3rdparty/jQuery/
- server/theme/default/html/dashboard_page.php => server/theme/default/html/homepage_dashboard.php
- files modified:
- server/config/config.class.php
expand all
collapse all
added
removed
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_groups_edit.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/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/sa_setting_pwd.png
server/manual/content/admin/user_pwd_override.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/library_add_dataset.png
server/manual/content/content/library_add_image.png
server/manual/content/content/library_media.png
server/manual/content/content/library_media_add.png
server/manual/content/dashboard/dashboard_admin.png
server/manual/content/dashboard/dashboard_user.png
server/manual/content/dashboard/navbar.png
server/manual/content/install/securitywarning.png
server/manual/content/install/setup1.png
server/manual/content/install/setup2.png
server/manual/content/install/setup3.png
server/manual/content/install/setup4.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_microblog.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/layoutpermission.png
server/manual/content/layout/ss_layout_add_dataset.png
server/manual/content/layout/ss_layout_dataset_addview.png
server/manual/content/layout/ss_layout_dataset_column.png
server/manual/content/layout/ss_layout_dataset_row.png
server/manual/content/layout/ss_layout_dataset_table.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/schedule/calendar_month_view.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_standard.png
server/manual/content/users/group_admin_add.png
server/manual/content/users/group_admin_delete.png
server/manual/content/users/group_admin_edit.png
server/manual/content/users/group_admin_page.png
server/manual/content/users/group_member.png
server/manual/content/users/user_admin_add.png
server/manual/content/users/user_admin_edit.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/user_set_homepage.png
server/manual/content/users/user_types.png
server/manual/img/88x31.png
server/manual/img/file.gif
server/manual/img/folder.gif
server/manual/img/logo.png
server/manual/img/tv-collapsable-last.gif
server/manual/img/tv-collapsable.gif
server/manual/img/tv-item-last.gif
server/manual/img/tv-item.gif
server/manual/img/video_icon.png
server/theme/default/img/logos/complogo.png
server/theme/default/img/logos/logo.png
