BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,912 Commits 13 Branches 260 Tags 1.1 GiB
81aef001a0
Commit Graph

103 Commits

Author SHA1 Message Date
Chad Pilkey
24c6d48dc2 removing files that should not have been committed 2016-05-02 12:45:25 -07:00
Ghaz Triki
11d86f6aa8 Merge 'branch air-ui' into 'mobile-client' 2016-04-26 09:19:17 +01:00
Richard Alam
ef2470f33b Process JSON message from Redis on another thread 
Process converting of message from json on a different thread to protect the redis sub actor from
 dying when exception occurs due to invalid message.
 2016-03-07 16:42:40 +00:00
Anton Georgiev
107fa7c07a fix for #3012 no presenter after ex-presenter kicked 2016-02-19 16:52:56 +00:00
Richard Alam
3273912bd1 Merge pull request #2968 from ritzalam/expire-redis-keys-after-14-days 
Expire redis keys after 14 days
 2016-01-22 14:29:25 -05:00
Pedro Beschorner Marin
8890f46910 - avoid scala warning messages 2016-01-22 19:00:50 +00:00
Pedro Beschorner Marin
086e339653 Simple modification to avoid multiple start audio recording events 2016-01-22 16:43:17 +00:00
Richard Alam
f501fb5803 - expire redis recording keys after 14 days 2016-01-21 20:43:28 +00:00
Richard Alam
6956ddf723 - do not record events if the meeting is not recorded 2016-01-21 20:42:47 +00:00
Richard Alam
c66c180040 - make the flash client not attempt to reconnect when the user has been ejected from the meeting. 2016-01-19 16:16:12 +00:00
Richard Alam
d79d763857 Merge branch 'reconnect-fixes' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-reconnect-fixes 2016-01-14 19:43:08 +00:00
Pedro Beschorner Marin
afb1cc44d6 Fixed SIP mic reconnection 2016-01-13 15:01:04 +00:00
Pedro Beschorner Marin
28bf1c9084 Fixed global audio reconnection 2016-01-13 13:50:38 +00:00
Felipe Cecagno
d98bee07cf Merge webrtc-reconnect into bigbluebutton/master 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
 2016-01-12 15:27:01 -02:00
Richard Alam
0bba549b38 - sometimes we see multiple wav files on recorded meetings. This was due to starting recording again 
when the user gets disconnected from bbb-apps but still connected to audio.
 2015-12-02 23:03:44 +00:00
Richard Alam
c024cd570c - fix where 2 events are recorded in redis for each voice event. 2015-12-02 21:37:18 +00:00
Richard Alam
93dd5186b4 - user internal user id for user in the voice conf 2015-09-30 18:55:17 +00:00
Richard Alam
43c8f9b5ec - add more info on logs 2015-09-24 20:05:48 +00:00
Richard Alam
8ede5983ea - do not re-inject message into the actor but instead process the message inline to prevent 
race condition where a message gets processed before the injected message
 2015-09-21 14:42:07 +00:00
Richard Alam
1b8cb41152 - initialize voice user properly when disconnected from global audio 2015-09-17 20:26:00 -04:00
Richard Alam
2278ee01ec - upgrade bbb-commons-message version 2015-09-14 21:45:55 +00:00
Richard Alam
bbfbdf20e9 - cleanup 2015-09-14 21:25:27 +00:00
Richard Alam
44763bf283 - try to fix lock settings 2015-09-14 20:18:27 +00:00
Chad Pilkey
51650fb998 made the init audio and permissions message payloads actually contain something and corrected chatpermission message names 2015-09-11 15:02:28 -07:00
Richard Alam
f78dc3653c - fix issue where other users get disconnected when a user refreshes browser after a reconnect 2015-09-08 20:27:10 +00:00
Richard Alam
dbbb4139d2 Merge pull request #2766 from capilkey/misc-client-changes-100 
Misc client changes 100
 2015-09-04 19:14:24 -04:00
Richard Alam
4b9e96cea2 - inject user join as message to prevent race condition of messages 2015-09-04 19:20:25 +00:00
Chad Pilkey
4df8c88b94 Swapped Yes/No and True/False in poll answers 2015-09-03 15:34:47 -04:00
Richard Alam
796f71f642 - fix issue where users does not get refreshed after reconnect 2015-08-23 23:03:15 -04:00
Richard Alam
bda62afa4d - try to maintain userid when a user reconnects to be able to match the user 2015-08-23 18:22:48 -04:00
Richard Alam
52d2ed1666 - try to fix auto-reconnect for listen only users 2015-09-03 14:04:48 +00:00
Richard Alam
a63a211143 - change poll config for jedis 
- attempt to reconnect redis pubsub subscriber if disconnected
 2015-08-23 07:09:00 -04:00
Ghazi Triki
3a11d30115 Fixed emojiStatus is correctly saved in UsersModel. 2015-08-27 21:25:54 +01:00
Ghazi Triki
2fb8296ff0 - Fixed emojiStatus not set correctly in server. 
- Upgraded bbb-common-message version.
 2015-08-26 18:51:05 +01:00
Ghazi Triki
988d8cf56c Removed lower hand methods in server applications and replace raise hand by emoji status. 2015-08-25 09:46:00 +01:00
Richard Alam
39baecef24 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into redis-pubsub-keepalive 2015-08-21 13:46:42 +00:00
Richard Alam
46ba98f737 - add ping/pong message between different components to verfiy that we have working path 2015-08-20 20:44:40 +00:00
Richard Alam
282fecf351 - ping/pong message between red5 and bbb-apps 2015-08-19 18:32:07 +00:00
Fred Dixon
c875be4c1d Merge pull request #2727 from capilkey/variable-wb-poll-size 
Variable wb poll size
 2015-08-19 14:15:02 -04:00
Richard Alam
a3318e5f90 - send keep alive message 2015-08-19 14:33:46 +00:00
Richard Alam
8be746b4ac - start implementing round-trip pubsub monitoring 2015-08-18 21:51:48 +00:00
Chad Pilkey
7846add9e9 The Poll WB mark height increases with number of answers 2015-08-18 11:52:12 -04:00
Richard Alam
5472548118 - allow custom polling through chat message 2015-08-17 22:40:31 +00:00
Richard Alam
9302532be5 - start implementing custom poll 2015-08-13 22:33:51 +00:00
Richard Alam
4e4270912b - fix issue where deleting presentation doesn't remove the presentation from file upload window 2015-08-11 17:21:09 +00:00
Richard Alam
987397250c - stop poll when presenter change happens while poll is running 2015-08-10 15:21:38 +00:00
Richard Alam
15a368f444 - remove some printlns to lessen noise 2015-08-07 21:37:16 +00:00
Richard Alam
bc7aadcd22 - create new bbb-commons jar 2015-08-07 19:46:52 +00:00
Richard Alam
839e7ebf58 Merge branch 'svg-conversion' of https://github.com/gthacoder/bigbluebutton into gthacoder-svg-conversion 2015-08-07 18:28:16 +00:00
Richard Alam
839473395a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-leonardo-api-changes 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
 2015-08-07 15:06:40 +00:00