Merge branch 'openness' of github.com:Rulingcom/orbit into openness

Conflicts: vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
2012-11-21 18:33:04 +08:00
commit 0aaadbc82d
@@ -321,8 +321,6 @@ var calendarAPI = function(){
 					var recordcurdate = true;
 				
 					if(allow){
-						
-							//console.log(pos);
 						if(pos == 1){
 							var colspan = 0;
 							if(evnt.total_days>7){