BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,400 Commits 13 Branches 260 Tags 1.1 GiB
f79de237de
Commit Graph

5400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Pilkey
0920742ae9 added in sort to put phone users at the bottom of the list 2013-02-07 17:24:55 -05:00
Chad Pilkey
a847250cb3 updated config template to replace user and listeners with participants 2013-02-07 17:11:57 -05:00
Chad Pilkey
3c25777539 removed the ability to make dial-in users presenter 2013-02-07 17:08:51 -05:00
Richard Alam
a7a85bfd66 - update deskshare jar file 2013-02-07 20:52:52 +00:00
Richard Alam
44084a0825 - update deskshare applet jar 2013-02-07 20:50:02 +00:00
Markos Calderon
d2cc026588 update deskshare jar 2013-02-07 15:49:58 -05:00
Richard Alam
0a233bd391 - fix the problem where the applet will display 800x600 on full screen 2013-02-07 20:47:13 +00:00
Chad Pilkey
7924665c3d the participants module fully works and has been added to the layout manager 2013-02-07 13:50:24 -05:00
Markos Calderon
f9b2600cdc updating jar in order to not show warning message 2013-02-07 13:49:18 -05:00
Chad Pilkey
f486f2f5f1 removed unneeded file 2013-02-07 12:29:26 -05:00
Richard Alam
d1e80464d8 -disable polling module by default 2013-02-05 20:14:22 +00:00
Richard Alam
b6605f3112 Merge branch 'master' into merge-master-into-polling-module 2013-02-05 18:35:00 +00:00
Richard Alam
200817563f - display mic settings when joining voice from the js api 2013-02-05 18:25:41 +00:00
Richard Alam
43cba65f6d Merge branch 'poll-access' into merge-master-into-polling-module 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollingStatsWindow.mxml
 2013-02-05 16:21:54 +00:00
Chad Pilkey
4eb34ad9ca added in listener SO support, it should work, but can't test because vm is broken 2013-02-04 18:34:50 -05:00
Richard Alam
33665fe236 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 
Conflicts:
	README
 2013-02-04 22:42:07 +00:00
jtrobinson
e9f9c671f7 Trying to commit workable (but in no way accessible) Polling Module) 2013-02-04 22:37:42 +00:00
jtrobinson
8ad5bc177d Merge branch 'poll-access' of github.com:capilkey/bigbluebutton into poll-access 2013-02-04 22:05:37 +00:00
jtrobinson
88aabc9bbe Trying to undo merge. 2013-02-04 22:05:04 +00:00
jtrobinson
1079f128f0 Fixed conflicts; merging 2013-02-04 19:51:48 +00:00
Richard Alam
93311e6464 Merge branch 'master' into merge-master-into-polling-module 
Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/BigBlueButton.mxml
 2013-02-04 19:34:23 +00:00
jtrobinson
a3c5a13433 Pulled in upstream changes; now there's a crazy focus bug. Trying to figure that out. 2013-02-04 18:43:27 +00:00
Richard Alam
a813662f1d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-02-04 17:10:00 +00:00
Richard Alam
d5ea1099da - update deskshare applet 2013-02-04 17:09:36 +00:00
Markos Calderon
d0ac25672a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-04 11:38:28 -05:00
Markos Calderon
16ef060da3 Merge remote-tracking branch 'fcecagno/playback-in-time' 2013-02-04 11:04:19 -05:00
Fred Dixon
fc250716d9 Updated bbb-conf to support renaming of parameters (see issue 1398 in google issue tracker) 2013-02-03 17:08:38 -05:00
Chad Pilkey
56194205d0 clean up file that shouldnt be there 2013-02-02 20:17:52 -05:00
Chad Pilkey
faf63af571 Accesibility mostly finished 2013-02-01 18:06:05 -05:00
Chad Pilkey
875df8ca30 all strings are now localised 2013-02-01 17:51:09 -05:00
Richard Alam
09a7b9e109 - bringing status messages for deskshare standalone into master 2013-02-01 20:09:39 +00:00
Richard Alam
dcecac18f9 Merge branch 'master' into sync-deskshare-that-will-work-with-0.8-with-master 2013-02-01 19:50:19 +00:00
Chad Pilkey
be11b4415b started implementing accessibility 2013-02-01 14:49:51 -05:00
Richard Alam
7b10ea86a1 - turn off scrollbars 2013-02-01 19:35:26 +00:00
Richard Alam
845c48b056 Merge branch 'master' into listener-does-not-get-displayed-problem 2013-02-01 19:07:38 +00:00
Richard Alam
9a03f4ba71 Merge branch 'master' into style-presentation-upload-window 2013-02-01 19:06:20 +00:00
Richard Alam
66200ea3bc - remove camera names drop down as it's the same as the camera settings button 2013-02-01 19:05:21 +00:00
Richard Alam
8e2e2c83ca Revert "Modified API to be able to map conferences by their name instead of their voiceBridge number. To preserve backwards compatibility is sufficient to pass the voiceBridge number as the conference name in the API call." 
This reverts commit a7156aa0a6.

Command used: git revert a7156aa0a6

Conflicts:

	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
 2013-02-01 17:53:08 +00:00
Richard Alam
77d8df50da - try to figure out why listener doesn't get displayed 2013-02-01 16:35:23 +00:00
Markos Calderon
b4ed805f55 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-01 11:24:16 -05:00
Markos Calderon
ab62b91a55 Merge remote-tracking branch 'bikramac/patch-3' 2013-02-01 10:45:02 -05:00
Richard Alam
89c6b7222a - rename config proerpty names so it's more clear on what the properties are for 2013-01-31 22:49:43 +00:00
Richard Alam
ea8488af38 Merge branch 'master' into external_freeswitch 2013-01-31 22:10:56 +00:00
Markos Calderon
d44e00d51b update size of camera settings 2013-01-31 17:02:10 -05:00
Richard Alam
68d8f96730 - change messages 2013-01-31 21:09:37 +00:00
jtrobinson
ce400043ac Made accessibility descriptions for Viewer and User lists more clear 2013-01-31 20:08:30 +00:00
jtrobinson
9283c38ea0 Finally repaired screen reader/chat box compatibility. 2013-01-31 18:45:31 +00:00
Richard Alam
c16a4636c8 - remove status messages for some events 2013-01-31 17:35:39 +00:00
Richard Alam
cf880ab505 - display status messages on desktop sharing standalone 2013-01-31 17:13:32 +00:00
Richard Alam
9f14252fb3 - use external userID to match voice user. This way, third party apps can use the extern user id on the dialplan when calling from phone. 2013-01-30 23:05:20 +00:00