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

3682 Commits

Author SHA1 Message Date
Ghazi Triki
89f6411e9b Removed spacers when possible to make the flash display list lighter. 2014-08-14 21:02:01 +01:00
Chad Pilkey
3aedc92187 Merge remote-tracking branch 'upstream/merge-polling-with-master' into recording-notification 2014-08-14 11:22:38 -07:00
Chad Pilkey
f38ff557a1 added a reminder to the recording button 2014-08-14 11:21:21 -07:00
Ghazi Triki
7fd10a0e54 Added tooltip fading effects. 2014-08-13 23:31:29 +01:00
Ghazi Triki
716ee3c731 Added a follower tooltip with an indicator arrow. 2014-08-13 23:08:03 +01:00
Richard Alam
e9b5e5552d - update applet 
- add logging of session id when user disconnects from Red5
 2014-08-13 12:57:37 -07:00
Richard Alam
eb0caa9b3e Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master 2014-08-13 12:07:50 -07:00
Richard Alam
b9d6401a9e - mute/unmute all users 
- mute all users except presenter
 2014-08-13 12:07:01 -07:00
Richard Alam
c56fde0c42 Merge pull request #348 from speakserve/unify-version-number 
Unify version number
 2014-08-13 14:17:45 -04:00
Ghazi Triki
2aa1ddb600 Presentation name is displayed after being lost. 2014-08-13 18:47:57 +01:00
Ghazi Triki
bb09eb6d75 After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
Ghazi Triki
9a794f854a Bumped projects version and Flex locales to 0.9 2014-08-13 10:28:08 +01:00
Fred Dixon
b1c22ad8fd Set autoJoin to true to display audio options on loading 2014-08-12 22:38:25 -04:00
Chad Pilkey
fb9b1b9f1e fixed the height of the locale combobox 2014-08-11 14:42:13 -07:00
Chad Pilkey
f48855697f cleaned up the meeting name display logic a little 2014-08-11 10:20:53 -07:00
Chad Pilkey
e2079cc358 added escape to the username in sipjs user agent 2014-08-11 10:04:02 -07:00
Chad Pilkey
4962e8e208 removed the speed indicator from mxml, styled the layout selector, changed the default layout from 'Default' to 'Default Layout' 2014-08-10 20:22:23 -07:00
Chad Pilkey
b5cc4ec31d Merge remote-tracking branch 'upstream/merge-polling-with-master' into fix-chrome-webrtc 2014-08-10 13:42:54 -07:00
Chad Pilkey
980100dad6 fixed an issue when leaving the audio 2014-08-10 13:39:27 -07:00
Richard Alam
5b449a89a2 Merge branch 'switch-to-sipjs' into merge-polling-with-master 2014-08-10 09:28:25 -07:00
Richard Alam
b98bd3fc25 Merge branch 'switch-to-sipjs' of https://github.com/SenecaCDOT-BigBlueButton/bigbluebutton into switch-to-sipjs 2014-08-10 09:28:03 -07:00
Richard Alam
9244dd19d0 - allow forcing user to join listen only when autoJoin=true 2014-08-10 08:42:11 -07:00
Chad Pilkey
8607c78c2a moved echo test strings to localization, and animated the dots 2014-08-10 07:56:08 -07:00
Chad Pilkey
ba6628256a changed a jssip filename to sipjs 2014-08-09 12:46:53 -07:00
Chad Pilkey
20239454bd the sipjs call is successful, added extra states to the echo test window for more feedback 2014-08-09 12:39:37 -07:00
Richard Alam
1994eece36 Merge branch 'switch-to-sipjs' of https://github.com/SenecaCDOT-BigBlueButton/bigbluebutton into switch-to-sipjs 2014-08-09 12:24:35 -07:00
Chad Pilkey
02bb29ae29 sipjs connects to the echo test and stops correctly 2014-08-09 09:38:48 -07:00
Richard Alam
281d9a8efe Merge branch 'switch-to-sipjs' of https://github.com/SenecaCDOT-BigBlueButton/bigbluebutton into switch-to-sipjs 2014-08-09 09:15:26 -07:00
Chad Pilkey
750579e342 the sipjs media request now works 2014-08-08 14:17:28 -07:00
Richard Alam
5bd7b3e793 Merge branch 'switch-to-sipjs' of https://github.com/SenecaCDOT-BigBlueButton/bigbluebutton into switch-to-sipjs 2014-08-08 13:55:03 -07:00
Richard Alam
654c93831e Merge branch 'merge-polling-with-master' into switch-to-sipjs 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-08-08 13:46:53 -07:00
Chad Pilkey
ac7a688965 swapped jssip for sipjs, cleaned up the webrtc events, changed instances of Rtc to RTC 2014-08-08 13:19:38 -07:00
Richard Alam
e0f8272ddf Merge pull request #349 from speakserve/chat-paste-xml 
Ability to paste in XML into Chat
 2014-08-08 10:57:03 -04:00
Ghazi Triki
de8b886be8 Fixed string replacement index in ChatUtil.parseURLs 2014-08-07 23:49:59 +01:00
Richard Alam
723ee43830 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1695 2014-08-07 13:24:52 -07:00
Richard Alam
92254d4853 - allow voice conf button to be stylized 2014-08-07 11:42:57 -07:00
Richard Alam
9c19b0d8f8 Merge pull request #352 from SenecaCDOT-BigBlueButton/fix-slide-zoom 
fixed presentation zooming on a point
 2014-08-07 14:31:10 -04:00
adam-sharpe
39cea99616 fixed presentation zooming on a point 2014-08-07 11:15:15 -07:00
Richard Alam
b04916fd84 - minor format 
- put recording indicator before meeting name
 2014-08-07 11:04:39 -07:00
Richard Alam
7ca8933ea8 - fix exception when start/stop recording 2014-08-07 11:03:49 -07:00
Richard Alam
62f9ed3944 - move locale settings to bottom 
- add recording lable to meeting name in toolbar
 2014-08-07 10:32:10 -07:00
Ghazi Triki
2394b34d49 Better string cleanup html/xml entities as suggested by markoscalderon. 2014-08-07 15:06:44 +01:00
Ghazi Triki
930d4d4d25 RegEx inside parseURLs method is executed only once instead of two times : fixes first match not found where there is only one match. 2014-08-07 14:48:43 +01:00
Ghazi Triki
39cae0e920 Added missing right brace for parseURLs method. 2014-08-06 15:32:20 +01:00
Ghazi Triki
90cfc95fa1 Added missing right brace in a condition for "parseURLs" method. 2014-08-06 15:22:33 +01:00
Ghazi Triki
930048317c Chat messages can contain XML code and all links starting with http, https, ftp and www are parsed and sent correctly to chat service. 2014-08-06 15:09:44 +01:00
Richard Alam
bc8f22ff70 - allow joining audio skipping mic check 2014-08-05 13:59:01 -07:00
Richard Alam
e6f1c6a852 - add string to locale 2014-08-05 11:14:23 -07:00
Richard Alam
11c9d21229 - add string to locale 2014-08-05 11:13:58 -07:00
Richard Alam
0eb48379f2 - add recording indicator label 2014-08-05 09:31:27 -07:00
Richard Alam
64fdb9e2f8 - allow configuring lock settings from config.xml 2014-07-31 09:44:42 -07:00
Ghazi Triki
ac7af7dfea Manually bumped all application version to the correct actual version 0.9.0-dev 2014-07-31 17:42:38 +01:00
Richard Alam
dede32bd63 - turn off polling 2014-07-30 11:22:23 -07:00
Richard Alam
aa92bdf61c - don't show phone dial option by default 2014-07-30 11:21:21 -07:00
Richard Alam
36183d55d2 - remove unused option 2014-07-30 08:38:21 -07:00
Richard Alam
3bf4991eec - try to force FF 31 to display java applet permission bar 2014-07-30 07:48:59 -07:00
Richard Alam
a6dc4f6465 - change how to insert applet div into HTML 2014-07-29 13:16:12 -07:00
Richard Alam
3d959234cd - fix issue where button display the wrong state when user is muted but the icon shows unmuted 2014-07-29 08:06:08 -07:00
Richard Alam
d11974a0e9 - fix issue where we can't join voice when RTMP Tunnelling 2014-07-28 12:41:41 -07:00
Richard Alam
19c933b8fa - minor cleanup 2014-07-28 12:41:21 -07:00
Richard Alam
7481c46cd9 - re-enable buttons when there is an error encountered during presentation conversion 2014-07-28 11:39:44 -07:00
Richard Alam
2d20915e40 - prevent user from closing presentation upload window while the presentation is being converted 2014-07-28 11:07:35 -07:00
Richard Alam
5ddd295ea6 - remove mic init as it triggers Chrome to prompt user to allow mic access 
even if we still don't need it
 2014-07-28 09:48:04 -07:00
Richard Alam
65d8b0889c - minor cleanup 2014-07-28 09:47:50 -07:00
Richard Alam
889ea9187a - display remote layout name on layout dropdown 2014-07-28 08:28:53 -07:00
Richard Alam
9868dfdae5 - blur mic image when user is talking 2014-07-25 14:13:23 -07:00
Richard Alam
4148c5db8a - move button so that it's not overlapped by whiteboard toolbar 2014-07-25 08:03:51 -07:00
Richard Alam
806a09ec3f - update copyright year 2014-07-25 08:03:32 -07:00
Richard Alam
c4a791437b - fix race condition on setting mute user 2014-07-24 12:29:56 -07:00
Richard Alam
e4d9b1e8f2 - fix muted/unmuted icon 2014-07-24 11:52:37 -07:00
Richard Alam
9485d25af7 - fix raise condition between setting the user has joined the voice conf and the joined voice event 2014-07-24 11:28:45 -07:00
Richard Alam
58f34d7767 - try and fix issue where mute button isn't showing up 2014-07-24 11:02:10 -07:00
Richard Alam
41ebc6859d - don't throw exception when external userid is not found as the user might have acutally left the meeting 2014-07-23 10:48:02 -07:00
Richard Alam
b47efe5675 - init dataprovider when layout list has been updated after the combo has been initialized 2014-07-22 10:45:56 -07:00
Richard Alam
5236d85cd4 - fix layout drop NPE 2014-07-22 08:53:38 -07:00
Richard Alam
94a8dc5762 - fix race condition on initializing layout combo dropbox 2014-07-22 08:33:36 -07: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
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
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
13046276fe - update windows when broswer is resized 2014-07-05 01:35:33 -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
893c977ec9 forgot to add the new config property to the template 2014-06-05 14:04:19 -07:00
Chad Pilkey
632096fd64 the phone option is now somewhat configurable 2014-06-05 13:52:37 -07: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
Chad Pilkey
344103922a moved the webrtc call failed alertbox text to locales 2014-06-03 13:14:05 -07:00
Chad Pilkey
b1da215ac2 if presenterShareOnly is true don't switch moderators to listen only when presenter changes 2014-06-03 12:14:51 -07:00
Chad Pilkey
cfc49f51d5 Merge pull request #319 from SenecaCDOT-BigBlueButton/fix-presentation-control-bar 
Fix presentation control bar
 2014-06-03 12:07:21 -04:00
Chad Pilkey
f6cb040908 moved the audio selection window strings to the locale file 2014-06-03 09:00:41 -07:00
Chad Pilkey
d0618c1a03 added presenterShareOnly, error popup when webrtc fails with option to fallback to flash 2014-06-02 15:16:52 -07:00
Chad Pilkey
b9afd0e36b fixed a null pointer exception when the mic is not found 2014-06-02 09:23:13 -07:00
Chad Pilkey
e1a56c45ba Merge remote-tracking branch 'upstream/merge-polling-with-master' into fix-webrtc-dialogs 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
 2014-06-02 08:59:33 -07:00
Richard Alam
19ac02fab2 - enable polling by default 2014-06-02 07:44:46 -07:00
Richard Alam
26a142b49a - make window smaller 2014-06-01 18:17:07 -07:00
Richard Alam
e0f65acffd - make viewer init the polling module properly 2014-06-01 09:22:07 -07:00
Chad Pilkey
02e6a98f1c removed some unused managers from the phone module 2014-05-30 15:20:00 -07:00
Chad Pilkey
19ce05b31b created an audio selection window to choose your stream type 2014-05-30 15:19:25 -07:00
Chad Pilkey
91d2e1d288 removed the background from the listen only indicator image 2014-05-30 15:15:38 -07:00
Richard Alam
93c3ef7d05 - try to figure out how layout changes on window resize 2014-05-30 14:23:40 -07:00
Richard Alam
c806b4364f - continue modifyng the layout module to sync with others when windows are resized 2014-05-30 13:54:40 -07:00
Richard Alam
39fa4f2db1 - modify how we send lock and broadcast layout from client 2014-05-30 11:08:47 -07:00
Richard Alam
04c271996d Merge branch 'broadcast-layout' of github.com:mconf/bigbluebutton into broadcast-layout 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/events/LayoutEvent.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/LayoutService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
 2014-05-29 11:21:01 -07:00
Felipe Cecagno
5821c32372 implemented the new button broadcast layout, which will send to all viewers the moderator's current layout; the lock button and broadcast button only affect viewers, not moderators 2014-05-29 12:19:40 -03:00
Richard Alam
224bea1f5f - sync layout with viewers 2014-05-29 07:06:44 -07:00
Richard Alam
e254787276 - add layout to lock settings 2014-05-28 12:25:28 -07:00
Richard Alam
f87933cf76 - try to inject layout change when layout option is changed in lock settings 2014-05-27 19:00:38 -07:00
Richard Alam
79136feeba - presenter should not be affected by lock settings 2014-05-27 07:16:04 -07:00
Richard Alam
f8974e5922 - apply lock icon to viewers only 2014-05-27 06:57:22 -07:00
Richard Alam
ff8c210104 - still the lock icon is not updating properly 2014-05-26 14:24:29 -07:00
Richard Alam
320ee09231 - try to apply lock settings to moderator only 2014-05-26 14:13:07 -07:00
Richard Alam
068df39570 - add [Disabled] text beside feature name 2014-05-26 11:32:21 -07:00
Richard Alam
e7c5a343a9 - show lock icon when a settings are locked 2014-05-26 10:48:30 -07:00
Richard Alam
b550ba966f - disable/enable users list in chat window when private chat is enabled/disabled 2014-05-26 10:30:57 -07:00
Richard Alam
fb2fd12f3c - disable/enable chat for viewer when settings are changed 2014-05-23 19:33:27 -07:00
Richard Alam
8549159aad - try creating a chat conversation model 2014-05-23 14:43:01 -07:00
Richard Alam
71cff3bfe6 - extract some user code from flex module. Module should only be for the UI. 2014-05-23 13:24:01 -07:00
Richard Alam
6eee34b86c - remove some of the menu items for the gear icon 2014-05-23 10:29:09 -07:00
Richard Alam
87b776ad58 - fix sending of lock settings to server 2014-05-23 08:47:13 -07:00
Richard Alam
5c844ffeee - send lock settings to server 2014-05-22 11:41:59 -07:00
Richard Alam
1ab0b0a2c4 - send new lock settings to server 2014-05-22 11:13:00 -07:00
Richard Alam
1b8fa657ce - send lock settings from server to client 2014-05-22 08:30:46 -07:00
Chad Pilkey
b4b5e7793c Merge remote-tracking branch 'upstream/merge-polling-with-master' into fix-webrtc-dialogs 2014-05-21 12:33:34 -07:00
Chad Pilkey
679b899b74 first take at new audio dialogs 2014-05-21 12:14:08 -07:00
Richard Alam
f266067e1a - display message to user when auth token is invalid 2014-05-21 18:42:49 +00:00
Richard Alam
391dc9be5a - fix listen-only in get users reply 2014-05-16 17:26:51 +00:00
Richard Alam
5686b6871c - finish global audio...display speaker icon beside user's name when joined in listen-only mode 2014-05-16 15:24:22 +00:00
Richard Alam
42fcfe1055 Merge branch 'merging-global-audio' of github.com:mconf/bigbluebutton into merge-global-audio 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
 2014-05-12 10:39:25 -07:00
Felipe Cecagno
eb0a56bb13 refactoring part of the global audio server-side implementation 2014-05-11 22:31:35 -03:00
Richard Alam
eef2c87cd4 - cleanup 2014-05-05 18:45:18 +00:00
adam-sharpe
f428f046de Fixed presentation control for viewers 2014-04-24 15:51:00 -07:00
Felipe Cecagno
19e3a4b3f0 client side implementation is done, but having issues because the server calls three times disconnectedFromJoinVoiceConferenceCallback when the user leaves the listen only stream (need a server-side refactoring) 2014-04-24 19:41:22 -03:00
Tiago Daniel Jacobs
97ad5e28f4 Changes to support RTMPS connections 2014-04-24 17:16:03 -03:00
Felipe Cecagno
92eac1e988 Merge branch 'global-audio' into merge-global-audio 
Most of the client implementation is going to be rewritten on next commits.
 2014-04-23 16:13:40 -03:00