Merge branch 'master' of dev.sourcefabric.org:campcaster

Conflicts: application/controllers/LibraryController.php application/controllers/SearchController.php
2011-01-06 01:05:34 -05:00 · 2011-01-06 01:05:34 -05:00 · d9e8e1641a
commit d9e8e1641a
parent ee0a8310de 7e96572aee
76 changed files with 238 additions and 272 deletions
--- a/public/js/campcaster/library/advancedsearch.js
+++ b/public/js/campcaster/library/advancedsearch.js
--- a/public/js/campcaster/library/context-menu.js
+++ b/public/js/campcaster/library/context-menu.js
--- a/public/js/campcaster/library/library.js
+++ b/public/js/campcaster/library/library.js
--- a/public/js/campcaster/library/plupload.js
+++ b/public/js/campcaster/library/plupload.js
--- a/public/js/campcaster/library/spl.js
+++ b/public/js/campcaster/library/spl.js
--- a/public/js/campcaster/onready/library.js
+++ b/public/js/campcaster/onready/library.js
--- a/public/js/campcaster/onready/search.js
+++ b/public/js/campcaster/onready/search.js
--- a/public/js/campcaster/playlist/playlist.js
+++ b/public/js/campcaster/playlist/playlist.js
--- a/public/js/campcaster/schedule/schedule.js
+++ b/public/js/campcaster/schedule/schedule.js
--- a/public/js/playlist/playlist.js
+++ b/public/js/playlist/playlist.js
@ -145,7 +145,7 @@
        }

        function getScheduleFromServer(){
-            $.ajax({ url: "http://localhost/Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){
+            $.ajax({ url: "/Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){
                    parseItems(data.entries);
                  }});
            setTimeout(getScheduleFromServer, 5000);