Viewing all changes in revision 347.
- Committer: Dan Garner
- Date: 2014-10-21 16:07:57 UTC
- mfrom: (345.2.61 server-170-alpha2)
- Revision ID: dan@xibo.org.uk-20141021160757-vbg562lzvp24dxm4
[cms] Merged lp:~dangarner/xibo/server-170-alpha2
- files added:
- server/install/database/81.sql
- server/modules/3rdparty
- server/modules/theme/forecastio
- server/modules/theme/forecastio/weather_icons
- server/theme/default/libraries/bootstrap-ekko-lightbox
- server/theme/default/libraries/jquery-message-queuing
- server/theme/default/libraries/jquery-tablesorter
- server/theme/default/libraries/jquery-tablesorter/addons
- server/theme/default/libraries/jquery-tablesorter/addons/pager
- server/theme/default/libraries/jquery-tablesorter/addons/pager/icons
- server/theme/default/libraries/jquery-tablesorter/css
- server/theme/default/libraries/jquery-tablesorter/css/images
- server/theme/default/libraries/jquery-tablesorter/js
- server/theme/default/libraries/jquery-tablesorter/js/extras
- server/theme/default/libraries/jquery-tablesorter/js/parsers
- server/theme/default/libraries/jquery-tablesorter/js/widgets
- files removed:
- server/modules/preview/HtmlTemplateForGetResource.html
- server/theme/default/img/weather_rss
- files renamed:
- server/theme/default/img/weather_rss/circ-e.png => server/modules/theme/forecastio/circ-e.png
- server/theme/default/img/weather_rss/circ-n.png => server/modules/theme/forecastio/circ-n.png
- server/theme/default/img/weather_rss/circ-ne.png => server/modules/theme/forecastio/circ-ne.png
- server/theme/default/img/weather_rss/circ-nw.png => server/modules/theme/forecastio/circ-nw.png
- server/theme/default/img/weather_rss/circ-s.png => server/modules/theme/forecastio/circ-s.png
- server/theme/default/img/weather_rss/circ-se.png => server/modules/theme/forecastio/circ-se.png
- server/theme/default/img/weather_rss/circ-sw.png => server/modules/theme/forecastio/circ-sw.png
- server/theme/default/img/weather_rss/circ-w.png => server/modules/theme/forecastio/circ-w.png
- server/theme/default/img/weather_rss/circ.png => server/modules/theme/forecastio/circ.png
- server/theme/default/img/weather_rss/cloudy.png => server/modules/theme/forecastio/cloudy.png
- server/theme/default/img/weather_rss/frame.gif => server/modules/theme/forecastio/frame.gif
- server/theme/default/img/weather_rss/heavy rain.png => server/modules/theme/forecastio/heavy rain.png
- server/theme/default/img/weather_rss/heavy showers.png => server/modules/theme/forecastio/heavy showers.png
- server/theme/default/img/weather_rss/heavy snow.png => server/modules/theme/forecastio/heavy snow.png
- server/theme/default/img/weather_rss/light rain.png => server/modules/theme/forecastio/light rain.png
- server/theme/default/img/weather_rss/light showers.png => server/modules/theme/forecastio/light showers.png
- server/theme/default/img/weather_rss/light snow showers.png => server/modules/theme/forecastio/light snow showers.png
- server/theme/default/img/weather_rss/light snow.png => server/modules/theme/forecastio/light snow.png
- server/theme/default/img/weather_rss/snow showers.png => server/modules/theme/forecastio/snow showers.png
- server/theme/default/img/weather_rss/sunny intervals.png => server/modules/theme/forecastio/sunny intervals.png
- server/theme/default/img/weather_rss/sunny.png => server/modules/theme/forecastio/sunny.png
- server/theme/default/img/weather_rss/temp-blue.png => server/modules/theme/forecastio/temp-blue.png
- server/theme/default/img/weather_rss/temp-orange.png => server/modules/theme/forecastio/temp-orange.png
- server/theme/default/img/weather_rss/temp-red.png => server/modules/theme/forecastio/temp-red.png
- server/theme/default/img/weather_rss/temp-yellow.png => server/modules/theme/forecastio/temp-yellow.png
- server/theme/default/img/weather_rss/thundery showers.png => server/modules/theme/forecastio/thundery showers.png
- server/modules/preview/html-preview.css => server/theme/default/css/html-preview.css
- files modified:
- example_oauth/index.php
expand all
collapse all
added
removed
server/modules/theme/forecastio/weather_icons/weathericons-regular-webfont.svg
server/theme/default/img/forms/weather.png
server/theme/default/libraries/jquery-tablesorter/addons/pager/icons/first.png
server/theme/default/libraries/jquery-tablesorter/addons/pager/icons/last.png
server/theme/default/libraries/jquery-tablesorter/addons/pager/icons/loading.gif
server/theme/default/libraries/jquery-tablesorter/addons/pager/icons/next.png
server/theme/default/libraries/jquery-tablesorter/addons/pager/icons/prev.png
server/theme/default/libraries/jquery-tablesorter/css/images/black-asc.gif
server/theme/default/libraries/jquery-tablesorter/css/images/black-desc.gif
server/theme/default/libraries/jquery-tablesorter/css/images/black-unsorted.gif
server/theme/default/libraries/jquery-tablesorter/css/images/bootstrap-black-unsorted.png
server/theme/default/libraries/jquery-tablesorter/css/images/bootstrap-white-unsorted.png
server/theme/default/libraries/jquery-tablesorter/css/images/dropbox-asc-hovered.png
server/theme/default/libraries/jquery-tablesorter/css/images/dropbox-asc.png
server/theme/default/libraries/jquery-tablesorter/css/images/dropbox-desc-hovered.png
server/theme/default/libraries/jquery-tablesorter/css/images/dropbox-desc.png
server/theme/default/libraries/jquery-tablesorter/css/images/green-asc.gif
server/theme/default/libraries/jquery-tablesorter/css/images/green-desc.gif
server/theme/default/libraries/jquery-tablesorter/css/images/green-header.gif
server/theme/default/libraries/jquery-tablesorter/css/images/green-unsorted.gif
server/theme/default/libraries/jquery-tablesorter/css/images/ice-asc.gif
server/theme/default/libraries/jquery-tablesorter/css/images/ice-desc.gif
server/theme/default/libraries/jquery-tablesorter/css/images/ice-unsorted.gif
server/theme/default/libraries/jquery-tablesorter/css/images/metro-black-asc.png
server/theme/default/libraries/jquery-tablesorter/css/images/metro-black-desc.png
server/theme/default/libraries/jquery-tablesorter/css/images/metro-loading.gif
server/theme/default/libraries/jquery-tablesorter/css/images/metro-unsorted.png
server/theme/default/libraries/jquery-tablesorter/css/images/metro-white-asc.png
server/theme/default/libraries/jquery-tablesorter/css/images/metro-white-desc.png
server/theme/default/libraries/jquery-tablesorter/css/images/white-asc.gif
server/theme/default/libraries/jquery-tablesorter/css/images/white-desc.gif
server/theme/default/libraries/jquery-tablesorter/css/images/white-unsorted.gif
