Felipe Cecagno
0af623e9e7
Merge branch '090-listen-only-by-default' into mconf-live0.6.1
2014-10-24 23:38:09 -02: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
Felipe Cecagno
3db4ead6e4
Merge branch '090-listen-only-by-default' into mconf-live0.6.1
...
Conflicts:
bigbluebutton-client/locale/ru_RU/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
2014-10-15 00:22:27 -03: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
Felipe Cecagno
59debc5d1e
Merge branch '090-mconf-branding' into mconf-live0.6.1
2014-10-05 23:32:43 -03:00
Felipe Cecagno
f40f9bf767
Merge branch '090-fullscreen' into 090-branding-logo
...
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
2014-10-05 23:31:39 -03:00
Felipe Cecagno
b9a149e94d
Merge branch '090-fullscreen' into mconf-live0.6.1
...
Conflicts:
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
2014-10-05 23:08:09 -03:00
Felipe Cecagno
5f2f2662af
Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1
...
Conflicts:
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
2014-10-05 22:00:28 -03:00
Felipe Cecagno
015d708d7c
Merge branch 'mconf-branding-0.81' into 090-mconf-branding
...
Used the following command to comment the default copyright label for all languages except en_US
find -name bbbResources.properties | xargs sed -i "s:^\(bbb.mainshell.copyrightLabel2.*\):# \1:g"
Conflicts:
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/src/BigBlueButton.mxml
record-and-playback/presentation/playback/presentation/playback.html
2014-10-05 19:36:43 -03: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
Alan Dias
e1dfd6d440
Merge branch '081-fullscreen' into 090-fullscreen
...
Conflicts:
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
2014-10-01 12:36:36 -03:00
Mateus Dalepiane
ba020a8e52
Merge branch '081-network-monitor' into 090-network-monitor
...
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
2014-09-12 12:02:51 -03: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
Mateus Dalepiane
77c6bbf500
Merge branch '090-new-videodock' into mconf-live0.6.1
2014-09-03 16:39:03 -03: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
Richard Alam
ba5b2d357f
Merge pull request #379 from SenecaCDOT-BigBlueButton/sort-raisehand-better
...
minor client updates
2014-08-23 15:35:19 -04:00
Chad Pilkey
8e9477bbe8
sort based on handraised, move strings to locale, minor tweaks to the audio dialogs
2014-08-23 12:31:28 -07:00
Fred Dixon
9d37588495
Minor tweaks in language strings
2014-08-23 08:06:52 -04:00
Fred Dixon
55baf5b0be
Minor updates to prompts
2014-08-21 21:18:10 -04:00
syeshchenko
85d3e5f72a
properly resized upload presentation window, removed unnecessary text
2014-08-21 10:48:13 -07:00
Chad Pilkey
84c5197097
Merge remote-tracking branch 'upstream/master' into enable-raisehand-for-all
2014-08-19 10:57:10 -07:00
Chad Pilkey
1689a86113
the raise hand button is now visible for all users
2014-08-19 10:56:03 -07:00
Fred Dixon
ec707f829f
Minor tweak to the webRTC notification (lower right-hand corner)
2014-08-19 13:10:47 -04:00
Fred Dixon
374828105f
Tweaking the language for the Audio Test dialog
2014-08-19 13:02:15 -04:00
Chad Pilkey
3dee8327f6
Merge pull request #366 from SenecaCDOT-BigBlueButton/misc-client-fixes
...
Misc client fixes
2014-08-18 12:27:38 -04:00
Chad Pilkey
7595dbebd2
added notifications to the users window for room mute and lock state
2014-08-18 09:25:00 -07:00
Fred Dixon
1db651ffcd
Minor tweaks to text phrases and icons
2014-08-17 22:15:49 -04:00
Chad Pilkey
9daf1d7a16
added styling to the fileupload help, also cleaned up some text
2014-08-17 13:56:15 -07:00
Chad Pilkey
d044596b82
added a notification for when you are using webrtc
2014-08-16 11:35:00 -07:00
Richard Alam
19de54ce9e
Merge pull request #360 from SenecaCDOT-BigBlueButton/audio-button-click-bug
...
Fixed mic button won't change status when flash voice stopped. Added use...
2014-08-15 13:53:04 -04:00
syeshchenko
d34db11f43
Fixed mic button won't change status when flash voice stopped. Added user feedback when flash echo test in progress and flash echo test failed.
2014-08-15 09:42:49 -07: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
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
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
Chad Pilkey
b5cc4ec31d
Merge remote-tracking branch 'upstream/merge-polling-with-master' into fix-chrome-webrtc
2014-08-10 13:42:54 -07:00
