lp:~dangarner/xibo/server170
Created by
Dan Garner
and last modified
- Get this branch:
- bzr branch lp:~dangarner/xibo/server170
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.
- Xibo Maintainters: Pending requested
-
Diff: 6714 lines (+3283/-1421)69 files modifiedmanual/generate.php (+4/-164)
manual/manualgenerator.class.php (+211/-0)
manual/source/en/install_environment.md (+7/-139)
manual/source/en/install_environment_linux.md (+93/-0)
manual/source/en/install_environment_windows_iis.md (+195/-0)
manual/source/en/install_environment_windows_xampp.md (+47/-0)
manual/source/en/release_notes.md (+1/-0)
manual/source/en/release_notes_1.7.0-rc1.md (+53/-0)
manual/source/fr/tour.md (+65/-0)
manual/template/template.php (+21/-1)
server/config/client.config.php (+24/-2)
server/install/database/60.sql (+13/-0)
server/install/database/80.sql (+1/-1)
server/install/database/81.sql (+1/-1)
server/install/database/83.sql (+5/-0)
server/install/master/data.sql (+3/-3)
server/install/master/structure.sql (+7/-7)
server/lib/app/kit.class.php (+58/-0)
server/lib/app/thememanager.class.php (+2/-2)
server/lib/data/dataset.data.class.php (+27/-10)
server/lib/data/datasetdata.data.class.php (+2/-2)
server/lib/data/displayprofile.data.class.php (+2/-2)
server/lib/data/layout.data.class.php (+8/-2)
server/lib/data/media.data.class.php (+1/-6)
server/lib/data/nonce.data.class.php (+11/-0)
server/lib/data/userdata.data.class.php (+85/-0)
server/lib/include.php (+1/-1)
server/lib/modules/module.class.php (+47/-12)
server/lib/pages/admin.class.php (+4/-7)
server/lib/pages/content.class.php (+53/-48)
server/lib/pages/dataset.class.php (+11/-1)
server/lib/pages/display.class.php (+25/-16)
server/lib/pages/layout.class.php (+8/-3)
server/lib/pages/log.class.php (+2/-0)
server/lib/pages/module.class.php (+40/-30)
server/lib/pages/stats.class.php (+27/-3)
server/lib/pages/timeline.class.php (+9/-2)
server/lib/pages/user.class.php (+22/-35)
server/lib/service/service_v3.wsdl (+0/-9)
server/lib/service/xmdssoap3.class.php (+566/-599)
server/lib/service/xmdssoap4.class.php (+39/-31)
server/modules/3rdparty/twitter-oauth/OAuth.php (+872/-0)
server/modules/3rdparty/twitter-oauth/twitteroauth.php (+243/-0)
server/modules/clock.module.php (+0/-19)
server/modules/datasetview.module.php (+0/-8)
server/modules/embedded.module.php (+0/-14)
server/modules/forecastio.module.php (+43/-37)
server/modules/image.module.php (+1/-1)
server/modules/module_template.php (+2/-8)
server/modules/module_user_general.php (+41/-0)
server/modules/text.module.php (+0/-14)
server/modules/theme/forecastio/current-day.template.json (+7/-0)
server/modules/theme/forecastio/daily.template.json (+7/-0)
server/modules/theme/forecastio/picture.template.json (+7/-0)
server/modules/theme/ticker/media-rss-with-title.template.json (+6/-0)
server/modules/theme/ticker/prominent-title-with-desc-and-name-separator.template.json (+6/-0)
server/modules/theme/ticker/title-only.template.json (+6/-0)
server/modules/theme/twitter/tweet-only.template.json (+6/-0)
server/modules/theme/twitter/tweet-with-profileimage-left.template.json (+6/-0)
server/modules/theme/twitter/tweet-with-profileimage-right.template.json (+6/-0)
server/modules/ticker.module.php (+55/-41)
server/modules/twitter.module.php (+152/-53)
server/modules/webpage.module.php (+0/-13)
server/theme/default/config.php (+0/-1)
server/theme/default/html/display_form_mediainventory.php (+0/-52)
server/theme/default/html/library_form_media_add.php (+11/-4)
server/theme/default/html/schedule_page.php (+1/-1)
server/theme/default/js/xibo-forms.js (+0/-12)
server/theme/default/libraries/jquery-file-upload/js/jquery.fileupload-ui.js (+4/-4)
Related bugs
Bug #1397139: Update 1.6.3 to 1.7 Beta Error | Undecided | Fix Released | |
Bug #1397143: DEFAULT CHARSET=utf32 ERROR in 1.7 beta | Undecided | Fix Released | |
Bug #1397237: Delete associated data when deleting a DataSet | Wishlist | Fix Released | |
Bug #1399278: Problems with 1.6 clients connecting to 1.7.0-beta | Undecided | Fix Released | |
Bug #1399649: Upgrade that adds timeline page misses re-asserting it on existing for existing permissions | Undecided | Fix Released | |
Bug #1400515: nothing selected traslation | Low | Fix Released | |
Bug #1401833: Upload bar doesn't go up | Undecided | Fix Released | |
Bug #1402292: 1.7- Bandwidth Statistics - All Option | Undecided | Fix Released | |
Bug #1402295: Library - Owner COMBO | Undecided | Fix Released | |
Bug #1408009: Username truncation | Low | Fix Released |
Related blueprints
Branch information
Recent revisions
- 371. By Dan Garner
-
[cms] Fixed upgrade step for 60.sql so that permissions links are added for groups with permissions to the Layouts page group
- 366. By Dan Garner
-
[cms] Fix typo in client.config.php
[cms] Improvements to media inventory and recent log layout on display page - 365. By Dan Garner
-
[manual] Split manual generation into a class so that it can be instanced from elsewhere
[cms] Theme options in client.config.php
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