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

7684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
3b9e50f2d0 adding a whiteboard listener 2014-06-04 15:12:49 +00:00
Richard Alam
8015eeeecd Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master 2014-06-03 19:20:44 -07:00
Richard Alam
3051bf9dd5 - change color of user talking icon glow 2014-06-03 19:19:47 -07:00
Richard Alam
d7b6918340 Merge pull request #330 from SenecaCDOT-BigBlueButton/fix-webrtc-dialogs 
add audio selection window
 2014-06-03 19:36:52 -04:00
Anton Georgiev
42832891d6 rearranging 2014-06-03 21:12:37 +00:00
perroned
f71031b3f8 Cleaned up how meeting name is passed around, removed duplicated code and functions 2014-06-03 13:54:24 -07:00
Chad Pilkey
344103922a moved the webrtc call failed alertbox text to locales 2014-06-03 13:14:05 -07:00
perroned
be6b1cc918 Fixed someone's typo for a CSS field 2014-06-03 12:52:42 -07:00
perroned
ae1c01e194 Removing useless code 2014-06-03 12:26:59 -07:00
perroned
b8eafc5312 Forgot to put meeting name back into url for last commit 2014-06-03 12:25:43 -07:00
Chad Pilkey
b1da215ac2 if presenterShareOnly is true don't switch moderators to listen only when presenter changes 2014-06-03 12:14:51 -07:00
perroned
eb83bb7bfa Non-ideal fix for hiding-showing the users list 2014-06-03 11:51:59 -07:00
perroned
22db0d8dc9 Fixed meeting name so it shows up in chat, added it to the url 2014-06-03 11:48:02 -07:00
perroned
70da7d1deb test 2014-06-03 11:45:05 -07:00
Anton Georgiev
7d85751a43 fix indent + clean up 2014-06-03 17:09:11 +00:00
Chad Pilkey
cfc49f51d5 Merge pull request #319 from SenecaCDOT-BigBlueButton/fix-presentation-control-bar 
Fix presentation control bar
 2014-06-03 12:07:21 -04:00
Chad Pilkey
f6cb040908 moved the audio selection window strings to the locale file 2014-06-03 09:00:41 -07:00
Anton Georgiev
25275821af on logout the entire user row in the user list is removed 2014-06-03 14:40:35 +00:00
Chad Pilkey
d0618c1a03 added presenterShareOnly, error popup when webrtc fails with option to fallback to flash 2014-06-02 15:16:52 -07:00
Anton Georgiev
daea03df05 altered the flow of events. we first receive the get users reply and then we join the meeting. checks have been introduced to see if the user added to the list has the correct fields 2014-06-02 21:40:23 +00:00
Anton Georgiev
05beb77462 add a user to the userlist only if it is not present in the collection 2014-06-02 19:41:40 +00:00
Chad Pilkey
b9afd0e36b fixed a null pointer exception when the mic is not found 2014-06-02 09:23:13 -07:00
Chad Pilkey
e1a56c45ba Merge remote-tracking branch 'upstream/merge-polling-with-master' into fix-webrtc-dialogs 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
 2014-06-02 08:59:33 -07:00
Richard Alam
19ac02fab2 - enable polling by default 2014-06-02 07:44:46 -07:00
Richard Alam
26a142b49a - make window smaller 2014-06-01 18:17:07 -07:00
Richard Alam
e0f65acffd - make viewer init the polling module properly 2014-06-01 09:22:07 -07:00
Chad Pilkey
02e6a98f1c removed some unused managers from the phone module 2014-05-30 15:20:00 -07:00
Chad Pilkey
19ce05b31b created an audio selection window to choose your stream type 2014-05-30 15:19:25 -07:00
Chad Pilkey
91d2e1d288 removed the background from the listen only indicator image 2014-05-30 15:15:38 -07:00
Fred Dixon
ee839aa7a5 Merge pull request #324 from xaker1/feature 
Contributor agreement received.  Merging (thanks!)
 2014-05-30 15:52:53 -04:00
Anton Georgiev
188a4c49dc the slide on the html5 viewer is now syncronized with the slide at the flash presenter. presentation_page_changed_message 2014-05-30 19:12:58 +00:00
Anton Georgiev
1e115befe9 the current slide updates when the presentation (1.pdf to 2.pdf) has changed 2014-05-30 18:56:24 +00:00
Anton Georgiev
7880874520 displaying the current slide from the current presentation on get_presentation_info_reply 2014-05-30 18:23:13 +00:00
Richard Alam
f4ff66c211 - update jar version numbers for red5 1.0.2 2014-05-30 11:10:41 -07:00
Anton Georgiev
0476885281 filter the current page of the [current] presentation (filtering on the server side) 2014-05-30 16:32:00 +00:00
Anton Georgiev
29a51efa71 send the presentation info 2014-05-30 16:29:56 +00:00
Anton Georgiev
0281d24afd cleaning up 2014-05-30 15:57:18 +00:00
Richard Alam
e7dcf3c4bf - fix compile issue 2014-05-29 13:55:01 -07:00
Anton Georgiev
67308f9e19 cleaning up 2014-05-29 20:26:49 +00:00
Anton Georgiev
e7584d23d3 logging out a user - looks good in flash, will have to add a few things for html5 2014-05-29 19:55:32 +00:00
Richard Alam
8221f219d0 - pass list of users to sync 2014-05-29 07:28:55 -07:00
Richard Alam
224bea1f5f - sync layout with viewers 2014-05-29 07:06:44 -07:00
Richard Alam
e254787276 - add layout to lock settings 2014-05-28 12:25:28 -07:00
Anton Georgiev
2cfb4c4b2c cleaning up 2014-05-28 18:45:03 +00:00
Anton Georgiev
5bcd1e9dcd we do not expect requests for users or chathistory. These replies are automatically sent on successful validation 2014-05-28 18:44:19 +00:00
Anton Georgiev
77f5eaf6cf cleanup after the changes in bbb-apps (on valid authentication publish users, chatHistory, etc right away) 2014-05-28 18:11:08 +00:00
Anton Georgiev
8928d4797c found why some users are added multiple times in the userlist 2014-05-28 18:08:55 +00:00
Anton Georgiev
dbbe0d251e missed this during the merge from perroned 2014-05-28 15:25:29 +00:00
Richard Alam
f87933cf76 - try to inject layout change when layout option is changed in lock settings 2014-05-27 19:00:38 -07:00
Anton Georgiev
8ed7146753 provoking chatHistory message 2014-05-27 21:41:52 +00:00