Commit Graph

14370 Commits

Author SHA1 Message Date
gcampes
91da3e0262 Fix font size not showing in settings modal 2017-03-01 14:37:55 -03:00
Chad Pilkey
443e131bde chat selection indicator is now a bg highlight instead of box 2017-03-01 12:06:13 -05:00
Ghazi Triki
290f1620e1 Merge branch 'master' into accessibility-improve
# Conflicts:
#	bigbluebutton-client/locale/en_US/bbbResources.properties
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
2017-03-01 16:56:35 +01:00
Anton Georgiev
4c4ad35ba5 cleanup 2017-03-01 10:54:01 -05:00
Ghazi Triki
ce79fa5b8e Merge branch 'master' into popup-imporve
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
2017-03-01 16:48:04 +01:00
Calvin Walton
e782709913 Correctly use jquery to modify links in chat messages.
The code was previously passing the message string provided by the user
directly to jQuery - which works okish if the first character is '<' since
it'll parse it as HTML, but the chat messages don't. As a result, it was
sometimes being parsed as a selector, failing, and raising an exception.

The fix is to put the chat message into a DOM node (have the browser parse
the HTML) before doing the jQuery operation to modify the link targets.

Fixes #3670
2017-03-01 10:38:39 -05:00
Richard Alam
f73787448e Merge pull request #3693 from capilkey/1.1-accessiblity-fixes
1.1 accessiblity fixes
2017-03-01 10:31:39 -05:00
Richard Alam
250b29e8ac Merge pull request #3689 from ritzalam/webcam-recording
Do not record webcam if meeting is not recorded
2017-03-01 10:30:40 -05:00
Richard Alam
96a5b84f5d Merge pull request #3676 from riadvice/fix-shortcut-keys-hide
Make sure that "showButton" property of config shortcutKeys is read by MainToolbar
2017-03-01 10:27:03 -05:00
Richard Alam
b7d0993edc Merge pull request #3674 from riadvice/flex-scrollbars
Updated FileUploadWindow.mxml to never show scroll bars
2017-03-01 10:25:52 -05:00
gcampes
a6947bdd17 removes debug code 2017-03-01 09:32:23 -03:00
gcampes
4918cf9160 fix bug with focus 2017-03-01 09:22:11 -03:00
Ghazi Triki
75a3155f03 Updated deskshare button tooltip. 2017-03-01 08:38:34 +01:00
Chad Pilkey
5b72d93669 removed old chat message list custom accessibility functionality 2017-02-28 17:55:56 -05:00
Anton Georgiev
38c3c73b63 simplify; fix issue with incorrect removing procedure 2017-02-28 17:24:21 -05:00
Richard Alam
89351c50d6 Merge pull request #3683 from riadvice/increase-pdf2swf-timeout
Increased PDF2SWF timeout for some PDF files containing a lot of elements
2017-02-28 14:03:11 -05:00
Oleksandr Zhurbenko
652dac0cc0 Initial whiteboard overlay component
Returns correct coordinates
2017-02-28 10:35:56 -08:00
Richard Alam
cd5017b67c Merge pull request #3692 from ritzalam/update-screenshare-doc
- keep copy of original javacv doc in another file.
2017-02-28 12:20:25 -05:00
Richard Alam
10727855c5 - forgot to commit 2017-02-28 17:18:14 +00:00
Richard Alam
99362a1086 - keep copy of original javacv doc in another file. 2017-02-28 17:15:45 +00:00
Richard Alam
c908d5d38b Merge pull request #3691 from ritzalam/update-screenshare-doc
Update screenshare doc
2017-02-28 11:57:16 -05:00
Richard Alam
1c4b0d96d2 - fix formatting and typos 2017-02-28 16:54:16 +00:00
Richard Alam
657236fe5f Write document on how to build screenshare app. 2017-02-28 16:50:07 +00:00
Anton Georgiev
82ea9c6116 remove camera when unpublishing 2017-02-28 11:12:47 -05:00
Anton Georgiev
e30f019026 control the elements of _myCamSettings 2017-02-27 17:25:17 -05:00
Richard Alam
ca539f9098 Do not record webcam if meeting is not recorded
Currently, we record webcams even if the meeting is not being recorded. We add
 an indicator in the webcam stream name ("-recorded") to trigger bbb-video in
 red5 to record the webcam stream.
2017-02-27 19:54:21 +00:00
Anton Georgiev
ed8b4376e7 store both cameras so we can resume sharing upon reconnect 2017-02-24 16:55:25 -05:00
gcampes
439e7a97f2 fix font size on modal cancel 2017-02-24 17:38:16 -03:00
gcampes
8e2bb6a799 revert unwanted changes 2017-02-24 17:35:41 -03:00
gcampes
420918abe8 merge conflicts 2017-02-24 17:28:42 -03:00
gcampes
ef6bc76ea3 remove old settings folder 2017-02-24 17:20:22 -03:00
gcampes
3c02848478 hide moderator settings, implement default settings 2017-02-24 17:19:53 -03:00
Oswaldo Acauan
19f119fcf6 Fix presentations not being removed while non existent in the reply message 2017-02-24 13:57:10 +00:00
Oswaldo Acauan
cc0999013f Fix shapes not being removed while non existent in the reply message 2017-02-24 13:10:55 +00:00
Oleksandr Zhurbenko
b4f904d3ea Adjusted cursor functionality to the new structure 2017-02-23 16:11:27 -08:00
Oleksandr Zhurbenko
d5da606bc6 Fixed a bug with variable names 2017-02-23 15:28:04 -08:00
Oleksandr Zhurbenko
56989c54ac Added Cursor functionality 2017-02-23 15:27:48 -08:00
Oleksandr Zhurbenko
03791aa7f1 Added publishCursorUpdate method to the cursor api 2017-02-23 15:26:59 -08:00
Oswaldo Acauan
f3f4f8ddfe Fix bugs on the voiceUpdate handlers 2017-02-23 20:35:36 +00:00
Oswaldo Acauan
5e9a7d8e39 Fix bug when removing users 2017-02-23 20:26:34 +00:00
Oleksandr Zhurbenko
fe01f81e27 changed slide-controls to presentation-toolbar
.. and removed duplicate strings from the locales
2017-02-23 12:20:21 -08:00
Oswaldo Acauan
b6e80815bd Fix a bunch of bugs introduced after the refactor 2017-02-23 20:16:10 +00:00
Oswaldo Acauan
d07bca00c9 Refactor handlers inside /phone to the /user folder 2017-02-23 18:52:50 +00:00
Oswaldo Acauan
99cfdb2062 Refactor handlers inside /phone to the /user folder 2017-02-23 18:52:44 +00:00
Oleksandr Zhurbenko
48c3c5252e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into whiteboard-restructuring 2017-02-23 10:26:03 -08:00
Oleksandr Zhurbenko
119beae88b Restructured whiteboard code 2017-02-23 10:20:45 -08:00
Oleksandr Zhurbenko
09090eda13 Removed an unnecessary import from the cursor service 2017-02-23 10:20:29 -08:00
Oleksandr Zhurbenko
8f74e984ac Restructured the whiteboard code 2017-02-23 10:19:59 -08:00
Oleksandr Zhurbenko
649b0a2738 Fixed presentation imports 2017-02-23 10:15:25 -08:00
Oswaldo Acauan
24aa98b623 Refactor of validate_auth_token and clearUsers 2017-02-23 18:15:13 +00:00