BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,022 Commits 13 Branches 260 Tags 1.1 GiB
f9fae74d08
Commit Graph

15022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oswaldo Acauan
4dd5e3c6ac Re-add messages concatenation 2017-04-28 15:01:50 +00:00
Oswaldo Acauan
3d0c0d38e1 Fix merge conflicts 2017-04-28 14:59:09 +00:00
Oswaldo Acauan
9467731f47 Improve chat performance 2017-04-28 14:52:54 +00:00
Klaus Klein
71d3c06d5e Fix few lint issues 2017-04-28 11:03:35 -03:00
Klaus Klein
1c8e78d1c1 Merge with master 2017-04-28 10:53:30 -03:00
Klaus Klein
245ba3c4e3 Add client log, HTML5 2017-04-28 10:47:07 -03:00
Anton Georgiev
ab9c085133 Merge pull request #3863 from antobinary/test-3850 
HTML5: Pulled translations from transifex
 2017-04-27 18:02:26 -04:00
Anton Georgiev
d9cf45152d pulled translations from transifex 2017-04-27 18:00:36 -04:00
Calvin Walton
d24d140381 Merge pull request #3859 from pedrobmarin/fix-bbb-playback-text 
Fix bbb playback text
 2017-04-27 17:44:19 -04:00
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
JaeeunCho
efe82d1671 HTML5 - fixed display unread count for long name user 2017-04-27 12:46:28 -07: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
15ea8921dc Fix lint problems 2017-04-26 10:53:01 -03:00
Klaus Klein
e56546137b Change callServer function name 2017-04-26 10:47:44 -03:00
Klaus Klein
8dcd68bf76 Merge branch 'master' into AddServerCallback 
* master: (53 commits)
  fix issue with listenOnly not hanging up
  - spell the word correctly
  - minimize logging
  Add catch all exception to bbb-web redis subscriber
  Update styles.scss
  HotfixChat, HTML5 issues #3829
  fix undefined voiceBridge
  moved componentWillMount to component..
  Faster PDF pages counting by replacing "pdf2swf" command with "pdfinfo".
  add aria-label to chat log
  Fallback again to 72 DPI PNG for complex PDF pages.
  Changed screenshare's publish and view windows to use CustomMdiWindow
  resolve lint warnings on modified files
  Fixing bug that was causing a stack overflow when checking permissions of ignored windows
  move audio tag to component
  Rename GhostscriptPageExtractor to PageExtractorImp.
  change aria-labelledby to aria-describedby
  Fix avatar issue in chat, HTML5 #3830
  add suggested changes
  Remove usage of GhostScript and replace it by pdftocairo and pdfseparate.
  ...
 2017-04-26 10:43:04 -03:00
Klaus Klein
9d50e11172 Add notification service and fix logout 2017-04-26 10:41:34 -03: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