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

43 Commits

Author SHA1 Message Date
perroned
5478e37b5b merge conflicts 2015-10-06 12:11:43 -07: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
perroned
f7df2964c5 Autosubscribe to deskshare watch-only stream on join 2015-09-30 11:04:01 -07:00
perroned
3ea085ea07 Trigger deskshare start and stop 2015-09-30 09:57:44 -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
Anton Georgiev
7110866925 presentation slide switch-permissions 2015-05-06 19:58:25 +00:00
Anton Georgiev
e8351d274e presentation slide switch-basics 2015-05-06 19:58:12 +00:00
Lucas Zawacki
6b04a86e7e Prevent slowdown on firefox when deleting lots of shape messages 
By creating a new collection called WhiteboardCleanStatus which
is used to alert the clients that the server is cleaning shapes.

When shapes are being cleaned they are not drawn and so things don't slow down on firefox or chrome
 2015-05-05 18:33:08 -04:00
perroned
a5c47b49df Moving functionality into BBB bridge 2015-05-05 13:15:33 -07:00
Anton Georgiev
1333856c9b pick lockOnJoin from a settings file 2015-04-23 21:09:28 +00:00
Anton Georgiev
81762d5395 disallow unmuteSelf on lock;single user lock->mute 2015-04-23 20:53:07 +00:00
Anton Georgiev
eea695b326 when enabling disableMic the voice sharing viewers are now muted 2015-04-23 19:55:38 +00:00
Anton Georgiev
5e99ec98c1 Merge branch 'master' into lock-settings 
Conflicts:
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
	bigbluebutton-html5/app/server/user_permissions.coffee
 2015-04-22 14:50:30 +00:00
Anton Georgiev
fa4cd71ff4 publishing to redis channel "meeting" instead of handling the event on channel "voice" 2015-04-16 19:06:04 +00:00
perroned
59b02e3b2f Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call 2015-04-15 05:49:32 -07:00
perroned
19816f060e avoid conflict 2015-04-13 04:08:03 -07:00
Anton Georgiev
7a13d10b91 improve handling of user_joined_voice_message 2015-04-10 18:01:45 +00:00
Anton Georgiev
5446539929 The upsert check was incorrect, checking for exact structure. Split into findOne + insert 2015-04-06 20:00:44 +00:00
Anton Georgiev
fdbc62ccd1 Cherry pick Anton's server side listen only. Fix conflicts 2015-04-06 05:10:56 -07:00
Anton Georgiev
4520949a28 the updated mongo has a slightly stricter rule regarding cursors. The welcome message was not stored correctly 2015-04-02 21:42:35 +00:00
Anton Georgiev
cdba908eea server side listenOnly. temporarily hooked to raiseHand 2015-04-02 20:11:09 +00:00
perroned
1efc317fcc public server method for joining as listen only 2015-04-02 08:07:58 -07:00
Anton Georgiev
b47e8f3330 lock settings - handle new_permission_settings, user_locked_message 2015-03-30 17:49:30 +00:00
Anton Georgiev
d830e3358d move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00