uploads swarmTV logo (for emails)
deletes a bugging alert when saving the page info
Merge branch 'draft'
Merge branch 'draft'
Merge branch 'draft'
makes a stab at how popcorn will operate
settles conflict between popcorn and master
enables popcorn as procedural code (to be codeignitified!)
returns number of filtered pages
attempts to integrate popcorn in codeigniter (but fancybox doesn't work)
resets procedural version of fancybox (so that videos work in Chrome fo AIR:Pressure)
ets code ready for the server by changing relevant directories
includes videoPlayer.js properly
includes dbinfo.php to get procedural popcorn code to work! : |
updates updateClip for use with dbinfo.php as well
sets setThumbnail.php to operate with dbinfo.php
tries to resolve db connection
Merge remote branch 'github/master'
reintroduces font sizing again!
makes set thumbnail invisible for the moment