lp:~dangarner/xibo/106-server

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:xibo/1.1

Xibo Maintainters: Pending requested 2010-02-02

Diff: 21123 lines (+18293/-1829) (has conflicts)

56 files modified

server/install.php (+613/-0)
server/install/database/1.sql (+715/-0)
server/install/database/10.sql (+30/-0)
server/install/database/5.sql.OTHER (+3/-0)
server/install/database/8.sql (+40/-20)
server/install/database/9.sql (+19/-0)
server/lib/app/app_functions.php (+642/-0)
server/lib/app/debug.class.php (+193/-0)
server/lib/app/formmanager.class.php (+155/-0)
server/lib/app/helpmanager.class.php (+97/-0)
server/lib/app/kit.class.php (+303/-1)
server/lib/app/menumanager.class.php (+115/-0)
server/lib/app/pagemanager.class.php (+144/-0)
server/lib/app/session.class.php (+30/-26)
server/lib/data/data.class.php (+82/-0)
server/lib/data/resolution.data.class.php (+99/-0)
server/lib/data/setting.data.class.php (+44/-0)
server/lib/include.php (+126/-0)
server/lib/js/core.js (+102/-0)
server/lib/js/display.js (+22/-1)
server/lib/js/layout.js (+358/-0)
server/lib/js/resolution.js (+19/-0)
server/lib/js/schedule.js (+145/-0)
server/lib/modules/module.class.php (+577/-0)
server/lib/pages/content.class.php (+14/-0)
server/lib/pages/fault.class.php (+315/-0)
server/lib/pages/layout.class.php (+219/-70)
server/lib/pages/module.class.php (+56/-0)
server/lib/pages/region.class.php (+521/-0)
server/lib/pages/resolution.class.php (+326/-0)
server/lib/pages/schedule.class.php (+10/-0)
server/lib/pages/user.class.php (+709/-0)
server/lib/xmds.inc.php (+88/-0)
server/modules/embedded.module.php (+282/-0)
server/modules/flash.module.php (+1871/-934)
server/modules/image.module.php (+967/-0)
server/modules/module_db_mysql.php (+314/-129)
server/modules/module_user_general.php (+619/-0)
server/modules/powerpoint.module.php (+938/-0)
server/modules/text.module.php (+599/-280)
server/modules/ticker.module.php (+689/-325)
server/modules/video.module.php (+924/-0)
server/modules/webpage.module.php (+248/-0)
server/template/css/forms.css (+295/-0)
server/template/css/ie8.css (+23/-0)
server/template/css/presentation.css (+1285/-0)
server/template/css/xibo.css (+39/-1)
server/template/footer.php (+43/-0)
server/template/header.php (+162/-0)
server/template/pages/fault_view.php (+87/-41)
server/template/pages/login_box.php (+107/-1)
server/template/pages/login_box_ajax.php (+25/-0)
server/template/pages/resolution_view.php (+45/-0)
server/template/pages/schedule_month_view.php.OTHER (+140/-0)
server/upgrade.php.OTHER (+598/-0)
server/xmds.php (+1062/-0)

api

Merged into lp:xibo/1.0

Xibo Maintainters: Pending requested 2010-02-02

Diff: 2253 lines api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #376585: Can not change order of display of content when same media is used more than once	Medium	Fix Released
Bug #497166: Cannot add new resolutions	Medium	Fix Released
Bug #497167: Region preview differs from what is actually shown on the client	Medium	Fix Released
Bug #497170: Adding a background image from the layout designer	Medium	Fix Released
Bug #497177: Not clear what units are expected for duration	Medium	Fix Released
Bug #497178: When adding something to a region the preview does not refresh	Medium	Fix Released
Bug #501789: Not able to logout when "Homepage and Login" security not assigned	Wishlist	Fix Released
Bug #502118: Impossible to access items on the Management Menu in IE8	Medium	Fix Released
Bug #502456: Spelling of PowerPoint	Wishlist	Fix Released
Bug #502749: Error installing 1.1.0 when importing SQL-queries	Medium	Fix Released
Bug #509638: Layout XML cannot be longer than 64k	High	Fix Released
Bug #511924: Incorrect foreign key reference created in 1.sql	Undecided	Fix Released

Link a bug report

Related blueprints

109. By Dan Garner on 2010-01-30

[server] thumbnails and background images no longer created at upload/background edit point. They are generated dynamically each time they are requested. Means they can be requested by ID alone

108. By Dan Garner on 2010-01-30

[server] Added some new helper methods to the db object. Altered the GetImage method in modules to require an ID and then look up the image URI.

107. By Dan Garner on 2010-01-24

[server] Increased the size of the XML field on the layout table

106. By Dan Garner on 2010-01-24

[server] Fixed foreign key reference

105. By Dan Garner on 2010-01-17

[server] Can add a background directly from the layout designer in two steps.

104. By Dan Garner on 2010-01-17

[server] Attempt to get the font-family correct. Defaults to Times New Roman in the preview - the same as the client. And insists on a font size of 1em.

103. By Dan Garner on 2010-01-17

[server] Used sprintf for the session expiry

102. By Dan Garner on 2010-01-17

[server] Added code to clear up very old sessions (clogging up the table). Still unsure why sometimes sessions cannot be re-logged in

101. By Dan Garner on 2010-01-17

[server] Included an IE8 only css file which fixes the management menu

100. By Dan Garner on 2010-01-17

[server] Moved region size/coords over to the right... they were getting in the way of text items