Commit Graph

14905 Commits

Author SHA1 Message Date
Anton Georgiev
3d51335d19 Merge pull request #3862 from antobinary/test-3850
HTML5: Updated strings
2017-04-27 17:26:35 -04:00
Anton Georgiev
9684195c5f minor changes in strings 2017-04-27 17:23:43 -04:00
Anton Georgiev
4188394a82 Merge branch 'patch-1' of github.com:oswaldoacauan/bigbluebutton into test-3850 2017-04-27 16:20:41 -04:00
Anton Georgiev
ef0d2f5729 Merge pull request #3861 from antobinary/disallow-moderator-2
HTML5: demote html5 moderator user to viewer based on flag
2017-04-27 16:17:49 -04:00
Anton Georgiev
684f87e77a demote html5 moderator user to viewer based on flag 2017-04-27 16:07:27 -04:00
Anton Georgiev
e3924a2538 Merge pull request #3828 from Klauswk/FixAuthentication
Fix authentication issue on HTML5
2017-04-27 15:01:27 -04:00
Pedro Beschorner Marin
000d0a038e Fixed multiline text annotations in playback 2017-04-27 17:43:35 +00:00
Pedro Beschorner Marin
b52bf09a45 Fixed wrong font sizes and placement in playback so now they match the annotated text from the presentation 2017-04-27 17:31:48 +00:00
KDSBrowne
737da5937d add aria descriptionfor current status 2017-04-27 08:57:41 -07:00
Fred Dixon
efe4a71242 Merge pull request #3858 from ffdixon/bump-1.1-RC
Update version to 1.1-RC
2017-04-27 11:47:04 -04:00
Fred Dixon
6daedbfc7b Update version to 1.1-RC 2017-04-27 10:45:49 -05:00
Richard Alam
33133686b4 Merge pull request #3857 from ritzalam/update-locales-apr-27
- update locales
2017-04-27 11:02:03 -04:00
Richard Alam
94e587b52f - update locales 2017-04-27 14:55:57 +00:00
Klaus Klein
3aacb71705 Remove unnecessary console.log 2017-04-27 10:43:21 -03:00
Ghazi Triki
f1ced34322 Improve setting padding to containers in ChatSettingsViewBase and LockSettingsViewBase. 2017-04-27 11:08:05 +01:00
Fred Dixon
30a2270228 Merge pull request #3855 from ffdixon/detect-ip
Improved detection for IP address on new ethernet card names
2017-04-26 18:18:35 -04:00
Fred Dixon
766b78df74 Improved detection for IP address on new ethernet card names 2017-04-26 17:17:30 -05:00
Fred Dixon
2c52e8b2ea Merge pull request #3854 from capilkey/force-flash-on-edge
Force Flash on Edge 15+
2017-04-26 17:19:53 -04:00
Fred Dixon
040f282a63 Merge pull request #3853 from kepstin/presentation-pagenum
Use the presentation name/page number to match shapes to pages, not time.
2017-04-26 17:19:39 -04:00
Chad Pilkey
3970f17455 force Flash on Edge 15+, fixes #3812 2017-04-26 17:13:52 -04:00
Klaus Klein
d4917e975c Review change 2017-04-26 17:07:22 -03:00
Klaus Klein
b99b73f334 Fix the double auth problem 2017-04-26 16:56:29 -03:00
Calvin Walton
da79ecdada Handle BBB 0.81 slide/pageNumber base mismatch
In BBB 0.81, the slide number was base 0, while the shape page number was
base 1. We already have a conditional for checking 0.9+; use that to
add a workaround for old BBB recordings.
2017-04-26 14:02:52 -04:00
Calvin Walton
a5adebd3e0 Use the presentation name/page number to match shapes to pages, not time.
The previous code assumed that if a shape event's timestamp was during the
time when a particular slide was visible, then the shape belonged to that
slide. This isn't always true with the text shapes, since a final close
event can be sent after the slide has switched.

For a more future-proof matching, use the presentation name and page number
fields on the shape events when available to match them with the appropriate
slide image.
2017-04-26 14:02:52 -04:00
Anton Georgiev
7eba006345 Merge pull request #3849 from KDSBrowne/accessibility-06-update
[HTML5] - Accessibility 06 update
2017-04-26 11:09:50 -04:00
Oswaldo Acauan
4466cd084e Update component.jsx 2017-04-26 11:57:40 -03:00
Oswaldo Acauan
4e29024783 Prevent breakout dropdown when theres no breakout 2017-04-26 11:55:49 -03:00
KDSBrowne
230bc1f11c fix merge conflicts 2017-04-26 07:14:25 -07:00
KDSBrowne
ef18f652aa fix lint issues 2017-04-26 07:08:47 -07:00
Klaus Klein
d32dbb12f5 Fix wrong import 2017-04-25 14:26:14 -03:00
Klauswk
73fb753edb Merge branch 'master' into FixAuthentication 2017-04-25 14:09:47 -03:00
Klaus Klein
6f564ba7b6 Fix auth and user kick, HTML5 closes #3844 #3828 2017-04-25 14:04:17 -03:00
Anton Georgiev
c2b6f48b87 Merge pull request #3848 from antobinary/audio-restructuring
HTML5: Fix issue with listenOnly not hanging up
2017-04-25 12:04:32 -04:00
KDSBrowne
a752b97809 add message descriptions 2017-04-25 05:21:12 -07:00
KDSBrowne
330abe06e5 fix aria semantics 2017-04-25 04:59:52 -07:00
KDSBrowne
1e4e730278 fix aria labels 2017-04-24 19:27:28 -07:00
KDSBrowne
9203cc60e3 add localized messages 2017-04-24 19:08:18 -07:00
Richard Alam
011ebd7e81 Merge pull request #3847 from ritzalam/add-catch-all-exception
Add catch all exception to bbb-web redis subscriber
2017-04-24 17:51:03 -04:00
Richard Alam
34e01be092 Merge pull request #3840 from riadvice/unify-document-conversion
Improve document conversion and make it faster
2017-04-24 17:50:48 -04:00
Anton Georgiev
c80827ee20 fix issue with listenOnly not hanging up 2017-04-24 17:17:53 -04:00
Richard Alam
5126e40762 - spell the word correctly 2017-04-24 20:46:43 +00:00
Richard Alam
4c32f130df - minimize logging 2017-04-24 20:43:11 +00:00
Richard Alam
80e3c7eabb Add catch all exception to bbb-web redis subscriber
On redis-cli, we noticed that BbbWebSub isn't on the "client list". The auto-reconnect on bbb-web
 wasn't triggered as not log was generated in bbb-web.log. Maybe the exception was something we
 did not handle. Try catching all exception on this jedis connection.
2017-04-24 20:20:39 +00:00
Klaus Klein
1d59ba7d58 Remade with @gcampes changes 2017-04-24 17:18:07 -03:00
Anton Georgiev
e78f2409e9 Merge pull request #3843 from Klauswk/HotfixChat
HotfixChat, HTML5 issues #3829
2017-04-24 15:34:28 -04:00
Anton Georgiev
835acfa195 Merge pull request #3835 from KDSBrowne/accessibility-05-update
[HTML5] - Accessibility update 05
2017-04-24 15:34:05 -04:00
Anton Georgiev
d7a61a8a7e Merge pull request #3801 from JaeeunCho/userlist_truncate
HTML5 - Truncate user name and chat name
2017-04-24 15:02:16 -04:00
Anton Georgiev
90d34da942 Merge pull request #3832 from Klauswk/FixFullScreen
Fix full screen when console is open, HTML5
2017-04-24 14:55:35 -04:00
Jaeeun Cho
5099d4bca7 Update styles.scss 2017-04-24 11:17:24 -04:00
Klaus Klein
650e93d4dd HotfixChat, HTML5 issues #3829 2017-04-24 08:33:08 -03:00