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

3462 Commits

Author SHA1 Message Date
Richard Alam
3f66908f4d - reinit mic 2014-03-21 22:08:50 +00:00
Richard Alam
bd0a54e9f1 - continue implementing Flash Mic Settings dialog 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/PhoneManager.as
 2014-03-21 21:43:19 +00:00
Richard Alam
ce3432fb1b - disable flash calling for webrtc testing 2014-03-21 14:37:09 +00:00
Richard Alam
0bc45659fc - show elcome message in chat window 2014-03-21 14:20:27 +00:00
Richard Alam
98d851c582 - add new commands 2014-03-20 20:46:46 +00:00
Richard Alam
5bb2a2cb2b - continue implementing join voice using flash 2014-03-20 19:10:09 +00:00
Richard Alam
148e3be430 - start implementing joining voice using flash 2014-03-19 21:34:09 +00:00
Richard Alam
a08be6298f - implement flow for user to join vonce conf uwing webrtc 2014-03-18 19:14:27 +00:00
Richard Alam
bb5db33eac - implement user joining voice using webrtc 2014-03-17 19:47:45 +00:00
firstuser
915f9aa3d7 - continue implementing mic settings for webrtc 2014-03-15 18:15:28 -07:00
Richard Alam
61d90933f4 - display different mic setting for ff and chrome 2014-03-14 22:44:53 +00:00
Richard Alam
04a77ddaca - figure out how to display mic permissions for FF and Chrome 2014-03-14 21:06:31 +00:00
Richard Alam
3b4b818841 i - do echo test and then join voice conference using webrtc 2014-03-14 19:21:21 +00:00
Richard Alam
4cc16f1b00 - add bin-debug dir to ignore 2014-03-14 16:03:23 +00:00
Richard Alam
d869dab51e - start implementing echo test and join conference using webrtc 2014-03-14 16:02:54 +00:00
Richard Alam
680fa7709a - minot cleanup 2014-03-12 18:36:33 +00:00
Richard Alam
dd0ed0df37 - fix query presentations from JS API 2014-03-12 14:18:14 +00:00
Richard Alam
31926bd26d - implement end and destroy meeting 2014-03-10 21:38:03 +00:00
Richard Alam
62f89ebe2d - start deskshare properly 2014-03-09 20:23:39 -04:00
Richard Alam
1a5251621d - display poll button if presenter when user joins 2014-03-02 18:16:52 -05:00
Richard Alam
a418190169 - sync presentation position for latecomer 2014-03-02 16:43:04 -05:00
Richard Alam
a535412629 - fix switching presentation 2014-03-02 15:15:42 -05:00
Richard Alam
46bb7633ca - fix undo and clear whiteboard 2014-03-06 20:35:00 +00:00
Richard Alam
bb11712a19 - display whiteboard shapes 2014-03-06 19:23:18 +00:00
Richard Alam
e27274bf8c - use wb id instead of pres/pagenumber for whiteboard 
- the whiteboard id matches presId/page id for the current page
 2014-03-06 16:37:03 +00:00
Richard Alam
6b855aa351 - start refactoring whiteboard 2014-03-05 21:43:35 +00:00
Richard Alam
2f9650d1d3 - fix uploading of presentation 2014-03-05 19:54:32 +00:00
Richard Alam
a43c942314 - fix upload 2014-03-04 22:51:35 +00:00
Richard Alam
371e2da0b0 - allow changing of page usng thumbnail 2014-03-04 20:52:23 +00:00
Richard Alam
09c9bfa9e5 - display page properly 2014-03-04 20:18:31 +00:00
Richard Alam
4f799f09b4 - sync page 2014-03-04 16:54:49 +00:00
Richard Alam
0b9f90348c - handle page moves 2014-03-04 15:34:07 +00:00
Richard Alam
a5c9932498 - fix go to next/previous page 2014-03-04 14:59:19 +00:00
Richard Alam
bc5f60923c - figure out why we can't get to the next page 2014-03-03 21:41:18 +00:00
Richard Alam
89e2f6363a - display presentation page 2014-03-03 18:39:04 +00:00
Richard Alam
fe30c034d8 - continue refactoring presentation on client 2014-02-28 22:48:24 +00:00
Richard Alam
10b4b6ee3a - fix compile issues 2014-02-28 19:26:58 +00:00
Richard Alam
c946687872 - continue refactoring presentation 2014-02-28 16:48:21 +00:00
Richard Alam
d15e8c3a5b - continue cleaning up presentation 2014-02-27 21:41:25 +00:00
Richard Alam
feb49951a5 - add presentation ids to presentation conversion 2014-02-27 17:23:44 +00:00
Richard Alam
32431f62c7 - missed one file 2014-02-25 02:45:37 +00:00
Richard Alam
d8933b322c - disable join button when doing an echo test 2014-02-24 23:56:09 +00:00
Richard Alam
5c3859aa23 - add echo test for voice 2014-02-24 21:45:00 +00:00
Richard Alam
dcfe856f46 - fix issue where users show up as joined voice when a client loads 2014-02-24 19:24:23 +00:00
Richard Alam
b78a0fa776 - remove auto switching to presenter from client if joining as the first moderator 
as this is now driven on the server side
 2014-02-21 22:50:02 +00:00
Richard Alam
944b04e3a7 - fix async errors when users join/leave voice 2014-02-21 22:26:12 +00:00
Richard Alam
ab7d328ba1 - fix issue where connection drops due to async error when joining voice conference 2014-02-21 21:41:56 +00:00
Richard Alam
8a2990284e - cleanup and formatting 2014-02-21 20:02:54 +00:00
Richard Alam
4fc48da1b2 - change user joining sequence 2014-02-20 21:39:29 +00:00
Richard Alam
02e3e8cbc3 - set up flow for validating auth token when user joins 2014-02-20 18:01:55 +00:00
Richard Alam
6159029711 - cleanup 2014-02-19 21:54:15 +00:00
Richard Alam
ac111de364 Merge remote branch 'bbb/v0.81-javau51-update' into merge-java-7u51-branch 2014-02-19 20:09:56 +00:00
Richard Alam
e05d310908 - removing dependency on FS userid to manage voice for each user 2014-02-19 19:23:17 +00:00
Richard Alam
b6e5bf8091 - fix some compile issues 2014-02-19 15:33:51 +00:00
Richard Alam
ae36cb7997 - try to fix why we can't handle user leaving voice 2014-02-18 19:07:07 -05:00
Richard Alam
3a5f4ad079 - handle user messages from the server 2014-02-18 16:57:35 -05:00
Richard Alam
7d484dc0ba - create individual messages 2014-02-14 17:05:50 -05:00
Richard Alam
67b591001a - move users model 2014-02-14 15:42:20 -05:00
Richard Alam
d922531288 - organize data model 2014-02-14 14:50:00 -05:00
Richard Alam
2f9364cdc1 - start implementing the models 2014-02-14 12:13:38 -05:00
Richard Alam
a60299d036 - start/stop recording button works now 
- need to work on record processing
 2014-02-13 16:02:43 +00:00
Richard Alam
0bd25997a9 - implement start/stop recording. 
- TODO: alert doesn't popup when clicking on the record button
 2014-02-12 18:25:28 -05:00
Richard Alam
948e1b323e Merge branch 'master' into merge-polling-with-master 2014-02-12 15:59:23 -05:00
Richard Alam
0e935d4927 - fix swithc presenter 2014-02-12 15:56:19 -05:00
Richard Alam
aa341b5b6f - fix issue where other users gets logged out when a user leaves the meeting 2014-02-12 15:33:30 -05:00
Richard Alam
6cef7ecdac - fix share webcam 2014-02-12 15:27:10 -05:00
Chad Pilkey
e3b617225e Merge pull request #305 from syeshchenko/presentationWindowFix 
FileUploader window fixes
 2014-02-12 13:04:00 -05:00
Richard Alam
d967f86750 - fix get users reply message 2014-02-12 12:33:28 -05:00
Richard Alam
0f59af0aad - fix voice users commands and events 
- TODO: figure out why we are not receiving mute/talk events from FS ESL
 2014-02-11 22:45:24 -05:00
syeshchenko
ed15780273 Centred the FileUploadWindow, restricted the width of file name to be shown in the list 2014-02-11 14:48:44 -08:00
Richard Alam
f071e65235 - finally! got presentation to work...needs some cleanup 2014-02-11 14:52:13 -05:00
Gustavo Salazar
901d7a1097 use mic permission image not only for chrome 2014-02-11 11:41:02 -08:00
Gustavo Salazar
8709d7fae8 Update browser versions for webrtc 2014-02-11 11:15:01 -08:00
Richard Alam
e30ef32867 - now sending correct messages to client 2014-02-11 13:33:14 -05:00
syeshchenko
df001f9c9a Centred the Close button 2014-02-11 08:32:58 -08:00
Gustavo Salazar
339608c813 update message for not webrtc capable browser 2014-02-10 14:16:05 -08:00
Richard Alam
c77ddd76d3 Merge branch 'master' into merge-polling-with-master 2014-02-10 21:49:36 +00:00
Gustavo Salazar
fd4a34bc57 Fit webrtc buttons in audio settings window. 2014-02-10 13:49:18 -08:00
Richard Alam
858f1fef88 - try to figure out why whiteboard history isn't working 2014-02-10 21:48:24 +00:00
Richard Alam
5552583bbe - fix typo as it's driving CHad nuts :) 2014-02-10 21:21:15 +00:00
Richard Alam
79d3146ce1 - synch presentation 
- however, whiteboard doesn't sync for latecomers
 2014-02-10 20:27:58 +00:00
Richard Alam
1f080c78e0 - now late comers can display current presentation page 2014-02-10 19:39:05 +00:00
Gustavo Salazar
edf9518a31 Merge master branch to add style in mic settings. 2014-02-10 11:03:15 -08:00
Richard Alam
20f3e41038 - alittle bit of formatting 2014-02-09 20:20:01 -05:00
Richard Alam
03d4b05217 - continue fixing presentation. Looks like it synchs. Need to fix why 
current page of presentation doesn't display for late comer.
 2014-02-09 15:51:05 -05:00
Richard Alam
d4b02df765 - fix go to slide message 2014-02-08 19:51:46 -05:00
Richard Alam
f12ec75377 - slowly making presentation work again 2014-02-08 17:56:13 -05:00
Richard Alam
aa8f68076f - try to figure out logging 
- send presentation messages as JSON
 2014-02-08 15:29:12 -05:00
Richard Alam
ff333b9232 - handle get presentation info message 2014-02-08 14:20:05 -05:00
Gustavo Salazar
ea0c763712 Merged with https://github.com/mconf/bigbluebutton/tree/webrtc_support 2014-02-07 16:56:23 -08:00
Richard Alam
cf321098ac - try to get presentation working again 2014-02-07 14:14:28 -05:00
Richard Alam
1430eff18d - update locales to show java7u51 2014-02-06 16:53:26 -05:00
syeshchenko
850558ac15 Disable file list when file upload process running 2014-02-05 11:06:57 -08:00
syeshchenko
06bf0fe049 Add file format hint message 2014-02-05 11:01:23 -08:00
Chad Pilkey
d8bbfbfa36 moved the Mic Warning strings to the locale file and fixed up a bug with the chrome warning popup 2014-02-04 15:42:46 -08:00
Chad Pilkey
9594efcadb Merge remote branch 'upstream/master' into pretty-micsettings 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
 2014-02-04 15:27:06 -08:00
Chad Pilkey
ecac0b7a1d fixed up the ui of the audio settings a little bit 2014-02-04 14:43:20 -08:00
Gustavo Salazar
921405f3b6 change style in audio warning 2014-02-04 14:12:18 -08:00
Gustavo Salazar
fe21539a6c hide 'chrome allow' image when user joins anyway 2014-02-04 12:51:05 -08:00
syeshchenko
4a0a702165 enabled colorpicker 2014-01-30 14:27:54 -08:00