BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,171 Commits 13 Branches 260 Tags 1.1 GiB
37cbe22d40
Commit Graph

960 Commits

Author SHA1 Message Date
Anton Georgiev
7e3c2f6eb0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-ui-less 2014-12-15 20:11:49 +00:00
Richard Alam
ce07751d79 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1837 2014-11-28 14:24:28 -08:00
Anton Georgiev
4172537f24 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-merge-with-m 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml
 2014-11-28 20:33:11 +00:00
Chad Pilkey
acde1ef3ed Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into remove-chat-translation 2014-11-26 09:14:18 -08:00
Chad Pilkey
5cbb059aa6 removed all of the old google translate code in apps and client 2014-11-25 15:17:06 -08:00
Leonardo Crauss Daronco
2c63aa6796 Merge remote-tracking branch 'upstream/master' into webhooks 2014-11-24 13:55:55 -02:00
Richard Alam
9f63905a7b Merge pull request #439 from bigbluebutton/cleanup-logging 
- remote logging noise
 2014-11-21 16:44:15 -05:00
Richard Alam
b9b9328151 - remote logging noise 2014-11-20 22:33:25 +00:00
Richard Alam
1d234e13be - for some reason we either (a) get duplicate events for user join from FS or (b) FS-ESL isn't handling 
the event properly. This results in duplicate entries on the user's list when user calls in from the
   phone. Check if a voice user with the same id is already in the voice conference and ignore the second
   event.
 2014-11-20 18:53:09 +00:00
Lucas Zawacki
7d401dab53 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
 2014-11-14 15:33:17 -02:00
Leonardo Crauss Daronco
81f5a109b6 Merge remote-tracking branch 'upstream/master' into webhooks-2.0 2014-11-14 14:28:35 -02:00
Felipe Cecagno
8a89cd1a71 sending the externalMeetingId from bbb-web to bbb-apps, so bbb-apps can use it on redis pubsub message meeting_created_message 2014-11-11 17:54:17 -02:00
Richard Alam
000ddbd9d7 - add more logging about the connection to red5 2014-11-07 22:09:49 +00:00
Richard Alam
8ba0f1855e - add more loggig 2014-10-29 21:54:33 +00:00
Richard Alam
06d47f6cb6 - extracted the wrong boolean from the message which broke recording 2014-10-29 21:53:23 +00:00
Richard Alam
4ba6b5ef0d - allow start/stop recording when doing autostarting recording 2014-10-21 21:11:46 -07:00
Richard Alam
5af452c39f - start implementing auto start recording 2014-10-20 03:39:44 -07:00
Richard Alam
9c0280c129 - fix txt uri for accessibility 2014-10-20 01:18:13 -07:00
Anton Georgiev
47e3b4eded send a user_left_voice_request when the html5 user clicks on Leave Audio. Right now we just leave it to webrtc to notify the server 2014-09-23 15:22:55 +00:00
Anton Georgiev
bb43a38bed send voiceBridge and duration in get_all_meetings_reply. We need the voiceBridge to join audio 2014-09-19 17:55:59 +00:00
Richard Alam
e313379355 - changed the wrong field to be zero based. Should be the slide field instead of num. 2014-09-15 08:29:15 -07:00
Anton Georgiev
4f25f2ced1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master 2014-09-02 21:08:03 +00:00
Richard Alam
4bf941b108 - although the page number is not used in whiteboard recording processing, just match the page number with the goto slide event in events.xml 2014-09-02 13:17:28 -07:00
Richard Alam
d5d541a2c5 - subtract 1 from GotoSlideEvent and ResizeAndMoveSlideEvent to events.xml so that the recording is backwards compatible with 0.81 and earlier 2014-09-02 12:44:52 -07:00
Richard Alam
a1ded8fdb5 - add current time on header of JSON messages so we can display the correct time instead of calculating from the timestamp 2014-09-02 11:43:05 -07:00
Anton Georgiev
cf125781db Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
 2014-09-02 17:54:14 +00:00
Richard Alam
172738534c - fix issue where rectangle shape gets lost when zooming 2014-08-29 08:57:34 -07:00
Richard Alam
84a16cdfe4 - add meeting name and duration on meetingCreated message 2014-08-29 08:56:36 -07:00
Richard Alam
7914c656a4 - missed one are where we are not propagating message from Meeting Actor 2014-08-27 16:46:28 -07:00
Richard Alam
fe5aabd38a - remove meeting from FS list of meetings when meeting is destroyed 2014-08-27 16:03:27 -07:00
Richard Alam
e4bd6b044c - add more logging 2014-08-27 15:29:16 -07:00
Richard Alam
d941b48bb6 - add log when handling user joining voice conference 2014-08-27 14:50:50 -07:00
Richard Alam
d3a4e271ce - add log on FS client when user joins voice conference 2014-08-27 14:30:55 -07:00
Richard Alam
1d26b39ed5 - turn off talking when user is muted or joined listen-only 2014-08-26 13:43:50 -07:00
Richard Alam
6430b73856 - fix displaying of speaker icon when joined in listen only mode 2014-08-26 11:58:26 -07:00
Richard Alam
c2a5c16f4d - there are still some edge cases we can't account for 2014-08-26 10:50:40 -07:00
Richard Alam
29ffe4aca8 - use external user id on join voice only 2014-08-26 10:24:40 -07:00
Richard Alam
9de33f2500 - use external userid on join of voice conf only 2014-08-26 10:24:07 -07:00
Richard Alam
27feed283f - revert change as it's triggering side effects on displaying speaker icons 2014-08-26 09:50:40 -07:00
Richard Alam
fbb20831a1 - fix issue where a user is duplicated when calling in because the 3rd-party app passed an external userid 2014-08-26 09:21:42 -07:00
Richard Alam
95ffcafa85 - add more logging to figure out why were get duplicate entries on user's window 2014-08-26 07:38:07 -07:00
Richard Alam
beb22f55e5 - add more logging to figure out why callers using phone displays multiple times in users window 2014-08-25 10:44:07 -07:00
Richard Alam
260d41d297 - generate goto slide event when sharing a presentation 2014-08-25 08:14:19 -07:00
Richard Alam
edd070ef48 - implement eject user from meeting 2014-08-23 12:00:41 -07:00
Richard Alam
97affb9874 - prevent multiple start/stop audio recording events 2014-08-22 12:47:15 -07:00
Anton Georgiev
22eaddc648 missed this during the merge from bigbluebutton:master 2014-08-21 18:48:58 +00:00
Anton Georgiev
adf20cca7d Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merging-html5-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.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/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
 2014-08-20 15:24:25 +00:00
Richard Alam
e24e619625 - when user joins voice, see if the meeting is muted and mute user if it is 2014-08-18 12:58:43 -07:00
Richard Alam
b77811d7a6 - mute late user if meeting is muted 2014-08-18 12:23:59 -07:00
Richard Alam
236fd68db1 - send meeting status to client when user joins 2014-08-18 11:19:48 -07:00