From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 3 Mar 2013 19:49:04 +0000 (-0800)
Subject: Merge pull request #2034 from owncloud/fix_bug47
X-Git-Tag: v5.0.0RC2~28
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0488968443ee6d94f0695cb5189f5ea9b4d343b3;p=nextcloud-server.git

Merge pull request #2034 from owncloud/fix_bug47

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

0488968443ee6d94f0695cb5189f5ea9b4d343b3
diff --cc core/js/js.js
index 46dd273b068,1801062241d..582d1f808d7
--- a/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);
 +	});
- }
++}