lp:~dangarner/xibo/131-datasets
Created by
Dan Garner
and last modified
- Get this branch:
- bzr branch lp:~dangarner/xibo/131-datasets
Only
Dan Garner
can upload to this branch. If you are
Dan Garner
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Dan Garner: Approve
-
Diff: 2146 lines (+1373/-79)39 files modifiedclient/dotNET/DataSetView.cs (+158/-0)
client/dotNET/Flash.cs (+1/-2)
client/dotNET/MainForm.cs (+1/-0)
client/dotNET/Properties/Settings.Designer.cs (+3/-3)
client/dotNET/Properties/Settings.settings (+3/-3)
client/dotNET/Region.cs (+6/-1)
client/dotNET/Rss.cs (+1/-2)
client/dotNET/Text.cs (+1/-2)
client/dotNET/Web References/xmds/Reference.cs (+73/-2)
client/dotNET/Web References/xmds/Reference.map (+1/-1)
client/dotNET/Web References/xmds/xmds.wsdl (+26/-1)
client/dotNET/WebContent.cs (+2/-3)
client/dotNET/XiboClient.csproj (+5/-2)
client/dotNET/app.config (+3/-3)
server/install/database/42.sql (+20/-0)
server/lib/data/dataset.data.class.php (+121/-0)
server/lib/data/datasetcolumn.data.class.php (+1/-1)
server/lib/data/layout.data.class.php (+1/-1)
server/lib/include.php (+2/-2)
server/lib/js/core.js (+6/-2)
server/lib/js/layout.js (+29/-0)
server/lib/js/mediamanager.js (+30/-0)
server/lib/modules/module.class.php (+11/-3)
server/lib/modules/module.interface.php (+2/-0)
server/lib/pages/content.class.php (+1/-1)
server/lib/pages/layout.class.php (+18/-9)
server/lib/pages/module.class.php (+29/-22)
server/lib/pages/region.class.php (+23/-0)
server/lib/pages/schedule.class.php (+3/-3)
server/lib/service/service.wsdl (+25/-0)
server/lib/service/xmdssoap.class.php (+56/-0)
server/lib/xmds.inc.php (+5/-0)
server/modules/HtmlTemplate.htm (+161/-0)
server/modules/datasetview.module.php (+508/-0)
server/modules/module_db_mysql.php (+26/-0)
server/modules/module_user_general.php (+3/-7)
server/modules/ticker.module.php (+2/-2)
server/template/css/presentation.css (+1/-1)
server/template/css/xibo.css (+5/-0)
Related bugs
Bug #836385: permissions issue in version 1.3 | High | Fix Released | |
Bug #842571: Should be able to schedule on an empty display group | Low | Fix Released | |
Bug #842573: Can't edit duration on Ticker Media post 1.3.0 | Medium | Fix Released |
Related blueprints
Branch information
Recent revisions
- 246. By Dan Garner
-
[server] Fix to data set view so that it correctly shows columns in order. Increment xmds version number
- 244. By Dan Garner
-
[server] Schedule on data sets with no displays inside. Dataset view javascript on the mediamanager homepage
- 242. By Dan Garner
-
[server] Fixed region timeline for really large duration per pixel (capped at 70)
- 240. By Dan Garner
-
[server] Changes to region timeline form. Include all columns on data set data results
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:xibo/1.3