Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into testing-branch

labs/meteor-client/app/.meteor/packages

@@ -21,6 +21,6 @@ duongthienduc:meteor-winston
 mizzao:timesync
 agnito:raphael
 
-mrt:ionicons
 clinical:nightwatch
 sanjo:jasmine
+pagebakers:ionicons

labs/meteor-client/app/.meteor/release

@@ -1 +1 @@
-METEOR@1.0.3.1
+METEOR@1.0.3.2

labs/meteor-client/app/.meteor/versions

@@ -14,7 +14,7 @@ brentjanderson:winston-client@0.2.0
 callback-hook@1.0.2
 cfs:http-methods@0.0.27
 check@1.0.4
-clinical:nightwatch@1.5.1
+clinical:nightwatch@1.6.0
 coffeescript@1.0.5
 ddp@1.0.14
 deps@1.0.6
@@ -50,14 +50,14 @@ minimongo@1.0.6
 mizzao:bootstrap-3@3.3.1_1
 mizzao:build-fetcher@0.2.0
 mizzao:jquery-ui@1.11.2
-mizzao:timesync@0.2.2
+mizzao:timesync@0.3.0
 mobile-status-bar@1.0.2
 mongo@1.0.11
 mrt:external-file-loader@0.1.4
-mrt:ionicons@1.4.1
 mrt:redis@0.1.3
 observe-sequence@1.0.4
 ordered-dict@1.0.2
+pagebakers:ionicons@2.0.0
 practicalmeteor:chai@1.9.2_3
 practicalmeteor:loglevel@1.1.0_3
 random@1.0.2
@@ -66,7 +66,7 @@ reactive-var@1.0.4
 reload@1.1.2
 retry@1.0.2
 routepolicy@1.0.4
-sanjo:jasmine@0.12.1
+sanjo:jasmine@0.12.4
 sanjo:karma@1.4.1
 session@1.0.5
 spacebars@1.0.5

labs/meteor-client/app/client/globals.coffee

@@ -305,7 +305,7 @@ Handlebars.registerHelper "visibility", (section) ->
 
 # assign the default values for the Session vars
 @setDefaultSettings = ->
-  console.log "in setDefaultSettings"
+  # console.log "in setDefaultSettings"
   setInSession "display_usersList", true
   setInSession "display_navbar", true
   setInSession "display_chatbar", true

labs/meteor-client/app/client/views/chat/chat_bar.coffee

@@ -167,10 +167,10 @@ Template.chatInput.rendered  = ->
 
 Template.extraConversations.events
 	"click .extraConversation": (event) ->
-		console.log "extra conversation"
+		# console.log "extra conversation"
 		user = @
-		console.log user
-		console.log "#{user.name} #{user.userId}"
+		# console.log user
+		# console.log "#{user.name} #{user.userId}"
 		# put this conversation in the 3rd position in the chat tabs collection (after public and options)
 		# Take all the tabs and turn into an array
 		tabArray = getInSession('chatTabs')
@@ -281,25 +281,26 @@ Template.tabButtons.events
     )
 
   'click .optionsChatTab': (event) ->
-    console.log "options"
+    # console.log "options"
     setInSession "inChatWith", "OPTIONS"
     setInSession 'display_chatPane', false
 
   'click .privateChatTab': (event) ->
-    console.log "private:"
-    console.log @
+    # console.log "private:"
+    # console.log @
     setInSession "inChatWith", @userId
     setInSession 'display_chatPane', true
 
   'click .publicChatTab': (event) ->
-    console.log "public"
+    # console.log "public"
     setInSession "inChatWith", "PUBLIC_CHAT"
     setInSession 'display_chatPane', true
 
   'click .tab': (event) ->
     unless getInSession "inChatWith" is "OPTIONS"
-      $("#newMessageInput").focus()
-      console.log "tab"
+      if window.matchMedia('(orientation: landscape)').matches
+        $("#newMessageInput").focus()
+        # console.log "tab"
 
 Template.tabButtons.helpers
   hasGotUnreadMailClass: (gotMail) ->

labs/meteor-client/app/client/whiteboard_models/whiteboard_paper.coffee

@@ -195,7 +195,7 @@ class Meteor.WhiteboardPaperModel
       @cursor.setPosition( @viewBoxXpos + x * @viewBoxWidth, @viewBoxYPos + y * @viewBoxHeight )
 
   zoomAndPan: (widthRatio, heightRatio, xOffset, yOffset) ->
-    console.log "zoomAndPan #{widthRatio} #{heightRatio} #{xOffset} #{yOffset}"
+    # console.log "zoomAndPan #{widthRatio} #{heightRatio} #{xOffset} #{yOffset}"
     newX = - xOffset * 2 * @adjustedWidth / 100
     newY = - yOffset * 2 * @adjustedHeight / 100
     newWidth = @adjustedWidth * widthRatio / 100