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

5652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
jtrobinson
2c44133c13 Proof-of-concept works for chat message/screen reader compatibility. 2013-01-30 17:41:19 +00:00
Chad Pilkey
6cc5776fa4 started moving all strings to locale file 2013-01-29 18:05:12 -05:00
Richard Alam
278721359e - dispatch event on deskshare connection status 2013-01-29 21:01:52 +00:00
Chad Pilkey
81cd417cec added kick user and improved sort to include name and userid backup tests 2013-01-29 14:46:44 -05:00
jfederico
2d18cb6d56 bbb-lti_v0.1.1: Added bootstrap style presentation to the index.gsp page 2013-01-29 10:35:51 -05:00
jfederico
46bcebfd0e bbb-lti_v0.1.1: Validated if ismoderator to show unpublished recordings in the table 2013-01-29 09:34:38 -05:00
jfederico
3c18e1b0e6 bbb-lti(v0.1.1): Matched the api.Proxy method names with the command of the BigBlueButton API 2013-01-28 17:24:11 -05: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
jfederico
fbb84ab992 bbb-lti(v0.1.1): Restricted access to actionbar on recordings to only users in a role that can be considered as moderator 2013-01-28 16:58:55 -05: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
jfederico
937f85f8ee bbb-lti(v0.1.1): Validate recording deletion with javascript 2013-01-28 16:08:10 -05:00
Chad Pilkey
3868b7be02 Participants Module is working just need to clean it up and add more comments 2013-01-28 16:05:31 -05:00