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

6808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Pilkey
0a4336e24e Merge pull request #303 from SenecaCDOT-BigBlueButton/enable-colorpicker 
Enabled colorpicker
 2014-01-31 15:26:44 -08:00
syeshchenko
4a0a702165 enabled colorpicker 2014-01-30 14:27:54 -08:00
Gustavo Salazar
99866d43a7 Print audio file name with problems. 2014-01-30 10:45:43 -05:00
Chad Pilkey
8728670e7e Merge pull request #302 from SenecaCDOT-BigBlueButton/fix-bug-1716 
fixed bug 1716 - fixed an index out of bounds exception in repeatChatMessage
 2014-01-29 12:45:44 -08: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
753cac6b03 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audiosettings 2014-01-28 18:27:21 +00:00
Richard Alam
d6335d0874 Merge branch 'master' into audiosettings 2014-01-28 18:26:43 +00:00
Gustavo Salazar
8a32c657d5 Handle negative index in slide number. 
Related to issue #1710
 2014-01-23 16:36:28 -05:00
Gustavo Salazar
614cbdde92 Fix #1711 
Support pdf extension in uppercase https://code.google.com/p/bigbluebutton/issues/detail?id=1711
 2014-01-23 14:03:09 -05: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
c2bda20c82 - implement handling of FS ESL messages 2014-01-17 16:25:14 -05:00
Richard Alam
5037c4472c - propagate voice user join event 2014-01-17 04:13:45 -05:00
Richard Alam
8a74d3a41a - fix compile issues 2014-01-16 23:19:23 -05:00
Richard Alam
d3d259527e - update to java 7u51 2014-01-16 20:58:39 -05:00
Richard Alam
973237f6ca - fix compile issue 2014-01-16 18:40:05 -05:00
Richard Alam
a6a58e6ecb - update java string to u51 2014-01-16 17:57:31 -05:00
Richard Alam
5b583368ff - fix some compile errors 2014-01-16 17:12:15 -05:00
Richard Alam
baa735dbc9 - refactor how we process voice commands and events 2014-02-03 22:55:39 +00:00
Richard Alam
579b10b96b - start simplifying integration with FreeSWITCH 2014-01-31 22:43:31 +00: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
d8f1c2eabb - cleanup 2014-01-31 16:33:30 +00:00
Richard Alam
6f502672be - make bbb-apps start again 
- add configgy logging to bbb-apps
 2014-01-31 16:21:49 +00:00
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