[MERGE] Merge with trunk

Replace dHtmlXScheduler calendar by FullCalendar from Jquery
Manage filter by coworker/favorite Employee
Manage avatar in event / in sidebar filter

bzr revid: jke@openerp.com-20140114160325-1e4dgbe3f8fo38na

1 files changed, 0 insertions, 26 deletions

diff --git a/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/dhtmlxscheduler_multisource.js b/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/dhtmlxscheduler_multisource.js
deleted file mode 100644
index eb8e193ca82..00000000000
--- a/addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext/dhtmlxscheduler_multisource.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-This software is allowed to use under GPL or you need to obtain Commercial or Enterise License

-to use it in non-GPL project. Please contact sales@dhtmlx.com for details
-*/
-(function(){

-

-	function backup(obj){

-		var t = function(){};

-		t.prototype = obj;

-		return t;

-	}

-

-	var old = scheduler._load;

-	scheduler._load=function(url,from){

-		url=url||this._load_url;

-		if (typeof url == "object"){

-			var t = backup(this._loaded);

-			for (var i=0; i < url.length; i++) {

-				this._loaded=new t();

-				old.call(this,url[i],from);

-			}

-		} else 

-			old.apply(this,arguments);

-	}

-	

-})();
\ No newline at end of file