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

5249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Markos Calderon
4d27998866 Adding branding for webcam preview 2013-01-30 18:05:02 -05:00
Richard Alam
7bb56a2542 - make the client work with 0.8 (this means that this won't work with master/0.81-dev) 2013-01-30 22:04:09 +00:00
Richard Alam
4975c707e6 Merge branch 'master' into deskshare-aspect-calculated 
Conflicts:
	bigbluebutton-client/src/DeskshareStandalone.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as
 2013-01-30 20:23:13 +00:00
Richard Alam
0569e0325e - dispatch event on deskshare connection status 2013-01-30 20:20:46 +00:00
Richard Alam
3d4601994a - bind to 127.0.0.1 for lifeline as sometimes anti-virus will complain when binding to real PC IP 2013-01-30 20:13:05 +00:00
Richard Alam
f70399303e - move xml header up top...otherwise, the voice app won't start 2013-01-30 19:22:13 +00:00
Richard Alam
278721359e - dispatch event on deskshare connection status 2013-01-29 21:01:52 +00:00
Richard Alam
8a6decd12d - bind to 127.0.0.1 for lifeline as sometimes anti-virus will complain when binding to real PC IP 2013-01-28 22:02:29 +00:00
Markos Calderon
e3d8f6bf4b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-01-28 16:15:20 -05:00
Markos Calderon
db79ff62ab Update build.xml and applet 2013-01-28 16:14:32 -05:00
Richard Alam
26fd925a5e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-01-28 19:39:06 +00:00
Richard Alam
c2f86af443 Merge branch 'master' into style-presentation-upload-window 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
 2013-01-28 19:38:00 +00:00
Markos Calderon
6389cda5e0 updating deskshare applet 2013-01-28 14:01:29 -05:00
Richard Alam
943feb2b35 - update default BBB style 2013-01-28 18:47:08 +00:00
Markos Calderon
8ae4001b81 Merge branch 'master' into try-fixing-deskshare-red5-context 2013-01-28 12:42:04 -05:00
Richard Alam
9124b3e22e - try to make the applet run 2013-01-28 17:04:35 +00:00
Richard Alam
26d138af63 - turn off horizontal and vertical scrollbars when viewing webcam 2013-01-28 16:55:50 +00:00
Richard Alam
84097bed6e - try to make the applet run 2013-01-27 20:55:37 +00:00
Fred Dixon
de47e2e65e Updated license header to LGPL 3.0 2013-01-27 09:44:40 -05:00