Felipe Cecagno
|
65163c49ef
|
Merge branch 'master' into guest-role-0.81
Conflicts:
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/events/LogoutEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
|
2013-08-26 15:13:38 -03:00 |
|
Gustavo Salazar
|
1e0f8c1969
|
Merge pull request #237 from SenecaCDOT-BigBlueButton/renable-playback-buffering
added back in the playback buffering indicator and fixed some issues with it
|
2013-08-23 10:26:06 -07:00 |
|
Chad Pilkey
|
3d378ffec1
|
Merge pull request #230 from speakserve/flex-client-updates
LoadingBar properties binding replaced by fixed values.
|
2013-08-23 09:08:50 -07:00 |
|
Chad Pilkey
|
7229d1a45d
|
added back in the playback buffering indicator and fixed some issues with it
|
2013-08-23 08:54:45 -07:00 |
|
Chad Pilkey
|
695ece39c4
|
Merge pull request #234 from mconf/fix-accessibilityProperties-0.81
Fixed chatBox AccessibilityProperties that was seted before being initia...
|
2013-08-23 06:59:20 -07:00 |
|
Hugo Lazzari
|
b9068b9137
|
Add test to check if variable is null
|
2013-08-23 08:45:39 -03:00 |
|
Chad Pilkey
|
89cbf9bdf4
|
Merge pull request #236 from jent46/master
update translation
|
2013-08-22 12:47:07 -07:00 |
|
Chad Pilkey
|
9f79d5ae31
|
Merge pull request #235 from mconf/resolution-combo-style
Fixed the style of the video resolution combobox
|
2013-08-22 12:46:11 -07:00 |
|
jent46}
|
99667ce98d
|
Merge remote-tracking branch 'upstream/master'
|
2013-08-20 16:36:50 -05:00 |
|
jent46}
|
6d8d8962e5
|
update languages (fr_FR,he_IL,id_ID,vi_VN)
|
2013-08-20 16:34:42 -05:00 |
|
Chad Pilkey
|
61a6298f80
|
changed the branding build directory from bin to client
|
2013-08-20 12:35:13 -07:00 |
|
Felipe Cecagno
|
cd02ad5c79
|
fixed the style of the video resolution combobox
|
2013-08-20 14:07:38 -03:00 |
|
Gustavo Salazar
|
26e6876136
|
Fix #1606
|
2013-08-19 20:17:10 -05:00 |
|
Chad Pilkey
|
708ce4ebd7
|
Merge pull request #223 from SenecaCDOT-BigBlueButton/skin-logout-confirm
The Alert box skin seems to be working now. I'm not sure why it suddenly started working for me, but I won't question it.
|
2013-08-19 15:01:10 -07:00 |
|
Chad Pilkey
|
c88b888ae3
|
enable the logout confirmation again
|
2013-08-19 14:58:25 -07:00 |
|
Chad Pilkey
|
ea02ae16f2
|
Merge remote branch 'upstream/master' into skin-logout-confirm
|
2013-08-19 14:57:46 -07:00 |
|
Chad Pilkey
|
2d68393cdd
|
moved the confirmation box down a little
|
2013-08-19 14:56:58 -07:00 |
|
Chad Pilkey
|
a1c691059f
|
Merge pull request #233 from SenecaCDOT-BigBlueButton/move-title-prefix
moved the client title prefix to javascript for easier modification
|
2013-08-19 07:30:15 -07:00 |
|
Chad Pilkey
|
238544e495
|
moved the client title prefix to javascript for easier modification
|
2013-08-19 07:28:33 -07:00 |
|
Chad Pilkey
|
d935d8e15e
|
repositioned the logout confirm alert
|
2013-08-19 06:39:27 -07:00 |
|
Fred Dixon
|
1c50f1cff2
|
Disable logout window for the moment as its pending UI updates (changed correct parameter :-)
|
2013-08-16 15:38:41 -07:00 |
|
Fred Dixon
|
d5099639ef
|
Disable logout window for the moment as its pending UI updates
|
2013-08-16 15:11:45 -07:00 |
|
Richard Alam
|
b1ae7bb2e1
|
Merge pull request #228 from kepstin/stretch-audio-sync
Stretch freeswitch audio to match event timing (experimental)
|
2013-08-16 05:35:17 -07:00 |
|
Ghazi Triki
|
a3ca2c6bac
|
Removed uncessary binding for LoadingBar positioning.
|
2013-08-16 10:37:12 +01:00 |
|
Calvin Walton
|
0fa60e2bc3
|
Use the old sox trim syntax for the version on ubuntu lucid
|
2013-08-15 13:36:52 -04:00 |
|
Calvin Walton
|
6b56c4103d
|
Correct variable name to refer to original audio length
|
2013-08-15 13:34:19 -04:00 |
|
Calvin Walton
|
d2afbe9383
|
Convert timestamps to numbers for subtraction
|
2013-08-15 13:30:36 -04:00 |
|
Calvin Walton
|
acbd0e5b7e
|
Stretch freeswitch audio to match event timing
This helps maintain audio sync with video and events when freeswitch's
internal timing differs from red5's.
|
2013-08-14 17:25:10 -04:00 |
|
Chad Pilkey
|
723570d0d4
|
Merge pull request #227 from jent46/master
Update localization from transifex
|
2013-08-14 14:17:02 -07:00 |
|
jent46
|
0d9649c4cc
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton
|
2013-08-14 12:53:20 -07:00 |
|
jent46
|
65cdcc4789
|
locales updated
|
2013-08-14 12:45:18 -07:00 |
|
Chad Pilkey
|
d5c03b1461
|
Merge pull request #226 from SenecaCDOT-BigBlueButton/playback-accessibility-fixes
Playback accessibility fixes
|
2013-08-14 12:18:12 -07:00 |
|
Chad Pilkey
|
3f648000a2
|
add back in the fix for playback acorn media player swap oddities
|
2013-08-14 12:15:15 -07:00 |
|
Chad Pilkey
|
6b00d4f029
|
add back in playback headings
|
2013-08-14 12:05:55 -07:00 |
|
Hugo Lazzari
|
45ff9b298f
|
Fixed chatBox AccessibilityProperties that was seted before being initialized.
|
2013-08-12 14:32:36 -03:00 |
|
Chad Pilkey
|
8b1d0fd0bb
|
Merge remote branch 'upstream/master' into playback-accessibility-fixes
|
2013-08-07 15:35:40 -07:00 |
|
Chad Pilkey
|
b309d8a13b
|
changed the way the playback volume bar is exposed
|
2013-08-07 15:35:27 -07:00 |
|
jtrobinson
|
872a9c3b14
|
Volume slider always visible, part of tab order, does not trigger resizing bug
|
2013-08-02 11:53:11 -07:00 |
|
jtrobinson
|
17a8e14d1d
|
Removed an un-needed commented line
|
2013-08-01 08:49:54 -07:00 |
|
jtrobinson
|
1463b52689
|
Logout confirmation window has been moved to the upper-right corner, skinned to fit in better with other BBB components.
|
2013-08-01 08:48:00 -07:00 |
|
Chad Pilkey
|
3b758bb0b1
|
Merge pull request #221 from SenecaCDOT-BigBlueButton/fix-whiteboard-text-create
you can now create a whiteboard text box from any draw direction
|
2013-07-31 15:13:26 -07:00 |
|
Chad Pilkey
|
7b3e278232
|
you can now create a whiteboard text box from any draw direction
|
2013-07-31 13:58:54 -07:00 |
|
Chad Pilkey
|
5aba2b7c5d
|
Merge pull request #220 from SenecaCDOT-BigBlueButton/fix-whiteboard-pagechange
fixed the annotations disappearing on page change
|
2013-07-30 17:36:16 -07:00 |
|
Chad Pilkey
|
b7cbe197f9
|
fixed the annotations disappearing on page change
|
2013-07-30 17:30:37 -07:00 |
|
Chad Pilkey
|
397994cdb9
|
Merge pull request #219 from SenecaCDOT-BigBlueButton/better-logout
Better logout
|
2013-07-30 17:29:07 -07:00 |
|
Chad Pilkey
|
5ce8fca8de
|
the tab order of the playback controls is set
|
2013-07-30 16:49:30 -07:00 |
|
jtrobinson
|
674195ea71
|
Config Template contains boolean flag to activate/deactivate logout confirmation (default is true). Also cleaned up remnants of old custom Confirm component.
|
2013-07-30 08:52:07 -07:00 |
|
jtrobinson
|
5ab068d201
|
Removed custom ConfirmLogoutWindow.mxml. Committing mx:Alert-based logout confirmation.
|
2013-07-30 07:25:48 -07:00 |
|
Richard Alam
|
5cf7a60cf7
|
- do not show eject button when allowKickUser is false
|
2013-07-29 12:43:07 -07:00 |
|
Richard Alam
|
05490b130b
|
- do not show unlocked layout icon to viewers
|
2013-07-29 11:35:09 -07:00 |
|