← Back to branch summary

~xibo-maintainers/xibo/head-15-fix

~xibo-maintainers/xibo/head-15-fix

Viewing all changes in revision 288.

Committer: Dan Garner
Date: 2013-11-06 14:58:30 UTC
mfrom: (286.2.66 server-152)
Revision ID: dan@xibo.org.uk-20131106145830-8qfn5apcuwpekgtu

Merged bzr+ssh://bazaar.launchpad.net/~dangarner/xibo/server-152/. Reverted server/upgrade.php

files added:
server/install/database/65.sql

server/lib/app/pdoconnect.class.php

files removed:
server/theme/default/html/login_form.php

files modified:
client/dotNET/DataSetView.cs

client/dotNET/LogMessage.cs

client/dotNET/MainForm.cs

client/dotNET/Properties/Resources.Designer.cs

client/dotNET/Properties/Settings.Designer.cs

client/dotNET/Properties/Settings.settings

client/dotNET/RegionOptions.cs

client/dotNET/Rss.cs

client/dotNET/Text.cs

client/dotNET/Web References/xmds/Reference.cs

client/dotNET/WebContent.cs

client/dotNET/XiboClient.csproj

client/dotNET/XiboTraceListener.cs

client/dotNET/XmdsAgents/FileAgent.cs

client/dotNET/app.config

server/3rdparty/jquery-file-upload/UploadHandler.php

server/config/config.class.php

server/install.php

server/install/database/46.php

server/install/master/data.sql

server/lib/app/app_functions.php

server/lib/app/debug.class.php

server/lib/app/kit.class.php

server/lib/app/pagemanager.class.php

server/lib/app/responsemanager.class.php

server/lib/app/session.class.php

server/lib/app/thememanager.class.php

server/lib/app/translationengine.class.php

server/lib/data/campaign.data.class.php

server/lib/data/campaignsecurity.data.class.php

server/lib/data/data.class.php

server/lib/data/dataset.data.class.php

server/lib/data/datasetcolumn.data.class.php

server/lib/data/datasetdata.data.class.php

server/lib/data/datasetgroupsecurity.data.class.php

server/lib/data/display.data.class.php

server/lib/data/displaygroup.data.class.php

server/lib/data/displaygroupsecurity.data.class.php

server/lib/data/file.data.class.php

server/lib/data/help.data.class.php

server/lib/data/layout.data.class.php

server/lib/data/layoutmediagroupsecurity.data.class.php

server/lib/data/layoutregiongroupsecurity.data.class.php

server/lib/data/maintenance.data.class.php

server/lib/data/media.data.class.php

server/lib/data/mediagroupsecurity.data.class.php

server/lib/data/region.data.class.php

server/lib/data/resolution.data.class.php

server/lib/data/schedule.data.class.php

server/lib/data/setting.data.class.php

server/lib/data/stat.data.class.php

server/lib/data/template.data.class.php

server/lib/data/templategroupsecurity.data.class.php

server/lib/data/userdata.data.class.php

server/lib/data/usergroup.data.class.php

server/lib/include.php

server/lib/modules/module.class.php

server/lib/oauth.inc.php

server/lib/pages/admin.class.php

server/lib/pages/campaign.class.php

server/lib/pages/content.class.php

server/lib/pages/dataset.class.php

server/lib/pages/display.class.php

server/lib/pages/displaygroup.class.php

server/lib/pages/fault.class.php

server/lib/pages/group.class.php

server/lib/pages/help.class.php

server/lib/pages/index.class.php

server/lib/pages/layout.class.php

server/lib/pages/log.class.php

server/lib/pages/module.class.php

server/lib/pages/oauth.class.php

server/lib/pages/resolution.class.php

server/lib/pages/schedule.class.php

server/lib/pages/sessions.class.php

server/lib/pages/stats.class.php

server/lib/pages/template.class.php

server/lib/pages/timeline.class.php

server/lib/pages/transition.class.php

server/lib/pages/user.class.php

server/lib/service/rest.class.php

server/lib/service/restjson.class.php

server/lib/service/restxml.class.php

server/lib/service/serviceresponse.class.php

server/lib/service/xmdssoap.class.php

server/lib/xmds.inc.php

server/locale/dbtranslate.php

server/maintenance.php

server/modules/counter.module.php

server/modules/datasetview.module.php

server/modules/embedded.module.php

server/modules/flash.module.php

server/modules/localvideo.module.php

server/modules/microblog.module.php

server/modules/module_user_general.php

server/modules/module_user_ldap.php

server/modules/powerpoint.module.php

server/modules/preview/HtmlTemplateForGetResource.html

server/modules/preview/xibo-text-render.js

server/modules/shellcommand.module.php

server/modules/text.module.php

server/modules/ticker.module.php

server/modules/webpage.module.php

server/services.php

server/theme/default/html/application_form_register.php

server/theme/default/html/application_verify.php

server/theme/default/html/campaign_form_add.php

server/theme/default/html/campaign_form_layout_assign_list.php

server/theme/default/html/display_form_mediainventory.php

server/theme/default/html/displaygroup_form_add.php

server/theme/default/html/help_form_add.php

server/theme/default/html/layout_designer.php

server/theme/default/html/layout_form_add.php

server/theme/default/html/layout_page_grid.php

server/theme/default/html/library_form_media_add.php

server/theme/default/html/library_page.php

server/theme/default/html/log_form_truncate.php

server/theme/default/html/login_page.php

server/theme/default/html/media_form_embedded_add.php

server/theme/default/html/media_form_embedded_edit.php

server/theme/default/html/media_form_webpage_add.php

server/theme/default/html/media_form_webpage_edit.php

server/theme/default/html/resolution_form_add.php

server/theme/default/html/user_form_change_password.php

server/theme/default/html/usergroup_form_add.php

server/theme/default/img/dashboard/add_content.png

server/theme/default/img/dashboard/content.png

server/theme/default/img/dashboard/contentadd.png

server/theme/default/img/dashboard/datasets.png

server/theme/default/img/dashboard/edit_content.png

server/theme/default/img/dashboard/graph.png

server/theme/default/img/dashboard/help.png

server/theme/default/img/dashboard/layouts.png

server/theme/default/img/dashboard/license.png

server/theme/default/img/dashboard/playlistadd.png

server/theme/default/img/dashboard/presentations.png

server/theme/default/img/dashboard/scan.png

server/theme/default/img/dashboard/scheduleview.png

server/theme/default/img/dashboard/settings.png

server/theme/default/img/dashboard/users.png

server/theme/default/js/xibo-cms.js

server/theme/default/js/xibo-forms.js

server/theme/default/js/xibo-layout-designer.js

Show diffs side-by-side

added added

removed removed

client/dotNET/DataSetView.cs

client/dotNET/LogMessage.cs

client/dotNET/MainForm.cs

client/dotNET/Properties/Resources.Designer.cs

client/dotNET/Properties/Settings.Designer.cs

client/dotNET/Properties/Settings.settings

client/dotNET/RegionOptions.cs

client/dotNET/Rss.cs

client/dotNET/Text.cs

client/dotNET/Web References/xmds/Reference.cs

client/dotNET/WebContent.cs

client/dotNET/XiboClient.csproj

client/dotNET/XiboTraceListener.cs

client/dotNET/XmdsAgents/FileAgent.cs

client/dotNET/app.config

server/3rdparty/jquery-file-upload/UploadHandler.php

server/config/config.class.php

server/install.php

server/install/database/46.php

server/install/database/65.sql

server/install/master/data.sql

server/lib/app/app_functions.php

server/lib/app/debug.class.php

server/lib/app/kit.class.php

server/lib/app/pagemanager.class.php

server/lib/app/pdoconnect.class.php

server/lib/app/responsemanager.class.php

server/lib/app/session.class.php

server/lib/app/thememanager.class.php

server/lib/app/translationengine.class.php

server/lib/data/campaign.data.class.php

server/lib/data/campaignsecurity.data.class.php

server/lib/data/data.class.php

server/lib/data/dataset.data.class.php

server/lib/data/datasetcolumn.data.class.php

server/lib/data/datasetdata.data.class.php

server/lib/data/datasetgroupsecurity.data.class.php

server/lib/data/display.data.class.php

server/lib/data/displaygroup.data.class.php

server/lib/data/displaygroupsecurity.data.class.php

server/lib/data/file.data.class.php

server/lib/data/help.data.class.php

server/lib/data/layout.data.class.php

server/lib/data/layoutmediagroupsecurity.data.class.php

server/lib/data/layoutregiongroupsecurity.data.class.php

server/lib/data/maintenance.data.class.php

server/lib/data/media.data.class.php

server/lib/data/mediagroupsecurity.data.class.php

server/lib/data/region.data.class.php

server/lib/data/resolution.data.class.php

server/lib/data/schedule.data.class.php

server/lib/data/setting.data.class.php

server/lib/data/stat.data.class.php

server/lib/data/template.data.class.php

server/lib/data/templategroupsecurity.data.class.php

server/lib/data/userdata.data.class.php

server/lib/data/usergroup.data.class.php

server/lib/include.php

server/lib/modules/module.class.php

server/lib/oauth.inc.php

server/lib/pages/admin.class.php

server/lib/pages/campaign.class.php

server/lib/pages/content.class.php

server/lib/pages/dataset.class.php

server/lib/pages/display.class.php

server/lib/pages/displaygroup.class.php

server/lib/pages/fault.class.php

server/lib/pages/group.class.php

server/lib/pages/help.class.php

server/lib/pages/index.class.php

server/lib/pages/layout.class.php

server/lib/pages/log.class.php

server/lib/pages/module.class.php

server/lib/pages/oauth.class.php

server/lib/pages/resolution.class.php

server/lib/pages/schedule.class.php

server/lib/pages/sessions.class.php

server/lib/pages/stats.class.php

server/lib/pages/template.class.php

server/lib/pages/timeline.class.php

server/lib/pages/transition.class.php

server/lib/pages/user.class.php

server/lib/service/rest.class.php

server/lib/service/restjson.class.php

server/lib/service/restxml.class.php

server/lib/service/serviceresponse.class.php

server/lib/service/xmdssoap.class.php

server/lib/xmds.inc.php

server/locale/dbtranslate.php

server/maintenance.php

server/modules/counter.module.php

server/modules/datasetview.module.php

server/modules/embedded.module.php

server/modules/flash.module.php

server/modules/localvideo.module.php

server/modules/microblog.module.php

server/modules/module_user_general.php

server/modules/module_user_ldap.php

server/modules/powerpoint.module.php

server/modules/preview/HtmlTemplateForGetResource.html

server/modules/preview/xibo-text-render.js

server/modules/shellcommand.module.php

server/modules/text.module.php

server/modules/ticker.module.php

server/modules/webpage.module.php

server/services.php

server/theme/default/html/application_form_register.php

server/theme/default/html/application_verify.php

server/theme/default/html/campaign_form_add.php

server/theme/default/html/campaign_form_layout_assign_list.php

server/theme/default/html/display_form_mediainventory.php

server/theme/default/html/displaygroup_form_add.php

server/theme/default/html/help_form_add.php

server/theme/default/html/layout_designer.php

server/theme/default/html/layout_form_add.php

server/theme/default/html/layout_page_grid.php

server/theme/default/html/library_form_media_add.php

server/theme/default/html/library_page.php

server/theme/default/html/log_form_truncate.php

server/theme/default/html/login_form.php

server/theme/default/html/login_page.php

server/theme/default/html/media_form_embedded_add.php

server/theme/default/html/media_form_embedded_edit.php

server/theme/default/html/media_form_webpage_add.php

server/theme/default/html/media_form_webpage_edit.php

server/theme/default/html/resolution_form_add.php

server/theme/default/html/user_form_change_password.php

server/theme/default/html/usergroup_form_add.php

server/theme/default/img/dashboard/add_content.png

server/theme/default/img/dashboard/content.png

server/theme/default/img/dashboard/contentadd.png

server/theme/default/img/dashboard/datasets.png

server/theme/default/img/dashboard/edit_content.png

server/theme/default/img/dashboard/graph.png

server/theme/default/img/dashboard/help.png

server/theme/default/img/dashboard/layouts.png

server/theme/default/img/dashboard/license.png

server/theme/default/img/dashboard/playlistadd.png

server/theme/default/img/dashboard/presentations.png

server/theme/default/img/dashboard/scan.png

server/theme/default/img/dashboard/scheduleview.png

server/theme/default/img/dashboard/settings.png

server/theme/default/img/dashboard/users.png

server/theme/default/js/xibo-cms.js

server/theme/default/js/xibo-forms.js

server/theme/default/js/xibo-layout-designer.js

Older »