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

7554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
633bd3b72d Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master 2014-07-21 14:13:16 -07:00
Richard Alam
884a6d4bd8 - starting cleanup unnecessary logs 2014-07-21 14:12:37 -07:00
Richard Alam
d2a615cc85 Merge pull request #344 from SenecaCDOT-BigBlueButton/fix-chrome-webrtc 
reverted jssip back to 0.3.7 and fixed chrome webrtc
 2014-07-21 15:57:25 -04:00
Chad Pilkey
5c79202ade reverted jssip back to 0.3.7 and fixed chrome webrtc 2014-07-21 10:25:08 -07:00
Richard Alam
930c6d881b - slowly cleaning up debug logs 2014-07-18 13:28:09 -07:00
Richard Alam
8f7941de33 - minor cleanup 2014-07-18 11:26:46 -07:00
Richard Alam
0daff8a8d4 - deskshare applet where min jre version is passed from html page 2014-07-18 08:45:59 -07:00
Richard Alam
dfbf77aab0 - externalize min jre version required 2014-07-18 08:45:10 -07:00
Richard Alam
af3e7875ee - deskshare applet that support 1.7.0_51 and up 2014-07-18 07:54:28 -07:00
Richard Alam
e854928b7a - clean up formatting 
- add test for non-GA version (1.7.0_65-b19)
 2014-07-18 07:52:21 -07:00
Richard Alam
70f4aba334 Merge pull request #343 from markoscalderon/merge-polling-with-master 
Fix java detection exception
 2014-07-18 10:43:10 -04:00
Markos Calderon
3fb991f990 Added license to VersionCheckUtil 2014-07-17 15:44:29 -07:00
Markos Calderon
d172afb6bf fix java detection exception 2014-07-17 15:40:15 -07:00
Richard Alam
c9e6479a0a - add test for applet version check 2014-07-17 14:31:17 -07:00
Richard Alam
9d20d28d30 - disable layout dropbox when layout is locked 2014-07-17 11:16:53 -07:00
Richard Alam
4c41140193 - do not sync layout to others automatically 2014-07-17 10:48:23 -07:00
Richard Alam
412e2c51a6 - a little cleanup 2014-07-16 13:12:10 -07:00
Richard Alam
7fd7b13088 - change layout sync icon 2014-07-16 11:39:16 -07:00
Richard Alam
cbd12a5f5c Merge pull request #342 from SenecaCDOT-BigBlueButton/fix-audio-prompts-chrome36 
upgraded jssip to 0.4-devel, skipped the webrtc switch mic notifications
 2014-07-11 17:24:09 -04:00
Chad Pilkey
af6e2b4db3 upgraded jssip to 0.4-devel, skipped the webrtc switch mic notifications 2014-07-11 13:32:04 -07:00
Richard Alam
d2196d4adb - sign applet that support java 8 2014-07-11 12:41:27 -07:00
Richard Alam
bc655811c6 - don't clear newer pending ping messages when red5 recovers 2014-07-05 03:38:12 -07:00
Richard Alam
6e12f5be11 - send mute voice user command to redis pubsub 2014-07-05 02:38:15 -07:00
Richard Alam
d43aa3a99b Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master 2014-07-05 01:36:11 -07:00
Richard Alam
13046276fe - update windows when broswer is resized 2014-07-05 01:35:33 -07:00
Richard Alam
bee5b7b02d Merge branch 'merge-polling-with-master' into broadcast-layout 2014-07-03 14:06:12 -07:00
Richard Alam
af830ffe16 Merge pull request #338 from markoscalderon/fix-java-detection 
Fix Java Detection
 2014-06-27 14:16:39 -04:00
Markos Calderon
7fd4de5cfa Fix Java Detection 2014-06-21 02:22:43 -07:00
Richard Alam
78ebb5b14c - start implementing per user access code 2014-06-19 15:43:20 -07:00
Fred Dixon
2642cd0486 Added some blank pages to default presentation to use as a whiteboard 2014-06-12 17:36:50 -04:00
Richard Alam
c78fdab2a8 - don't use FS Event timestamp for start/stop recording event 2014-06-12 13:40:57 -07:00
Richard Alam
97262dfba5 - make recording process work 2014-06-12 12:31:24 -07:00
Richard Alam
702c57ebab - apply lock settings 2014-06-11 13:00:53 -07:00
Richard Alam
c7ceb58f43 - don't sync layout to viewers when moderstor resize the windows 2014-06-11 11:54:59 -07:00
Richard Alam
73877cab9b - switch layout when combo box is selected 2014-06-11 10:10:20 -07:00
Richard Alam
c8ec8bb24b - figure out why sync is broken 2014-06-07 01:25:39 -07:00
Richard Alam
0dd1b37afd Merge branch 'merge-polling-with-master' into broadcast-layout 2014-06-06 22:14:32 -07:00
Richard Alam
aac2dd3c3c - chnage label on lock settings 2014-06-06 21:26:01 -07:00
Richard Alam
73bb2cdeb6 - display layout names in dropdown 2014-06-06 18:27:46 -07:00
Richard Alam
045426e9af - try to diplay layouts in dropdown 2014-06-06 17:49:04 -07:00
Richard Alam
262f94b69c Merge branch 'merge-polling-with-master' into broadcast-layout 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-06-06 15:34:35 -07:00
Chad Pilkey
cbfcdc231c Merge pull request #333 from SenecaCDOT-BigBlueButton/fix-phonenumber-text 
Addendum to #332
 2014-06-05 17:06:46 -04:00
Chad Pilkey
893c977ec9 forgot to add the new config property to the template 2014-06-05 14:04:19 -07:00
Richard Alam
2a0afbc6cc Merge pull request #332 from SenecaCDOT-BigBlueButton/fix-phonenumber-text 
Fix phone number text in audio selection
 2014-06-05 16:56:45 -04:00
Chad Pilkey
632096fd64 the phone option is now somewhat configurable 2014-06-05 13:52:37 -07:00
Richard Alam
94405b8e35 Merge pull request #331 from SenecaCDOT-BigBlueButton/alternate-upload-dialog-spawn 
Cleaned up the FileUploadWindow
 2014-06-04 15:04:32 -04:00
Chad Pilkey
9b86798f21 cleaned up the file upload window and made it so that when you click the file name it will open the native file dialog 2014-06-04 11:47:24 -07: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