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

3286 Commits

Author SHA1 Message Date
Richard Alam
858f1fef88 - try to figure out why whiteboard history isn't working 2014-02-10 21:48:24 +00:00
Richard Alam
5552583bbe - fix typo as it's driving CHad nuts :) 2014-02-10 21:21:15 +00:00
Richard Alam
79d3146ce1 - synch presentation 
- however, whiteboard doesn't sync for latecomers
 2014-02-10 20:27:58 +00:00
Richard Alam
1f080c78e0 - now late comers can display current presentation page 2014-02-10 19:39:05 +00:00
Richard Alam
20f3e41038 - alittle bit of formatting 2014-02-09 20:20:01 -05:00
Richard Alam
03d4b05217 - continue fixing presentation. Looks like it synchs. Need to fix why 
current page of presentation doesn't display for late comer.
 2014-02-09 15:51:05 -05:00
Richard Alam
d4b02df765 - fix go to slide message 2014-02-08 19:51:46 -05:00
Richard Alam
f12ec75377 - slowly making presentation work again 2014-02-08 17:56:13 -05:00
Richard Alam
aa8f68076f - try to figure out logging 
- send presentation messages as JSON
 2014-02-08 15:29:12 -05:00
Richard Alam
ff333b9232 - handle get presentation info message 2014-02-08 14:20:05 -05:00
Richard Alam
cf321098ac - try to get presentation working again 2014-02-07 14:14:28 -05:00
Richard Alam
b209dad293 Merge branch 'merge-master-with-new-polling-feature-branch' into merge-polling-with-master 
Conflicts:
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/lock/LockService.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/ParticipantsService.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonGateway.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/User.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/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2014-01-31 20:07:55 +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
Chad Pilkey
8b86dc82eb fixed bug 1716 - fixed an index out of bounds exception in repeatChatMessage 2014-01-29 12:40:23 -08: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
d6335d0874 Merge branch 'master' into audiosettings 2014-01-28 18:26:43 +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
Chad Pilkey
bdc12d7f4e Merge pull request #296 from mconf/presentation-arrow-keys 
Re-enabling the common shortcut keys to change the slides
 2014-01-20 10:21:35 -08:00
Gustavo Salazar
6c51099e26 Merge branch 'audiosettings' of github.com:gugat/bigbluebutton 2014-01-20 09:25:06 -08:00
Tiago Daniel Jacobs
a62d19dc06 Merge remote-tracking branch 'remotes/origin/master' 2014-01-20 01:21:02 -02:00
Tiago Daniel Jacobs
ac265adb1e Fixed lockSettings config loading with dynamic config.xml; 2014-01-20 01:20:04 -02: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
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
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
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
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
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
Gustavo
9e61cc334a update locales 2013-10-30 20:53:29 +00:00
Richard Alam
a961161605 - sign with new certificate that expires in 2014 2013-10-30 12:40:08 -07:00
Chad Pilkey
f77d795084 fixed the annotation drawing so that the line thickness scales when you zoom a presentation 2013-10-29 08:24:55 -07:00