Commit Graph

69 Commits

Author SHA1 Message Date
Lucas Zawacki
6b56521fbd html5: Correctly kick user out of voice in markUserOffline
The old code was wrongly setting obj.voiceUser when it should set obj.user.voiceUser
and caused problems when for example:

* user joins audio
* user hits F5
* user reconnects without webrtc audio enabled
* html5 client reports user still in audio and leaving/joining doesnt work anymore
2016-03-03 17:38:26 -03:00
Lucas Zawacki
92d5aaf5d0 Remove extra calls to updateVoiceUser in user mute/unmute
This is supossed to be called when handling messages from the redis queue
and when called here would cause errors because it had no callback function.

The correct way is not calling it here, but handling the muting/unmiting when
receiving messages (which is already done).
2016-03-02 12:44:34 -03:00
Oleksandr Zhurbenko
34ff1e19ba Reworked ES6 on the server side 2016-01-29 17:33:40 -08:00
Oleksandr Zhurbenko
cc7f8b4fac Updating the new slide's ratios and offsets right away 2016-01-22 22:51:41 -08:00
Oleksandr Zhurbenko
f287f5f4cb Simply updating data in the Slides collection instead of removing and adding whole objects 2016-01-21 10:29:18 -08:00
Maxim Khlobystov
cc6ffe15df Got all the single-line comments back. 2016-01-15 00:46:41 -05:00
Maxim Khlobystov
52220a42cb Moved to ES2015. 2016-01-12 15:15:16 -05:00
Gabriel Campes
791290e8b9 Add set presenter to HTML5 2015-12-07 13:33:52 -02:00
Gabriel Campes
be9e582a1d Add kick user to HTML5 2015-12-04 14:38:19 -02:00
Anton Georgiev
007911ad85 remove extra callback 2015-12-03 20:23:20 +00:00
Anton Georgiev
1e4477d1c2 moved the cursor into its own collection 2015-12-03 20:01:27 +00:00
Anton Georgiev
0aa7038ae1 fix bug-shapes were flushed no matter which meeting ends 2015-11-27 16:40:31 +00:00
Anton Georgiev
550a24a638 fix for incorrect user list on an existing meeting when meteor starts 2015-11-18 14:55:50 -05:00
Anton Georgiev
38478eccea removed params and message that are not needed 2015-11-18 13:53:55 -05:00
Anton Georgiev
f7de07970a fix for presentation slide change from html5 presenter 2015-11-18 09:47:36 -05:00
Oswaldo Acauan
5dddcb819f Working on HTML5 displaying the last slide when presentation is deleted 2015-11-17 15:01:27 -02:00
Anton Georgiev
e3efd24a2b fix function def typo 2015-11-09 18:45:31 +00:00
Anton Georgiev
247349e9b4 working on serializing message handling 2015-11-06 21:38:18 +00:00
Anton Georgiev
db62de4e2f in the process of serializing message handling 2015-11-05 22:22:14 +00:00
Anton Georgiev
1ef29a034b push the redis messages in a FIFO queue to avoid race cond 2015-11-04 20:57:56 +00:00
Anton Georgiev
c4d7d70dce fix placement of welcome message issue 2015-11-03 22:19:17 +00:00
Anton Georgiev
9e56192e4b improve logs to detect correct sequence of events and detect race cond 2015-11-03 21:07:56 +00:00
Anton Georgiev
2ca161124e do not store flash client users while reconnecting 2015-11-02 19:37:23 +00:00
Anton Georgiev
39f90d2f8b cleaning up 2015-10-30 21:30:58 +00:00
Anton Georgiev
47cee3138f use UPSERT for chat messages too 2015-10-30 21:27:56 +00:00
Anton Georgiev
a4dd3d63e4 use UPSERT for meetings and users 2015-10-30 20:23:41 +00:00
Anton Georgiev
4b53c3d874 omit users with authToken undef; improve logs 2015-10-28 16:12:40 +00:00
Anton Georgiev
e89c37f8ae lock settings - missed these 2015-10-28 16:00:55 +00:00
Anton Georgiev
7d624edbb8 leave global audio when exiting 2015-10-26 22:54:49 +00:00
Maxim Khlobystov
d5fddab14d Cleaning up. 2015-10-06 08:10:38 -07:00
Maxim Khlobystov
65a7ac4b70 Implemented emoji status detection. 2015-10-01 15:24:43 -07:00
Maxim Khlobystov
d8ecfd8e04 Added the ability to set emoji status. 2015-10-01 12:41:43 -07:00
Anton Georgiev
d7e414fa43 [un]mute message was not going to the correct redis channel 2015-09-14 19:55:04 +00:00
Richard Alam
dbe2e1c389 Merge pull request #2730 from OZhurbenko/meteor-ui
Polling, Sorting and URL Validation
2015-08-19 21:06:45 -04:00
Maxim Khlobystov
e676b2b1c4 Set the client to store the slide URI in a more general way to be able to handle old PNG links. 2015-08-17 16:55:28 -04:00
Oleksandr Zhurbenko
d3b59103b4 Added Poll properties to the object 2015-08-06 16:32:41 -07:00
Maxim Khlobystov
5c0cb9c3d8 Merge branch 'meteor-client-pdf-conversion' of https://github.com/gthacoder/bigbluebutton into development
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala
2015-08-06 16:21:31 -04:00
Oleksandr Zhurbenko
84840f1830 Added handling for 'user_voted_poll_message' 2015-08-01 12:27:01 -07:00
Oleksandr Zhurbenko
147e1942fb Removing the userIds of the users who already voted from the collection, added null pointer validation 2015-07-31 11:07:27 -07:00
Oleksandr Zhurbenko
bae52f4f4b Added the ability to send responses to polls back to the server 2015-07-30 17:08:12 -07:00
Oleksandr Zhurbenko
10be3d03e0 Added permissions for viewers and a presenter. Viewers can't retreive the total number of votes. Also, viewers can't retreive any data if they have voted already 2015-07-27 15:55:29 -07:00
Oleksandr Zhurbenko
4288fd19b8 Added handling for 'poll_stopped_message' 2015-07-27 11:23:29 -07:00
Oleksandr Zhurbenko
8a45acef92 Added a meetingId and an initial number of votes to the Polls collection 2015-07-26 15:12:08 -07:00
Oleksandr Zhurbenko
d48734044a Keeping only the array of id's in the poll info, without any unnecessary parent elements 2015-07-25 20:46:32 -07:00
Oleksandr Zhurbenko
4a36514338 Improved the way we store a poll object into the collection and added the list of current users there 2015-07-24 16:09:27 -07:00
Oleksandr Zhurbenko
80ff67b6f2 First prototype of the functions for polls 2015-07-22 20:31:08 -07:00
Maxim Khlobystov
68529c8c0f Added changes to HTML5 client to handle SVG URI field. 2015-07-15 17:17:19 -04:00
Anton Georgiev
89086d4143 adapt html5 client to message changes 2015-06-16 15:58:45 +00:00
Maxim Khlobystov
1eb6932317 Merge branch 'fix-clean-message-slowdown' of https://github.com/lfzawacki/bigbluebutton into meteor-client 2015-06-08 10:41:36 -07:00
Richard Alam
6a9bf94c2c Merge pull request #635 from perroned/bridge-construction
Moving functionality into BBB bridge
2015-05-07 11:42:08 -04:00