Xibo

lp:~dangarner/xibo/server-162

Created by Dan Garner on 2014-05-29 and last modified on 2014-07-15

Get this branch:: bzr branch lp:~dangarner/xibo/server-162

Only Dan Garner can upload to this branch. If you are Dan Garner please log in for upload directions.

Branch merges

No branches dependent on this one.

Merged into lp:xibo/1.7 at revision 336

Xibo Maintainters: Pending requested 2014-07-15

Diff: 9040 lines (+4180/-1203)

101 files modified

client/dotNET/KeyStore.cs (+178/-0)
client/dotNET/MainForm.cs (+53/-39)
client/dotNET/OptionForm.Designer.cs (+76/-41)
client/dotNET/OptionForm.cs (+5/-1)
client/dotNET/Properties/Settings.Designer.cs (+24/-0)
client/dotNET/Properties/Settings.settings (+6/-0)
client/dotNET/XiboClient.csproj (+1/-0)
client/dotNET/app.config (+6/-0)
default.pot (+319/-288)
example_oauth/index.php (+239/-18)
example_oauth/nice-json.php (+73/-0)
example_oauth/test_files/test.csv (+6/-0)
server/3rdparty/simplepie/library/SimplePie/File.php (+4/-0)
server/3rdparty/simplepie/library/SimplePie/HTTP/Parser.php (+21/-0)
server/config/config.class.php (+3/-24)
server/install.php (+2/-2)
server/install/database/69.sql (+4/-0)
server/install/database/70.sql (+15/-0)
server/install/master/data.sql (+1/-1)
server/lib/app/kit.class.php (+5/-0)
server/lib/app/session.class.php (+1/-1)
server/lib/data/dataset.data.class.php (+165/-1)
server/lib/data/datasetcolumn.data.class.php (+88/-2)
server/lib/data/datasetdata.data.class.php (+177/-0)
server/lib/data/datasetgroupsecurity.data.class.php (+63/-2)
server/lib/data/file.data.class.php (+14/-0)
server/lib/data/layout.data.class.php (+17/-2)
server/lib/data/region.data.class.php (+59/-3)
server/lib/include.php (+7/-4)
server/lib/modules/module.class.php (+96/-64)
server/lib/oauth.inc.php (+1/-1)
server/lib/pages/admin.class.php (+1/-1)
server/lib/pages/campaign.class.php (+5/-5)
server/lib/pages/dataset.class.php (+33/-47)
server/lib/pages/display.class.php (+35/-6)
server/lib/pages/displaygroup.class.php (+37/-28)
server/lib/pages/fault.class.php (+3/-59)
server/lib/pages/group.class.php (+4/-4)
server/lib/pages/help.class.php (+3/-3)
server/lib/pages/index.class.php (+1/-1)
server/lib/pages/layout.class.php (+9/-6)
server/lib/pages/log.class.php (+45/-1)
server/lib/pages/module.class.php (+1/-1)
server/lib/pages/oauth.class.php (+1/-1)
server/lib/pages/resolution.class.php (+3/-3)
server/lib/pages/schedule.class.php (+91/-217)
server/lib/pages/sessions.class.php (+6/-4)
server/lib/pages/stats.class.php (+47/-7)
server/lib/pages/statusdashboard.class.php (+24/-18)
server/lib/pages/template.class.php (+3/-3)
server/lib/pages/timeline.class.php (+6/-6)
server/lib/pages/transition.class.php (+1/-1)
server/lib/pages/user.class.php (+12/-12)
server/lib/service/rest.class.php (+464/-8)
server/lib/service/restjson.class.php (+20/-16)
server/lib/service/xmdssoap.class.php (+15/-4)
server/locale/dbtranslate.php (+1/-0)
server/manual/content/admin/api_datasets.php (+615/-0)
server/manual/content/admin/api_library.php (+33/-15)
server/manual/content/admin/release_notes_1.6.1.php (+78/-0)
server/manual/content/admin/release_notes_1.6.2.php (+76/-0)
server/manual/content/routes.php (+3/-0)
server/manual/content/toc_developer_api.php (+1/-0)
server/manual/content/toc_developer_releasenotes.php (+2/-0)
server/manual/css/manual.css (+5/-0)
server/manual/template.php (+1/-1)
server/modules/datasetview.module.php (+23/-25)
server/modules/embedded.module.php (+27/-3)
server/modules/flash.module.php (+6/-21)
server/modules/genericfile.module.php (+6/-27)
server/modules/image.module.php (+6/-21)
server/modules/module_user_general.php (+42/-9)
server/modules/powerpoint.module.php (+18/-22)
server/modules/preview/HtmlTemplateForGetResource.html (+11/-4)
server/modules/preview/HtmlTemplateSimple.html (+30/-0)
server/modules/preview/html-preview.js (+7/-12)
server/modules/preview/vendor/jquery-1.11.1.min.js (+4/-0)
server/modules/preview/xibo-text-render.js (+55/-19)
server/modules/preview/xibo-webpage-render.js (+66/-0)
server/modules/text.module.php (+3/-2)
server/modules/ticker.module.php (+36/-8)
server/modules/video.module.php (+6/-21)
server/modules/webpage.module.php (+51/-12)
server/services.php (+0/-2)
server/theme/default/css/xibo.css (+12/-0)
server/theme/default/html/dataset_form_csv_import.php (+6/-4)
server/theme/default/html/display_page.php (+10/-1)
server/theme/default/html/displaygroup_form_display_assign.php (+2/-2)
server/theme/default/html/fault_page.php (+6/-6)
server/theme/default/html/layout_designer.php (+3/-0)
server/theme/default/html/log_form_display_last100.php (+47/-0)
server/theme/default/html/media_form_embedded_add.php (+6/-0)
server/theme/default/html/media_form_embedded_edit.php (+6/-0)
server/theme/default/html/media_form_ticker_edit.php (+8/-2)
server/theme/default/html/schedule_form_add_event.php (+96/-0)
server/theme/default/html/schedule_form_edit_event.php (+96/-0)
server/theme/default/html/schedule_form_schedule_now.php (+62/-0)
server/theme/default/html/status_dashboard.php (+3/-3)
server/theme/default/js/xibo-layout-designer.js (+1/-1)
server/theme/default/libraries/bootstrap/js/bootstrap-ckeditor-fix.js (+3/-2)
server/upgrade.php (+2/-2)

Merged into lp:xibo/1.6 at revision 339

Xibo Maintainters: Pending requested 2014-07-15

Diff: 7452 lines (+3498/-876)

85 files modified

default.pot (+319/-288)
example_oauth/index.php (+239/-18)
example_oauth/nice-json.php (+73/-0)
example_oauth/test_files/test.csv (+6/-0)
server/3rdparty/simplepie/library/SimplePie/File.php (+4/-0)
server/3rdparty/simplepie/library/SimplePie/HTTP/Parser.php (+21/-0)
server/config/config.class.php (+3/-24)
server/install.php (+2/-2)
server/install/database/70.sql (+15/-0)
server/install/master/data.sql (+1/-1)
server/lib/app/session.class.php (+1/-1)
server/lib/data/dataset.data.class.php (+165/-1)
server/lib/data/datasetcolumn.data.class.php (+88/-2)
server/lib/data/datasetdata.data.class.php (+177/-0)
server/lib/data/datasetgroupsecurity.data.class.php (+63/-2)
server/lib/data/file.data.class.php (+14/-0)
server/lib/data/layout.data.class.php (+17/-2)
server/lib/data/region.data.class.php (+59/-3)
server/lib/include.php (+6/-3)
server/lib/modules/module.class.php (+4/-4)
server/lib/oauth.inc.php (+1/-1)
server/lib/pages/admin.class.php (+1/-1)
server/lib/pages/campaign.class.php (+5/-5)
server/lib/pages/dataset.class.php (+31/-45)
server/lib/pages/display.class.php (+35/-6)
server/lib/pages/displaygroup.class.php (+4/-4)
server/lib/pages/fault.class.php (+3/-59)
server/lib/pages/group.class.php (+4/-4)
server/lib/pages/help.class.php (+3/-3)
server/lib/pages/index.class.php (+1/-1)
server/lib/pages/layout.class.php (+9/-6)
server/lib/pages/log.class.php (+45/-1)
server/lib/pages/module.class.php (+1/-1)
server/lib/pages/oauth.class.php (+1/-1)
server/lib/pages/resolution.class.php (+3/-3)
server/lib/pages/schedule.class.php (+87/-216)
server/lib/pages/sessions.class.php (+6/-4)
server/lib/pages/stats.class.php (+4/-4)
server/lib/pages/statusdashboard.class.php (+24/-18)
server/lib/pages/template.class.php (+3/-3)
server/lib/pages/timeline.class.php (+2/-2)
server/lib/pages/transition.class.php (+1/-1)
server/lib/pages/user.class.php (+12/-12)
server/lib/service/rest.class.php (+464/-8)
server/lib/service/restjson.class.php (+20/-16)
server/lib/service/xmdssoap.class.php (+15/-4)
server/locale/dbtranslate.php (+1/-0)
server/manual/content/admin/api_datasets.php (+615/-0)
server/manual/content/admin/api_library.php (+33/-15)
server/manual/content/admin/release_notes_1.6.2.php (+76/-0)
server/manual/content/routes.php (+2/-0)
server/manual/content/toc_developer_api.php (+1/-0)
server/manual/content/toc_developer_releasenotes.php (+1/-0)
server/manual/css/manual.css (+5/-0)
server/manual/template.php (+1/-1)
server/modules/datasetview.module.php (+21/-2)
server/modules/embedded.module.php (+27/-3)
server/modules/module_user_general.php (+19/-5)
server/modules/powerpoint.module.php (+11/-0)
server/modules/preview/HtmlTemplateForGetResource.html (+11/-4)
server/modules/preview/HtmlTemplateSimple.html (+30/-0)
server/modules/preview/html-preview.js (+7/-12)
server/modules/preview/vendor/jquery-1.11.1.min.js (+4/-0)
server/modules/preview/xibo-text-render.js (+50/-11)
server/modules/preview/xibo-webpage-render.js (+66/-0)
server/modules/text.module.php (+3/-2)
server/modules/ticker.module.php (+34/-6)
server/modules/webpage.module.php (+51/-12)
server/services.php (+0/-2)
server/theme/default/css/xibo.css (+12/-0)
server/theme/default/html/dataset_form_csv_import.php (+6/-4)
server/theme/default/html/display_page.php (+10/-1)
server/theme/default/html/fault_page.php (+6/-6)
server/theme/default/html/layout_designer.php (+3/-0)
server/theme/default/html/log_form_display_last100.php (+47/-0)
server/theme/default/html/media_form_embedded_add.php (+6/-0)
server/theme/default/html/media_form_embedded_edit.php (+6/-0)
server/theme/default/html/media_form_ticker_edit.php (+8/-2)
server/theme/default/html/schedule_form_add_event.php (+96/-0)
server/theme/default/html/schedule_form_edit_event.php (+96/-0)
server/theme/default/html/schedule_form_schedule_now.php (+62/-0)
server/theme/default/html/status_dashboard.php (+3/-3)
server/theme/default/js/xibo-layout-designer.js (+1/-1)
server/theme/default/libraries/bootstrap/js/bootstrap-ckeditor-fix.js (+3/-2)
server/upgrade.php (+2/-2)

Related bugs

Bug #1265816: Missing translation "Pin?"	Low	Fix Released
Bug #1265817: Missing translation "Event Schedule"	Low	Fix Released
Bug #1265818: Missing translation "Recurring event"	Low	Fix Released
Bug #1265820: Missing translation "Display order"	Low	Fix Released
Bug #1265821: Missing translation "End Time"	Low	Fix Released
Bug #1265823: Missing translation "Priority"	Low	Fix Released
Bug #1265824: Missing translation "Repeats"	Low	Fix Released
Bug #1265825: Missing translation "Until"	Low	Fix Released
Bug #1265826: Missing translation "Repeats every"	Low	Fix Released
Bug #1265831: Missing translation "Text lasting 50 seconds"	Low	Fix Released
Bug #1265834: Missing translation "Add new flash"	Low	Fix Released
Bug #1265836: Missing translation "This form accepts: swf files up to a maximum size of 96M "	Low	Fix Released
Bug #1265837: Missing translation "Help Links"	Low	Fix Released
Bug #1320215: https rss content doesn't work via some proxies (squid)	Undecided	Fix Released
Bug #1321489: Include the Copyright field in the Timeline	Wishlist	Fix Released
Bug #1324242: Status Dashboard storage graph should hide when no limit imposed	Low	Fix Released
Bug #1324425: Regression - Text resizes in the layout designer when regions are resized	Medium	Fix Released
Bug #1324631: Report fault should output log as CSV file	Wishlist	Fix Released
Bug #1324673: Export button for stats doesnt work in 1.6.1	Undecided	Fix Released
Bug #1324801: Download link broken for PowerPoint media items	Undecided	Fix Released
Bug #1325067: Installer should check for PHP 5.3.3 or later	High	Fix Released
Bug #1325564: Videos limited by duration rather than playing to completion don't stop in Preview	Medium	Fix Released
Bug #1325994: Status Dashboard bandwidth graphs show incorrect month	Undecided	Fix Released
Bug #1326046: Requires files outputs duplicate media nodes for background images	Undecided	Fix Released
Bug #1327819: Missing translation "Save position"	Undecided	Fix Released
Bug #1328216: Media assignment auth fails when not a super admin	Undecided	Fix Released
Bug #1330101: Can't get original width and height in embedded media render (impossible to calculate scaling)	Undecided	Fix Released
Bug #1330104: Webpage scale and offset dont work in Preview	Undecided	Fix Released
Bug #1330105: Webpage Scale not applied in the Layout Designer	Undecided	Fix Released
Bug #1330203: Session logs when no session returned	Undecided	Fix Released
Bug #1333222: Catchable fatal error	Undecided	Fix Released
Bug #1334387: Token does not match when Scheduling	Undecided	Fix Released
Bug #1338220: No "up" email alerts when Maintenance in Protected Mode	Medium	Fix Released
Bug #1338988: Add a name field to the embedded media type	Wishlist	Fix Released
Bug #1340805: Session fromdt filter uses expiration instead of lastaccessed	Low	Fix Released
Bug #1341476: Text editor can't type in popup forms (like inserting an image)	Medium	Fix Released
Bug #1342056: IE8 on XP, rss doesn't fill region space	High	Fix Released

Link a bug report

Related blueprints

Branch information

Owner:: Dan Garner

Project:: Xibo

Status:: Merged

Recent revisions

384. By Dan Garner on 2014-07-15: [api] Disable errors in API.
383. By Dan Garner on 2014-07-15: [cms] Bump version in include.php
382. By Dan Garner on 2014-07-15: [cms] Bump version in install.
381. By Dan Garner on 2014-07-15: [cms][dotnetclient] Fix HtmlTemplateForGetResource.html so that it can correctly handle scaling on IE8.
380. By Dan Garner on 2014-07-14: [cms] Fixed bug with CKEditior and Bootstrap where users cannot enter text into forms.
379. By Dan Garner on 2014-07-12: [cms] Fix for videos not being stopped
378. By Dan Garner on 2014-07-12: [api] Finishing data set API calls
[manual] Add release_notes_1.6.2.php
377. By Dan Garner on 2014-07-12: [cms] Add back missing files.
376. By Dan Garner on 2014-07-12: [api] DataSetImportCsv
375. By Dan Garner on 2014-07-11: [cms] Fixed session filtering.

Branch metadata

Branch format:: Branch format 7

Repository format:: Bazaar repository format 2a (needs bzr 1.16 or later)

Stacked on:: lp:xibo/1.7

This branch contains Public information

Everyone can see this information.

Subscribers

Dan Garner