← Back to branch summary

~xibo-maintainers/xibo/faye

~xibo-maintainers/xibo/faye

Viewing all changes in revision 246.

Committer: Dan Garner
Date: 2012-07-07 12:09:18 UTC
mfrom: (245.1.4 pre-release-133)
Revision ID: dan@xibo.org.uk-20120707120918-kdo5l43rw2f1vxjm

Merged ~dangarner/xibo/pre-release-133

files added:
server/img/forms/localvideo.gif

server/img/forms/localvideo.png

server/install/database/48.php

server/install/database/48.sql

server/modules/localvideo.module.php

files modified:
server/lib/app/modulemanager.class.php

server/lib/include.php

server/lib/pages/admin.class.php

server/lib/pages/layout.class.php

server/modules/module_user_general.php

server/modules/preview/HtmlTemplateForGetResource.html

server/modules/preview/jquery.marquee.js

server/modules/preview/xibo-text-render.js

server/modules/text.module.php

server/modules/ticker.module.php

server/modules/webpage.module.php

Show diffs side-by-side

added added

removed removed

server/img/forms/localvideo.gif

server/img/forms/localvideo.png

server/install/database/48.php

server/install/database/48.sql

server/lib/app/modulemanager.class.php

server/lib/include.php

server/lib/pages/admin.class.php

server/lib/pages/layout.class.php

server/modules/localvideo.module.php

server/modules/module_user_general.php

server/modules/preview/HtmlTemplateForGetResource.html

server/modules/preview/jquery.marquee.js

server/modules/preview/xibo-text-render.js

server/modules/text.module.php

server/modules/ticker.module.php

server/modules/webpage.module.php

Older »