Chad Pilkey
6bfb18e6f2
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into multi-user-2.0-take3
2017-05-08 13:57:43 -04:00
Chad Pilkey
f2bc898750
new multiuser whiteboard icon and fixes for text object
2017-05-08 13:46:47 -04:00
Richard Alam
9db13d946e
Merge pull request #3913 from ritzalam/bbb-2x-mconf
...
Merging latest master branch into 2x branch
2017-05-08 13:10:22 -04:00
Richard Alam
44e3fb8a07
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2x-mconf
2017-05-08 08:51:31 -07:00
KDSBrowne
8bb1da0ed5
fix focus and tab order bugs
2017-05-06 16:04:59 -07:00
Chad Pilkey
155b5ec626
Merge pull request #3903 from riadvice/text-tool-fix
...
Prevent Flash client from crashing when text tool is used
2017-05-06 17:46:09 -04:00
Ghazi Triki
3541b0ec33
Check event target variable after extracting it from its event.
2017-05-06 21:04:42 +01:00
KDSBrowne
569ba42042
fix userlist styling
2017-05-06 09:01:16 -07:00
Anton Georgiev
0665d61904
Merge pull request #3906 from Klauswk/FixDevClientReconnection
...
Fix client reconnection timeout
2017-05-05 17:22:00 -04:00
Anton Georgiev
1f640ea3e4
only offer taking over a locale for cc to moderators
2017-05-05 15:52:23 -04:00
KDSBrowne
77d529b2ac
fix error for out of bound index
2017-05-05 12:11:28 -07:00
Richard Alam
9a4d049e24
Merge pull request #3908 from ritzalam/bbb-2x-mconf
...
merge Pedro's screen share fix
2017-05-05 14:49:56 -04:00
Richard Alam
4bee4d66c0
Merge branch 'bbb-2.x-dev-mconf' into bbb-2x-mconf
2017-05-05 11:48:06 -07:00
Richard Alam
acaaf62849
Merge pull request #18 from pedrobmarin/2.0-small-fixes
...
2.0 small fixes
2017-05-05 14:23:35 -04:00
Fred Dixon
26a62bd398
Merge pull request #3907 from kepstin/webrtc-stats
...
Update webrtc stats bridge for modern Chrome/Firefox APIs
2017-05-05 14:21:48 -04:00
Calvin Walton
75c680832c
Update webrtc stats bridge for modern Chrome/Firefox APIs
...
Switch to the promise-based getStats, and use the standardized
property names where available, with fallback to handle Chrome,
which hasn't fully switched yet.
The stats now only track the outgoing audio stream, as a way to
indicate quality, since the user can't hear themselves. This
might be revisited later; it would require tracking the stats
separately for incoming vs. outgoing and e.g. returning whichever
is worse.
2017-05-05 11:22:38 -04:00
KDSBrowne
85a468f4b3
add key codes for left and right arrow
2017-05-05 07:37:01 -07:00
Klaus Klein
b2195da345
Fix client reconnection timeout
2017-05-05 11:30:15 -03:00
Ghazi Triki
1628851ce4
Send the previously non detected as finished text object before keeping focus on the last created one.
2017-05-05 09:53:49 +01:00
Richard Alam
c5cfbdda58
Merge pull request #3905 from ritzalam/bbb-2x-mconf
...
Merge latest changes for bbb 2.x
2017-05-04 19:00:21 -04:00
Richard Alam
69cc522473
Merge branch 'bbb-2.x-dev-mconf' into bbb-2x-mconf
2017-05-04 15:57:42 -07:00
KDSBrowne
8194059e43
fix count bug
2017-05-04 14:58:33 -07:00
Fred Dixon
ac1eb0d3e7
Update demo1.jsp
...
testing package updates
2017-05-04 17:44:12 -04:00
KDSBrowne
65323d0789
remove unused id's
2017-05-04 14:43:48 -07:00
KDSBrowne
eca2dbba93
clean up code
2017-05-04 14:41:09 -07:00
Richard Alam
23e6dea35b
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2.x-dev-mconf
2017-05-04 14:39:02 -07:00
Fred Dixon
36f2f238cd
Update demo1.jsp
...
testing build server
2017-05-04 17:35:53 -04:00
Fred Dixon
f0728393ac
Update bbb-conf
2017-05-04 17:34:12 -04:00
Fred Dixon
b061996e44
Update bbb-conf
...
test-commit
2017-05-04 17:31:58 -04:00
Anton Georgiev
ea05b8b277
Merge pull request #3904 from antobinary/verto-bridge-update
...
HTML5: Unify user and audiouser in verto bridge
2017-05-04 17:29:40 -04:00
Richard Alam
8723fca30c
- update version of bbb-commons-message
2017-05-04 13:48:39 -07:00
Fred Dixon
401f46c5c6
Update bbb-conf
2017-05-04 16:41:35 -04:00
KDSBrowne
f6642b0dee
make userlist keyboard accessible - incomplete
2017-05-04 13:39:53 -07:00
Anton Georgiev
93baf362e6
remove old import
2017-05-04 15:14:14 -04:00
Anton Georgiev
91ce6e20d5
unify user and audiouser in verto bridge
2017-05-04 14:44:20 -04:00
Anton Georgiev
bd56001733
disable cc menu if toggled off
2017-05-04 14:42:55 -04:00
Ghazi Triki
740a1abe0b
Fix client crash when text zones are quickly added to the whiteboard.
2017-05-04 18:46:36 +01:00
Chad Pilkey
721495d460
removed old images that are now unused
2017-05-04 13:14:54 -04:00
Pedro Beschorner Marin
65aac2d500
Reverting screenshare view back to canvas
2017-05-04 16:01:48 +00:00
Chad Pilkey
62a7ad1a7e
whiteboard client cleanup
2017-05-04 11:49:10 -04:00
Pedro Beschorner Marin
d4b6fb1158
Removed bbb-web a domain file that was already moved to bbb-common-web
2017-05-04 15:24:06 +00:00
Chad Pilkey
53783a7d2c
Merge pull request #3899 from riadvice/mobile-client
...
[Mobile] - Handle "back" soft button and add item render to video profiles list
2017-05-04 10:30:23 -04:00
Richard Alam
a97dd6ec58
Merge pull request #16 from pedrobmarin/life-cycle-management
...
Moving the meeting life cycle management from bbb-web to akka-apps
2017-05-04 10:22:06 -04:00
Richard Alam
b1740ebec5
Merge pull request #17 from capilkey/multi-user-2.0-take3
...
Updates to make the text tool work
2017-05-04 10:21:39 -04:00
Ghazi Triki
db77dc239f
Close color picker when the text toolbar is to be hidden.
2017-05-04 11:23:20 +01:00
Fred Dixon
5493ba2e22
Merge pull request #3901 from bigbluebutton/ffdixon-patch-3
...
Updated comment in crontab job to remove reference to ghostscript
2017-05-04 05:04:44 -04:00
Fred Dixon
ef8fdccd4f
Updated comment in crontab job
2017-05-04 05:04:25 -04:00
Fred Dixon
925eeebc28
Merge pull request #3900 from ffdixon/remove-ref-gs
...
Remove refs to ghostscript
2017-05-04 04:59:02 -04:00
Fred Dixon
b26ac2b6bc
Remove refs to ghostscript
2017-05-04 03:57:43 -05:00
Ghazi Triki
44ed1ae04d
Revert modifications to .actionScriptProperties
2017-05-04 09:38:20 +01:00
