Merge pull request #2034 from owncloud/fix_bug47

Fix #47 - Duplicate files create a (2) when multiples are uploaded

diff --cc apps/files/js/filelist.js
Simple merge

diff --cc core/js/js.js
index 46dd273b06814fc01f31e2421c354a16edb954ff,1801062241d6cfbc3127ab3bce74d3d9925e0aad..582d1f808d7dd9d091b4b4a93e73105f3d440cda
--- 1/core/js/js.js
--- 2/core/js/js.js
+++ b/core/js/js.js
@@@ -816,17 -824,3 +825,17 @@@ OC.set=function(name, value) 
        }
        context[tail]=value;
  };
- }
 +
 +
 +/**
 + * Calls the server periodically every 15 mins to ensure that session doesnt
 + * time out
 + */
 +function sessionHeartBeat(){
 +      OC.Router.registerLoadedCallback(function(){
 +              var url = OC.Router.generate('heartbeat');
 +              setInterval(function(){
 +                      $.post(url);
 +              }, 900000);
 +      });
++}