BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,479 Commits 13 Branches 260 Tags 1.1 GiB
78313fda46
Commit Graph

509 Commits

Author SHA1 Message Date
Chad Pilkey
34fdfb9f83 Revert "Bbb lock settings fix" 2015-03-04 11:49:13 -05:00
Tiago Daniel Jacobs
34e2e48be2 Merging 2015-03-03 06:52:56 +00:00
Tiago Daniel Jacobs
bf62dd66a2 Fixed mute on start, added lock on join option 2015-03-02 18:06:09 +00:00
Felipe Cecagno
bb330cf0a2 Merge branch '090-deskshare-window' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/resources/prod/layout.xml
	bigbluebutton-client/resources/prod/lib/deployJava.js
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2015-03-02 00:25:02 -03:00
Chad Pilkey
815be28d0b Revert "Revert "Added Java check to the configuration notifications"" 
This reverts commit 82545a03f3.
 2015-03-02 00:53:10 +00:00
Richard Alam
edaeaf6bf4 Merge pull request #521 from capilkey/webrtc-fixes 
WebRTC fixes
 2015-02-17 19:26:07 -05:00
Chad Pilkey
e6d3cd551d fixed a race condition in the webrtc javascript code, and added cause for error 1004 2015-02-17 16:11:42 -08:00
Calvin Walton
8e7a34b5dd Add webrtc 1009 error to translations 2015-02-17 13:29:27 -05:00
Chad Pilkey
d6ef5168c0 add support for webrtc call transferring, cuts join time in half 2015-02-12 14:25:41 -08:00
Felipe Cecagno
fe69560cb1 Merge branch '090-java-detection' into mconf-live0.6.2 2015-02-12 15:51:54 -02:00
Fred Dixon
2ed3195fbc Update bbbResources.properties 
Change the copyright date to 2015
 2015-02-06 16:34:54 -05:00
Mateus Dalepiane
899a98d3c5 Reverting our Java detection changes 
Since BBB team also improved Java detection, we decided to revert our changes
and use theirs.
 2015-02-05 16:25:40 -02:00
Chad Pilkey
ac220162dd add a context menu item to UserGrid to export user names 2015-02-04 12:33:08 -08:00
Chad Pilkey
672348eafe labelling and tab order fixes for accessiblity 2015-01-30 08:03:36 -08:00
Felipe Cecagno
9a7bae79a8 Merge branch '090-new-videodock' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	record-and-playback/deploy.sh
 2015-01-28 20:33:28 -02:00
Chad Pilkey
19fb9b9671 Revert "Revert "Added Java check to the configuration notifications"" 
This reverts commit 82545a03f3.
 2015-01-27 14:19:02 -08:00
Fred Dixon
82545a03f3 Revert "Added Java check to the configuration notifications" 2015-01-27 17:11:54 -05:00
Chad Pilkey
84d6c5e132 added deskshare help information for Chrome users 2015-01-27 13:54:24 -08:00
Felipe Cecagno
03ba8b2866 Merge branch 'edit-layouts' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/branding/default/style/css/assets/images/ic_file_download_16px.png
	bigbluebutton-client/branding/default/style/css/assets/images/ic_file_upload_16px.png
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/BroadcastButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
 2015-01-26 11:49:22 -02:00
Felipe Cecagno
ac6813595b show an alert when the moderator broadcasts his layout to others 2015-01-26 11:42:45 -02:00
Felipe Cecagno
eb4e5aa360 redo the edition of layouts feature; now moderators receive the broadcasted layout as well as presenter and viewers 2015-01-26 11:21:04 -02:00
Felipe Cecagno
3a89cab752 Merge branch '090-java-detection' into mconf-live0.6.2 2015-01-25 18:20:48 -02:00
Felipe Cecagno
b7130a379f Merge branch '090-java-detection' into HEAD 
Conflicts:
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/resources/prod/lib/bbb_deskshare.js
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
 2015-01-25 18:19:13 -02:00
Felipe Cecagno
2c255dc9ae Merge branch '090-multinotes' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/resources/prod/layout.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
 2015-01-25 12:12:53 -02:00
Felipe Cecagno
e65fa1d28e Merge branch '090-expanded-status' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-01-24 17:34:53 -02:00
Felipe Cecagno
2761c31e52 Merge branch '090-encrypted-recording' into mconf-live0.6.2 
Conflicts:
	bbb-video/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/locale/de_DE/bbbResources.properties
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
 2015-01-21 18:11:56 -02:00
Chad Pilkey
80e58d1ee3 added java check to the configuration notifications 2015-01-21 11:40:55 -08:00
Chad Pilkey
12d3a34ff5 change warnings to notifications 2015-01-19 10:22:15 -08:00
Chad Pilkey
5a9a2a0a6c minor tweaks to the configuration warnings 2015-01-16 13:39:44 -08:00
Chad Pilkey
9be9cca051 added a configuration warning system to the flash client 2015-01-15 16:14:49 -08:00
Chad Pilkey
8b7d0ddb24 font size in config, and two bugs with private chat squashed 2014-12-11 13:16:38 -08:00
Felipe Cecagno
2dfe4a1aac Merge branch '090-expanded-status' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
 2014-12-10 18:33:18 -02:00
Felipe Cecagno
9f2c5926fa Merge branch '090-download-chat' into mconf-live0.6.1 2014-12-09 17:21:15 -02:00
Felipe Cecagno
e2692c039f using a different string to set the download chat filename 2014-12-09 17:20:55 -02:00
Felipe Cecagno
4e29bbfa2a Merge remote-tracking branch 'bigbluebutton/master' into 090-expanded-status 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
 2014-12-02 20:42:15 -02:00
Felipe Cecagno
a45bbfb29a Merge branch '090-multinotes' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/resources/prod/layout.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
 2014-12-02 20:04:23 -02:00
Alan Dias
6a59b3ea4c Fixed Status and Settings button 2014-12-01 10:00:22 -02:00
Felipe Cecagno
f8ee5b46c1 Merge branch '090-download-chat' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
 2014-11-30 20:02:24 -02:00
Felipe Cecagno
d6e2c54a3f better format of the saved/copied messages 2014-11-30 19:51:17 -02:00
Felipe Cecagno
b9ee79cdd5 added an alert when the user copies the chat content 2014-11-30 19:34:56 -02:00
Felipe Cecagno
dbf4dfbb91 cleanup 2014-11-30 19:10:23 -02:00
Felipe Cecagno
e9122a9637 Merge branch '090-download-presentation' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
 2014-11-23 23:02:22 -02:00
Felipe Cecagno
8caa85f333 Merge branch '090-change-role' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
 2014-11-23 21:58:27 -02:00
Felipe Cecagno
a3acb00893 Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 
Conflicts:
	bbb-video/build.gradle
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-config/web/default.pdf
 2014-11-22 20:28:39 -02:00
Chad Pilkey
e2f71bec3a changed two of the layout names 2014-11-11 11:29:34 -08:00
Chad Pilkey
a23cd2a7c9 added translation of the default layout definitions 2014-11-11 10:26:10 -08:00
Chad Pilkey
65b820966d Changed the wording of the webrtc messages to make them easier to understand 2014-11-07 14:07:42 -08:00
Mateus Dalepiane
ef043602c6 Merge branch '090-guest-role' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2014-11-07 14:49:28 -02:00
Chad Pilkey
6f82dd9378 added a check to make sure that ICE negotiation has finished before showing that the call has been accepted in the UI 2014-11-06 10:35:03 -08:00
Felipe Cecagno
e14c1a652a reverted back the pt_BR localization for the download presentation feature 2014-11-05 18:07:25 -02:00
Pedro Beschorner Marin
2c5ff4f7cd Merging with mconf old branch 2014-11-03 14:12:47 -02:00
Felipe Cecagno
5a5a3aecc2 Merge branch 'multinotes' into 090-multinotes 
Conflicts:
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2014-10-31 15:01:29 -02:00
Chad Pilkey
f84ae56e9a added an additional fail case for the WebRTC audio 2014-10-29 09:30:03 -07:00
Jonata T. Pastro
ae6eef497d Merging expanded-status and master(090) into 090-expanded-status 2014-10-27 18:29:53 +00:00
Felipe Cecagno
0af623e9e7 Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-24 23:38:09 -02:00
Mateus Dalepiane
dfa32dcd6d cleanup 
TODO:
+ Show guest the rejectred message
+ Handle guest disconnection
 2014-10-21 17:40:06 -02:00
Mateus Dalepiane
36af1da3df Port of guest role to bbb-090 
**WARNING**: Not tested yet.
bbb-client and bbb-web compile.
bbb-apps does not compile yet.

@bbb-apps: Missing scala implementation.
@bbb-client: Missing message receiver implementation.
Conflicts:
	bbb-api-demo/src/main/webapp/bbb_api.jsp
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/User.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/UsersConnectionEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-web/grails-app/conf/BigBlueButtonFilters.groovy
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/UserSession.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessageListener.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
 2014-10-16 16:58:10 -03:00
Jonata T. Pastro
d971a33209 Merging expanded-status with master(090) into 090-expanded-status 2014-10-16 19:50:38 +00:00
Chad Pilkey
a8b53f9acc changed webrtc error messages to errorcodes, fixed a bug with webrtc call failing at echo test 2014-10-15 16:17:58 -07:00
Felipe Cecagno
3db4ead6e4 Merge branch '090-listen-only-by-default' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/locale/ru_RU/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-10-15 00:22:27 -03:00
Chad Pilkey
fdb763571d made AudioPathSelection less squished, added automatic redirect on logout 2014-10-10 16:11:03 -07:00
Alan Dias
3d90683091 Merge branch 'branchChat' into 090-branchChat 
Conflicts:
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
 2014-10-08 11:29:37 -03:00
Chad Pilkey
7d9b26912e Merge remote-tracking branch 'upstream/master' into fix-no-presentation-problems 
Conflicts:
	bigbluebutton-client/resources/prod/BigBlueButton.html
 2014-10-06 15:09:36 -07:00
Chad Pilkey
4ec65bc300 enhannced LoggedOutWindow to allow for easy reconnect 2014-10-06 15:07:22 -07:00
Chad Pilkey
de7dbd0b44 Multiple fixes to our webrtc implementation. Hopefully there's less holes now 2014-10-06 14:14:34 -07:00
Felipe Cecagno
59debc5d1e Merge branch '090-mconf-branding' into mconf-live0.6.1 2014-10-05 23:32:43 -03:00
Felipe Cecagno
f40f9bf767 Merge branch '090-fullscreen' into 090-branding-logo 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-10-05 23:31:39 -03:00
Felipe Cecagno
b9a149e94d Merge branch '090-fullscreen' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-10-05 23:08:09 -03:00
Felipe Cecagno
5f2f2662af Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
 2014-10-05 22:00:28 -03:00
Felipe Cecagno
015d708d7c Merge branch 'mconf-branding-0.81' into 090-mconf-branding 
Used the following command to comment the default copyright label for all languages except en_US
find -name bbbResources.properties | xargs sed -i "s:^\(bbb.mainshell.copyrightLabel2.*\):# \1:g"

Conflicts:
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/src/BigBlueButton.mxml
	record-and-playback/presentation/playback/presentation/playback.html
 2014-10-05 19:36:43 -03:00
syeshchenko
14b401851d resized and positioned some of the components to fit with Russian and German locales, changed and added some Russian translation 2014-10-01 15:18:31 -04:00
Alan Dias
e1dfd6d440 Merge branch '081-fullscreen' into 090-fullscreen 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-10-01 12:36:36 -03:00
Mateus Dalepiane
f5703f64bb Port change user role to bbb 0.9.0 
Merge branch 'changeRole-0.81' into 090-change-role

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/User.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LockButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/business/ListenersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/business/UsersProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ControlButtons.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-web/grails-app/conf/BigBlueButtonFilters.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessageListener.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingConstants.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
 2014-09-25 17:59:45 -03:00
Mateus Dalepiane
ba020a8e52 Merge branch '081-network-monitor' into 090-network-monitor 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-09-12 12:02:51 -03:00
Richard Alam
83d15332d6 Merge pull request #387 from SenecaCDOT-BigBlueButton/chrome-webcam-permission-prompt 
Chrome webcam permission prompt
 2014-09-08 14:54:09 -04:00
Mateus Dalepiane
6bf36d2d86 Merge branch '081-java-detection' into 090-java-detection 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/resources/prod/lib/bbb_deskshare.js
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java
 2014-09-08 15:06:50 -03:00
Mateus Dalepiane
77c6bbf500 Merge branch '090-new-videodock' into mconf-live0.6.1 2014-09-03 16:39:03 -03:00
Fred Dixon
e02476071d Make clear this is a private echo test 2014-09-01 16:48:00 -04:00
syeshchenko
1d148ef624 Merge branch 'master' into chrome-webcam-permission-prompt 2014-09-01 13:18:32 -07:00
syeshchenko
ae6a4d5fa1 on Chrome show webcam permission prompt before webcam preview opened 2014-09-01 13:10:50 -07:00
Fred Dixon
88a0455248 Tweak phrasing for private echo test 2014-08-29 11:51:31 -04:00
Fred Dixon
9380a73dac Added message to let administration know that monit will restart bbb-record-core and LibreOffice. Tweaked the language for audio settings dialog. 2014-08-28 17:39:59 -04:00
Richard Alam
94cfbafb0a Merge pull request #380 from SenecaCDOT-BigBlueButton/unsupported-deskshare-chrome-on-mac 
identify if user is on mac and chrome and show the warning during deskto...
 2014-08-26 16:47:38 -04:00
syeshchenko
5ccc49cde9 properly resized presentation file list, centered file format hint text and fixed typo 2014-08-26 13:25:32 -07:00
Mateus Dalepiane
cbb4a167bb Merge remote-tracking branch 'origin/new-videodock' into 090-new-videodock 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/AvatarWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
 2014-08-26 17:20:00 -03:00
syeshchenko
77b7d4b327 identify if user is on mac and chrome and show the warning during desktop share 2014-08-26 12:02:08 -07:00
Fred Dixon
a374c59e30 Renamed 'WebRTC' -> 'WebRTC Audio' so users have a better chance of knowing what this indicator means 2014-08-23 21:57:03 -04:00
Fred Dixon
35b3c6b1bf Corrected wording in prompt for user to give permission to access microphone (FireFox) 2014-08-23 18:47:31 -04:00
Richard Alam
ba5b2d357f Merge pull request #379 from SenecaCDOT-BigBlueButton/sort-raisehand-better 
minor client updates
 2014-08-23 15:35:19 -04:00
Chad Pilkey
8e9477bbe8 sort based on handraised, move strings to locale, minor tweaks to the audio dialogs 2014-08-23 12:31:28 -07:00
Fred Dixon
9d37588495 Minor tweaks in language strings 2014-08-23 08:06:52 -04:00
Fred Dixon
55baf5b0be Minor updates to prompts 2014-08-21 21:18:10 -04:00
syeshchenko
85d3e5f72a properly resized upload presentation window, removed unnecessary text 2014-08-21 10:48:13 -07:00
Chad Pilkey
84c5197097 Merge remote-tracking branch 'upstream/master' into enable-raisehand-for-all 2014-08-19 10:57:10 -07:00
Chad Pilkey
1689a86113 the raise hand button is now visible for all users 2014-08-19 10:56:03 -07:00
Fred Dixon
ec707f829f Minor tweak to the webRTC notification (lower right-hand corner) 2014-08-19 13:10:47 -04:00
Fred Dixon
374828105f Tweaking the language for the Audio Test dialog 2014-08-19 13:02:15 -04:00
Chad Pilkey
3dee8327f6 Merge pull request #366 from SenecaCDOT-BigBlueButton/misc-client-fixes 
Misc client fixes
 2014-08-18 12:27:38 -04:00
Chad Pilkey
7595dbebd2 added notifications to the users window for room mute and lock state 2014-08-18 09:25:00 -07:00
Felipe Cecagno
b4a7a9d317 localizing the modifications on the shared notes for en_US and pt_BR 2014-08-18 13:12:44 -03:00
Fred Dixon
1db651ffcd Minor tweaks to text phrases and icons 2014-08-17 22:15:49 -04:00
Chad Pilkey
9daf1d7a16 added styling to the fileupload help, also cleaned up some text 2014-08-17 13:56:15 -07:00
Chad Pilkey
d044596b82 added a notification for when you are using webrtc 2014-08-16 11:35:00 -07:00
Richard Alam
19de54ce9e Merge pull request #360 from SenecaCDOT-BigBlueButton/audio-button-click-bug 
Fixed mic button won't change status when flash voice stopped. Added use...
 2014-08-15 13:53:04 -04:00
syeshchenko
d34db11f43 Fixed mic button won't change status when flash voice stopped. Added user feedback when flash echo test in progress and flash echo test failed. 2014-08-15 09:42:49 -07:00
Chad Pilkey
3aedc92187 Merge remote-tracking branch 'upstream/merge-polling-with-master' into recording-notification 2014-08-14 11:22:38 -07:00
Chad Pilkey
f38ff557a1 added a reminder to the recording button 2014-08-14 11:21:21 -07:00
Richard Alam
c56fde0c42 Merge pull request #348 from speakserve/unify-version-number 
Unify version number
 2014-08-13 14:17:45 -04:00
Ghazi Triki
bb09eb6d75 After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
Ghazi Triki
9a794f854a Bumped projects version and Flex locales to 0.9 2014-08-13 10:28:08 +01:00
Chad Pilkey
b5cc4ec31d Merge remote-tracking branch 'upstream/merge-polling-with-master' into fix-chrome-webrtc 2014-08-10 13:42:54 -07:00
Chad Pilkey
980100dad6 fixed an issue when leaving the audio 2014-08-10 13:39:27 -07:00
Richard Alam
b98bd3fc25 Merge branch 'switch-to-sipjs' of https://github.com/SenecaCDOT-BigBlueButton/bigbluebutton into switch-to-sipjs 2014-08-10 09:28:03 -07:00
Chad Pilkey
8607c78c2a moved echo test strings to localization, and animated the dots 2014-08-10 07:56:08 -07:00
Richard Alam
62f9ed3944 - move locale settings to bottom 
- add recording lable to meeting name in toolbar
 2014-08-07 10:32:10 -07:00
Richard Alam
e6f1c6a852 - add string to locale 2014-08-05 11:14:23 -07:00
Ghazi Triki
ac7af7dfea Manually bumped all application version to the correct actual version 0.9.0-dev 2014-07-31 17:42:38 +01:00
Richard Alam
806a09ec3f - update copyright year 2014-07-25 08:03:32 -07:00
Henrique Valcanaia
ffe016bf8c Save/copy chat 2014-07-08 18:07:27 +00:00
Felipe Cecagno
c3c56a6355 few improvements on the camera messages; cleanup and refactoring of the new video dock implementation; extracted many hardcoded branding information to the branding file 2014-06-11 17:01:45 -03:00
Richard Alam
0dd1b37afd Merge branch 'merge-polling-with-master' into broadcast-layout 2014-06-06 22:14:32 -07:00
Richard Alam
aac2dd3c3c - chnage label on lock settings 2014-06-06 21:26:01 -07:00
Richard Alam
262f94b69c Merge branch 'merge-polling-with-master' into broadcast-layout 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-06-06 15:34:35 -07:00
Chad Pilkey
632096fd64 the phone option is now somewhat configurable 2014-06-05 13:52:37 -07:00
Chad Pilkey
9b86798f21 cleaned up the file upload window and made it so that when you click the file name it will open the native file dialog 2014-06-04 11:47:24 -07:00
Chad Pilkey
344103922a moved the webrtc call failed alertbox text to locales 2014-06-03 13:14:05 -07:00
Chad Pilkey
f6cb040908 moved the audio selection window strings to the locale file 2014-06-03 09:00:41 -07:00
Richard Alam
04c271996d Merge branch 'broadcast-layout' of github.com:mconf/bigbluebutton into broadcast-layout 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/events/LayoutEvent.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/LayoutService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
 2014-05-29 11:21:01 -07:00
Felipe Cecagno
5821c32372 implemented the new button broadcast layout, which will send to all viewers the moderator's current layout; the lock button and broadcast button only affect viewers, not moderators 2014-05-29 12:19:40 -03:00
Richard Alam
e254787276 - add layout to lock settings 2014-05-28 12:25:28 -07:00
Richard Alam
068df39570 - add [Disabled] text beside feature name 2014-05-26 11:32:21 -07:00
Richard Alam
f266067e1a - display message to user when auth token is invalid 2014-05-21 18:42:49 +00:00
Felipe Cecagno
738162fd5f trying to improve the Java detection using Java Deployment Toolkit Script (http://docs.oracle.com/javase/6/docs/technotes/guides/jweb/deployment_advice.html#deplToolkit); few modifications on DesksharePublishWindow to make it more straightforward 2014-05-16 21:00:18 -03:00
Felipe Cecagno
9a617db14e implemented the entire interactive full screen 2014-05-15 20:41:41 -03:00
Felipe Cecagno
92eac1e988 Merge branch 'global-audio' into merge-global-audio 
Most of the client implementation is going to be rewritten on next commits.
 2014-04-23 16:13:40 -03:00
Richard Alam
214957e52c - localize text 2014-03-28 16:02:33 +00:00
Felipe Cecagno
417b518c2b Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into guest-role-0.81 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-02-24 12:37:35 -03:00
Richard Alam
ac111de364 Merge remote branch 'bbb/v0.81-javau51-update' into merge-java-7u51-branch 2014-02-19 20:09:56 +00:00
Richard Alam
948e1b323e Merge branch 'master' into merge-polling-with-master 2014-02-12 15:59:23 -05:00
Chad Pilkey
e3b617225e Merge pull request #305 from syeshchenko/presentationWindowFix 
FileUploader window fixes
 2014-02-12 13:04:00 -05:00
Gustavo Salazar
339608c813 update message for not webrtc capable browser 2014-02-10 14:16:05 -08:00
Richard Alam
c77ddd76d3 Merge branch 'master' into merge-polling-with-master 2014-02-10 21:49:36 +00:00
Gustavo Salazar
edf9518a31 Merge master branch to add style in mic settings. 2014-02-10 11:03:15 -08:00
Gustavo Salazar
ea0c763712 Merged with https://github.com/mconf/bigbluebutton/tree/webrtc_support 2014-02-07 16:56:23 -08:00
syeshchenko
06bf0fe049 Add file format hint message 2014-02-05 11:01:23 -08:00
Chad Pilkey
d8bbfbfa36 moved the Mic Warning strings to the locale file and fixed up a bug with the chrome warning popup 2014-02-04 15:42:46 -08:00
Chad Pilkey
ecac0b7a1d fixed up the ui of the audio settings a little bit 2014-02-04 14:43:20 -08:00
Richard Alam
a6a58e6ecb - update java string to u51 2014-01-16 17:57:31 -05:00
Richard Alam
5559a2b8cc Merge branch 'master' into merge-polling-with-master 
- there are compile issues we need to fix

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2014-01-23 20:49:04 +00:00
Felipe Cecagno
3070127a8e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
 2014-01-15 17:53:10 -02:00