BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,536 Commits 13 Branches 260 Tags 1.1 GiB
387c0770e3
Commit Graph

335 Commits

Author SHA1 Message Date
Chad Pilkey
387c0770e3 added some extra content to the PollResultsModal 2015-07-17 18:05:29 -04:00
Chad Pilkey
087223b3fe first pass at a UI for voting and viewing votes 2015-06-26 18:31:14 -04:00
Chad Pilkey
46840dd727 moved some poll strings to locales 2015-06-24 14:17:25 -04:00
Mateus Dalepiane
0662a242aa Merge branch 'bigbluebutton/master' into 090-new-videodock 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
 2015-04-29 12:10:41 -03:00
Chad Pilkey
d6bd54825f fixed the footer link 2015-04-08 15:14:47 -07:00
Chad Pilkey
b8bfedcded added a desktop sharing warning for Chrome 42 2015-04-08 14:31:55 -07:00
Chad Pilkey
d8a3325337 moved 'Ready' text to locales 2015-03-23 14:33:16 -07:00
Fred Dixon
cf5ab25ca0 Revert "Revert "Bbb lock settings fix"" 2015-03-04 16:47:35 -05:00
Chad Pilkey
34fdfb9f83 Revert "Bbb lock settings fix" 2015-03-04 11:49:13 -05:00
Tiago Daniel Jacobs
34e2e48be2 Merging 2015-03-03 06:52:56 +00:00
Tiago Daniel Jacobs
bf62dd66a2 Fixed mute on start, added lock on join option 2015-03-02 18:06:09 +00:00
Richard Alam
edaeaf6bf4 Merge pull request #521 from capilkey/webrtc-fixes 
WebRTC fixes
 2015-02-17 19:26:07 -05:00
Chad Pilkey
e6d3cd551d fixed a race condition in the webrtc javascript code, and added cause for error 1004 2015-02-17 16:11:42 -08:00
Calvin Walton
8e7a34b5dd Add webrtc 1009 error to translations 2015-02-17 13:29:27 -05:00
Chad Pilkey
d6ef5168c0 add support for webrtc call transferring, cuts join time in half 2015-02-12 14:25:41 -08:00
Fred Dixon
2ed3195fbc Update bbbResources.properties 
Change the copyright date to 2015
 2015-02-06 16:34:54 -05:00
Chad Pilkey
ac220162dd add a context menu item to UserGrid to export user names 2015-02-04 12:33:08 -08:00
Chad Pilkey
672348eafe labelling and tab order fixes for accessiblity 2015-01-30 08:03:36 -08:00
Felipe Cecagno
9a7bae79a8 Merge branch '090-new-videodock' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	record-and-playback/deploy.sh
 2015-01-28 20:33:28 -02:00
Chad Pilkey
19fb9b9671 Revert "Revert "Added Java check to the configuration notifications"" 
This reverts commit 82545a03f3.
 2015-01-27 14:19:02 -08:00
Fred Dixon
82545a03f3 Revert "Added Java check to the configuration notifications" 2015-01-27 17:11:54 -05:00
Chad Pilkey
84d6c5e132 added deskshare help information for Chrome users 2015-01-27 13:54:24 -08:00
Chad Pilkey
80e58d1ee3 added java check to the configuration notifications 2015-01-21 11:40:55 -08:00
Chad Pilkey
12d3a34ff5 change warnings to notifications 2015-01-19 10:22:15 -08:00
Chad Pilkey
5a9a2a0a6c minor tweaks to the configuration warnings 2015-01-16 13:39:44 -08:00
Chad Pilkey
9be9cca051 added a configuration warning system to the flash client 2015-01-15 16:14:49 -08:00
Chad Pilkey
8b7d0ddb24 font size in config, and two bugs with private chat squashed 2014-12-11 13:16:38 -08:00
Chad Pilkey
e2f71bec3a changed two of the layout names 2014-11-11 11:29:34 -08:00
Chad Pilkey
a23cd2a7c9 added translation of the default layout definitions 2014-11-11 10:26:10 -08:00
Chad Pilkey
65b820966d Changed the wording of the webrtc messages to make them easier to understand 2014-11-07 14:07:42 -08:00
Chad Pilkey
6f82dd9378 added a check to make sure that ICE negotiation has finished before showing that the call has been accepted in the UI 2014-11-06 10:35:03 -08:00
Chad Pilkey
f84ae56e9a added an additional fail case for the WebRTC audio 2014-10-29 09:30:03 -07:00
Chad Pilkey
a8b53f9acc changed webrtc error messages to errorcodes, fixed a bug with webrtc call failing at echo test 2014-10-15 16:17:58 -07:00
Chad Pilkey
fdb763571d made AudioPathSelection less squished, added automatic redirect on logout 2014-10-10 16:11:03 -07:00
Chad Pilkey
7d9b26912e Merge remote-tracking branch 'upstream/master' into fix-no-presentation-problems 
Conflicts:
	bigbluebutton-client/resources/prod/BigBlueButton.html
 2014-10-06 15:09:36 -07:00
Chad Pilkey
4ec65bc300 enhannced LoggedOutWindow to allow for easy reconnect 2014-10-06 15:07:22 -07:00
Chad Pilkey
de7dbd0b44 Multiple fixes to our webrtc implementation. Hopefully there's less holes now 2014-10-06 14:14:34 -07:00
syeshchenko
14b401851d resized and positioned some of the components to fit with Russian and German locales, changed and added some Russian translation 2014-10-01 15:18:31 -04:00
Richard Alam
83d15332d6 Merge pull request #387 from SenecaCDOT-BigBlueButton/chrome-webcam-permission-prompt 
Chrome webcam permission prompt
 2014-09-08 14:54:09 -04:00
Fred Dixon
e02476071d Make clear this is a private echo test 2014-09-01 16:48:00 -04:00
syeshchenko
1d148ef624 Merge branch 'master' into chrome-webcam-permission-prompt 2014-09-01 13:18:32 -07:00
syeshchenko
ae6a4d5fa1 on Chrome show webcam permission prompt before webcam preview opened 2014-09-01 13:10:50 -07:00
Fred Dixon
88a0455248 Tweak phrasing for private echo test 2014-08-29 11:51:31 -04:00
Fred Dixon
9380a73dac Added message to let administration know that monit will restart bbb-record-core and LibreOffice. Tweaked the language for audio settings dialog. 2014-08-28 17:39:59 -04:00
Richard Alam
94cfbafb0a Merge pull request #380 from SenecaCDOT-BigBlueButton/unsupported-deskshare-chrome-on-mac 
identify if user is on mac and chrome and show the warning during deskto...
 2014-08-26 16:47:38 -04:00
syeshchenko
5ccc49cde9 properly resized presentation file list, centered file format hint text and fixed typo 2014-08-26 13:25:32 -07:00
Mateus Dalepiane
cbb4a167bb Merge remote-tracking branch 'origin/new-videodock' into 090-new-videodock 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/AvatarWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
 2014-08-26 17:20:00 -03:00
syeshchenko
77b7d4b327 identify if user is on mac and chrome and show the warning during desktop share 2014-08-26 12:02:08 -07:00
Fred Dixon
a374c59e30 Renamed 'WebRTC' -> 'WebRTC Audio' so users have a better chance of knowing what this indicator means 2014-08-23 21:57:03 -04:00
Fred Dixon
35b3c6b1bf Corrected wording in prompt for user to give permission to access microphone (FireFox) 2014-08-23 18:47:31 -04:00