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 |
|
Richard Alam
|
7970a26756
|
Merge pull request #603 from capilkey/-chrome-42-warning
chrome 42 warning
|
2015-04-08 18:18:41 -04: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 |
|
Richard Alam
|
ec23e69d3e
|
- pdate locales
|
2015-04-08 21:30:39 +00:00 |
|
Richard Alam
|
1d32fb7dc4
|
- update locales
|
2015-03-27 21:58:21 +00:00 |
|
Chad Pilkey
|
d8a3325337
|
moved 'Ready' text to locales
|
2015-03-23 14:33:16 -07:00 |
|
Richard Alam
|
3c73519ec3
|
- update locales
|
2015-03-13 15:18:11 -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 |
|
Richard Alam
|
cd9ef88567
|
- update locales
|
2015-02-09 16:30:23 +00: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
|
9032afdb38
|
Merge remote-tracking branch 'upstream/master' into client-pre-check
|
2015-01-21 11:41:24 -08:00 |
|
Chad Pilkey
|
80e58d1ee3
|
added java check to the configuration notifications
|
2015-01-21 11:40:55 -08:00 |
|
Richard Alam
|
26c6ca0fd1
|
- update locales from transifex
|
2015-01-20 18:47:19 +00:00 |
|
Richard Alam
|
95776a62bd
|
- updating locales
|
2015-01-19 18:38:00 +00: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 |
|
Richard Alam
|
19044cacb2
|
- update locales
|
2015-01-06 15:24:57 +00:00 |
|
Chad Pilkey
|
8b7d0ddb24
|
font size in config, and two bugs with private chat squashed
|
2014-12-11 13:16:38 -08:00 |
|
Richard Alam
|
5667ea4156
|
- update locales from transifex
|
2014-12-05 11:05:42 -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 |
|
Richard Alam
|
c82f467f0f
|
Merge pull request #413 from SenecaCDOT-BigBlueButton/ice-failed-case
added an additional fail case for the WebRTC audio
|
2014-10-29 18:21:31 -04:00 |
|
Richard Alam
|
e4868682e0
|
- update locales
|
2014-10-29 22:20:11 +00:00 |
|
Chad Pilkey
|
f84ae56e9a
|
added an additional fail case for the WebRTC audio
|
2014-10-29 09:30:03 -07:00 |
|
Fred Dixon
|
fb1535360b
|
Merge pull request #407 from SenecaCDOT-BigBlueButton/more-webrtc-fixes
WebRTC fixes
|
2014-10-15 19:24:52 -04: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 |
|
Richard Alam
|
da59fb35e4
|
- updating locales
|
2014-10-12 07:12:50 -07:00 |
|
Fred Dixon
|
576e8badbd
|
Merge pull request #406 from SenecaCDOT-BigBlueButton/update-audioselection-logout
Minor client upgrades
|
2014-10-10 20:49:12 -04:00 |
|
Chad Pilkey
|
fdb763571d
|
made AudioPathSelection less squished, added automatic redirect on logout
|
2014-10-10 16:11:03 -07:00 |
|
Richard Alam
|
a3f594172f
|
- update locales from transifex
|
2014-10-07 09:29:31 -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 |
|