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
Leonardo Crauss Daronco
fc00a8639d
HTML5: Update jade to 0.34.1 and remove warnings
...
Removed the warnings:
"Implicit textOnly for `script` and `style` is deprecated. Use `script.` or `style.` instead."
2013-08-16 19:00:15 -03:00
Leonardo Crauss Daronco
13ff0b0d19
HTML5: Set specific versions for the dependencies
...
It's always better to have specific version to force all instances to
use exactly the same dependencies and avoid errors that will naturally
happen when libs are updated.
Also restricted the version of node to 0.10.x.
2013-08-16 18:42:21 -03: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
mohamed-ahmed
995359a9d4
merged latest with my local changes
2013-08-14 16:48:54 +00:00
Fred Dixon
f9af393c9f
Merge pull request #225 from jent46/html5-bridge
...
Update Html5 Branch with BBB 0.81
2013-08-14 09:08:31 -07:00
jent46
614fad9aae
Merge remote branch 'downstream/html5-bridge' into html5-bridge
2013-08-13 16:12:41 -07:00
mohamed-ahmed
c7d8203a64
modified xml layout file for testing client changes
2013-08-12 18:49:28 +00: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
mohamed-ahmed
2df93fa993
modified local settings to be able to run on my system
2013-08-02 20:48:31 +00:00
jtrobinson
872a9c3b14
Volume slider always visible, part of tab order, does not trigger resizing bug
2013-08-02 11:53:11 -07:00
Richard Alam
d24a90b487
Merge pull request #224 from SenecaCDOT-BigBlueButton/Activate-Undo-ClrPaper-Events
...
Activate "undo" and "clrpaper" events
2013-08-01 15:44:41 -07:00
Gary Deng
f04c048526
After clearShape,currentshape should not be null
2013-08-01 08:57:17 -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
Gary Deng
17881b19ee
remove unnecessary changes
2013-08-01 08:27:22 -07:00
Gary Deng
ebe17628f5
send undo and clrPaper events to html5-client, and enable html5-client to see square while Ctrl keypressed
2013-08-01 08:10:59 -07:00
Jorge Nunez
5b1d62f5d2
Merge remote branch 'upstream/master' into html5-bridge
...
Conflicts:
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2013-07-31 17:27:33 -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
