BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,833 Commits 13 Branches 260 Tags 1.1 GiB
ae5316116e
Commit Graph

6833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
11d935a4fe - try to implement lock settings feature 2014-01-30 22:29:32 +00:00
Richard Alam
c9f7996128 Merge branch 'master' into merge-master-with-new-polling-feature-branch 
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-30 16:50:09 +00:00
Richard Alam
18b352a2a2 - try to compile 2014-01-29 19:50:41 +00:00
Richard Alam
f251892cab - fix compile errors 2014-01-28 22:01:45 +00:00
Richard Alam
29e94500c4 Merge branch 'refactor-voice-users' into merge-polling-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/red5/voice/ClientManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/ConferenceService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserJoinedEvent.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomImp.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomManager.java
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2014-01-28 21:12:01 +00:00
Richard Alam
66fe84d2ca Merge branch 'audiosettings' into merge-polling-with-master 2014-01-28 18:41:09 +00: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
Richard Alam
2fe0d3a30e Merge branch 'new-polling-feature' of github.com:bigbluebutton/bigbluebutton into new-polling-feature 2014-01-23 19:31:25 +00:00
Richard Alam
9e67758f80 Merge pull request #297 from SenecaCDOT-BigBlueButton/fix-whiteboard-toolbar-visibility 
fixed an issue with keepToolbarVisible and an issue with the toolbar dissapearing when clicking the presentation window
 2014-01-16 09:22:01 -08:00
Richard Alam
eff2744558 Merge pull request #301 from mconf/record-button-master 
Adding Start/Stop Recording feature
 2014-01-16 09:21:25 -08:00
Felipe Cecagno
ca97a5eec5 implemented the new set of icons for the record button 2014-01-16 11:38:12 -02:00
Felipe Cecagno
d12c7f3091 reverting back the previous icons for webcam, headset and deskshare 2014-01-16 11:37:43 -02: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
Tiago Daniel Jacobs
0679568656 Fixed copyright string in pt_BR 2014-01-14 23:51:44 -02:00
Felipe Cecagno
98f1d51461 fixing the handling of multiple drawings from a single shape 
bug could be easily reproduced typing text, erase part of it and then type again
 2014-01-14 18:17:39 -02:00
Felipe Cecagno
3440ed0fe3 Merge branch 'v0.81' into record-button 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2014-01-14 14:05:41 -02:00
Richard Alam
2f36afc6cf Merge pull request #300 from BBBManager/bbb-issue-1656 
Fix for issue #1656
 2014-01-13 11:45:22 -08:00
Richard Alam
f45ea4a987 Merge pull request #299 from bigbluebutton/bbb-lock-settings 
Implemented lock settings in bbb-client and bbb-apps.
 2014-01-13 11:45:02 -08:00
Tiago Daniel Jacobs
5c054becdc Fix for issue #1656 2014-01-09 17:04:46 -02:00
Tiago Daniel Jacobs
8c912df459 Implemented lock settings in bbb-client and bbb-apps. 2014-01-09 03:52:03 -02:00
Chad Pilkey
74cb3bba80 fixed an issue with keepToolbarVisible and an issue with the toolbar dissapearing when clicking the presentation window 2013-12-19 15:23:55 -08:00
Gustavo Salazar
e1571aead4 Indicate the user has to click ALLOW in Chrome. 2013-12-13 11:31:08 -08:00
Gustavo Salazar
3f0d193644 Use microphone selected in join audio dialog during the session. 2013-12-12 09:29:27 -08:00
Fred Dixon
2709fbd34b Merge pull request #294 from fmarier/master 
Fix Persona URLs
 2013-12-05 12:28:49 -08:00
Felipe Cecagno
dab7547014 added a check on presentation publish script to avoid the duplication of thumbnails for a given slide 2013-12-02 15:23:02 -02:00
Felipe Cecagno
955f9edc99 fixing the issue of the whiteboard annotations not being shown in the proper slide; cleaning the environment (events.xml, recorded flag) when the session was recorded but the record button wasn't used 2013-12-02 13:57:05 -02:00
Gustavo Salazar
6bb7f7690d Slider for microphone record volume. 2013-11-28 13:27:56 -08:00
Gustavo Salazar
00b11c333f Warn user if microphone has no activity. 2013-11-27 12:22:43 -08:00
Felipe Cecagno
b6317a7c2b make the presentation also compatible with wireless presenter hardware 2013-11-26 12:48:37 -02:00
Felipe Cecagno
4888b4f63a added new listeners for Keyboard.LEFT and Keyboard.RIGHT to change to next or previous slide 2013-11-25 14:31:13 -02:00
Gustavo Salazar
2ed71a5fb0 Add references. 2013-11-22 16:02:35 -08:00
Gustavo Salazar
5e1b4b3b10 Use Nellymoser codec to test activity. 2013-11-22 16:01:29 -08:00
Gustavo Salazar
5c0c9d613b Test microphones without test button 2013-11-22 15:23:49 -08:00
Gustavo Salazar
f8d6f0881e Activity level without loopback true 2013-11-22 13:55:09 -08:00
Gustavo Salazar
58e78ef3c6 Show audio activity 2013-11-20 10:07:26 -08:00
Gustavo Salazar
3463fd62db Select microphone and test it with loopback in mic settings. 2013-11-19 15:34:58 -08:00
Francois Marier
dbb5a81c11 Fix Persona URLs 
The old browserid.org URLs are deprecated and will stop working at some point.
 2013-11-11 19:40:57 -08:00
Fred Dixon
6e3985d202 Minor update to bbb-conf 2013-11-08 16:07:56 -05:00
Fred Dixon
0d50884e08 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-11-07 20:08:48 -05:00
Fred Dixon
b12188fbed Changing lables for 0.81 2013-11-07 20:08:36 -05:00
Guilherme Augusto Dias
40a395ee6b Merge branch 'record-button' of github.com:mconf/bigbluebutton into record-button 2013-11-06 18:20:36 +00:00
Guilherme Augusto Dias
1d421f2d4a Retrieve duration 
BBB Web retrieves playback length from metadata.xml when it is available, otherwise playback length is calculated with start/stop meeting timestamps.
 2013-11-06 18:13:43 +00:00
Richard Alam
a58120f322 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1680 2013-11-05 18:28:12 +00:00
Fred Dixon
d5d502e4e4 minor bug fix in old stress testing script 2013-11-05 07:44:53 -05:00
Richard Alam
82281f1c0f - add more logging 2013-11-04 07:30:26 -08:00
Richard Alam
329d2b9af1 Merge pull request #291 from SenecaCDOT-BigBlueButton/add-another-string 
created a new locale string for the chat module
 2013-10-31 17:44:00 -07:00
Chad Pilkey
336c8f72f3 created a new locale string for the chat module 2013-10-31 16:27:14 -07:00
Richard Alam
032f10beaa Merge pull request #290 from kepstin/presentation-missing-slide 
Last-ditch fix for missing presentation images
 2013-10-31 14:01:56 -07:00
Calvin Walton
1d488e3c56 Last-ditch fix for missing presentation images 
We can only get here if all of the files for the presentation are
*completely* missing. One thing that can cause this is if the
presentation filename starts with a '.' character - the presentation
files aren't correctly archived then.
 2013-10-31 18:56:09 -02:00
Fred Dixon
149ea185f2 Updating version to 0.81-RC5 2013-10-30 14:47:16 -07:00