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

15928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
adf63397a3 Merge pull request #3780 from KDSBrowne/accessibility-update-03 
[HTML5] - Accessibility update 03
 2017-04-07 08:11:30 -04:00
Anton Georgiev
c257839e5b Merge pull request #3753 from KDSBrowne/actions-button-fix 
[HTML5] - Actions Button Fix
 2017-04-07 08:08:14 -04:00
Anton Georgiev
462deffc37 Merge pull request #3782 from riadvice/emoji-time-fix 
Updated HTML5 emoji status names to match with the Flex client.
 2017-04-07 08:06:54 -04:00
Richard Alam
d80c34eb25 Merge pull request #3790 from kepstin/presentation-poll-labels 
recording presentation: Improve calculations of bar sizes in poll results
 2017-04-06 18:09:46 -04:00
Calvin Walton
e77b50d2c6 recording presentation: Reduce the top/bottom margin so bars fit better 
gnuplot's auto-margins don't work well on this graph, so manually specify
the top/bottom (actually left/right - the graph is rotated 90°) to make
the bars fit better, particularly when using wide aspect ratio slides.
 2017-04-06 18:04:10 -04:00
Richard Alam
568853dae4 Merge pull request #3789 from ritzalam/bbb-2.x-dev 
Merging multi-user whiteboard
 2017-04-06 17:21:01 -04:00
Anton Georgiev
e3f66da499 update chat unless user just left 2017-04-06 17:08:20 -04:00
Klaus Klein
1c22f38add Fix user drop down 2017-04-06 17:41:08 -03:00
Richard Alam
6537e99981 Merge branch 'multiuser-whiteboard' of https://github.com/capilkey/bigbluebutton into merge-multi-user-whiteboard 2017-04-06 19:12:42 +00:00
Calvin Walton
0a1667f293 recording presentation: Correctly calculate width of bar in poll results 
The code was previously dividing by the total number of votes rather than
the max number of votes, which meant it was underestimating the width of
the bars. In some cases, this meant that the label for number of votes would
overlap the percentages.

Fixes #3725
 2017-04-06 14:35:31 -04:00
Anton Georgiev
5286a6acb7 Merge pull request #3788 from Gcampes/patch-3 
[HTML5] - Fix user not being removed on tab close
 2017-04-06 13:23:37 -04:00
Gabriel Carvalho de Campes
82a3018171 [HTML5] - Fix user not being removed on tab close 2017-04-06 14:06:03 -03:00
Richard Alam
c73739636a Merge branch 'merging-into-bbb-1.1' of https://github.com/mconf/bigbluebutton into merge-mconf 2017-04-06 17:01:58 +00:00
Ghazi Triki
fd6092e5a8 Merge pull request #1 from antobinary/test-ghazi-pr 
Extra commit for html5 client emojis
 2017-04-06 17:41:04 +02:00
KDSBrowne
8469691256 fix slide control and actionbar btn overlap 2017-04-06 08:13:28 -07:00
Anton Georgiev
b87ba1f3ea adjust emoji statuses and icon names 2017-04-06 10:42:01 -04:00
KDSBrowne
3ff1096cf4 fix merge conflict 2017-04-06 07:11:57 -07:00
gcampes
1c26137177 removes unnecessary log 2017-04-06 10:14:12 -03:00
gcampes
9a641c09aa Remove unwanted changes 2017-04-06 10:09:34 -03:00
Anton Georgiev
b007c68aaa Merge branch 'emoji-time-fix' of github.com:riadvice/bigbluebutton into test-ghazi-pr 2017-04-06 08:44:30 -04:00
gcampes
ded1de0b40 Adds localization dropdown 2017-04-06 09:36:59 -03:00
Anton Georgiev
fe998aacd3 Merge pull request #3769 from Gcampes/settings-refactor 
[HTML5] Adds settings service
 2017-04-06 08:31:59 -04:00
Anton Georgiev
ed7d09b8a2 Merge pull request #3783 from Klauswk/AddSendButton 
HTML5 close #3765, Added send button aside chat textbox
 2017-04-06 08:20:02 -04:00
Anton Georgiev
65cbc6a41c Merge pull request #3771 from KDSBrowne/accessibility-02-update 
[HTML] Accessibility update 02
 2017-04-06 08:18:35 -04:00
gcampes
3ea21df973 Fix closed captions settings issue 2017-04-06 08:46:15 -03:00
KDSBrowne
800c47f462 remove default messages 2017-04-05 17:02:07 -07:00
Chad Pilkey
1a78091d01 multi-user whiteboard little bit of polish 2017-04-05 19:54:40 -04:00
KDSBrowne
7e4bf60588 remove FormattedMessage import 2017-04-05 15:49:05 -07:00
KDSBrowne
757d374383 remove span element 2017-04-05 15:38:15 -07:00
KDSBrowne
e932f707a9 clean up code 2017-04-05 15:35:09 -07:00
KDSBrowne
a8067b7bd8 clean up render function 2017-04-05 12:43:50 -07:00
Pedro Beschorner Marin
9a838cc82b Merge pull request #391 from pedrobmarin/merging-into-bbb-1.1 
Fixed NPE thrown when presenter leaves room and whiteboard toolbar ha…
 2017-04-05 15:59:47 -03:00
Pedro Beschorner Marin
8539ed3e20 Fixed NPE thrown when presenter leaves room and whiteboard toolbar has focus 2017-04-05 18:57:42 +00:00
KDSBrowne
e01f34cf23 fix merge conflicts 2017-04-05 09:56:41 -07:00
gcampes
f0ac39f420 Merge remote-tracking branch 'upstream/master' into settings-refactor 
* upstream/master: (63 commits)
  add styles for separator
  In whiteboard text tool, a single click while editing a text sends it without creating a new text zone.
  Fixed https://github.com/bigbluebutton/bigbluebutton/issues/3777
  - escape all user passed strings
  - display length of recording in minutes instead of milliseconds
  - fix window size  - run dos2unix to remove ^M but it formatted the whole file :(
  - add dimension of screen share
  add formatted message for close chat link
  add formatted message for userlist toggle btn label
  remove unused import
  fix DropdownListSeparator to work with NVDA
  remove local storage usage and add separator
  change role from section to region
  add menu item separation NVDA fiendly
  add formatted messages and remove generic divs
  remove direct DOM manipulation
  remove span element
  add aria-label for unread messages
  add missing import to fix JoinAudio Btn
  fix lint issues
  ...
 2017-04-05 13:56:07 -03:00
KDSBrowne
47ec0ed4d5 remove unneeded css prop 2017-04-05 09:24:43 -07:00
KDSBrowne
ffab4a0898 change line endings 2017-04-05 09:20:32 -07:00
KDSBrowne
12ff717033 fix ability to click actions btn 2017-04-05 09:14:37 -07:00
gcampes
724780c240 change underscore import to lodash 2017-04-05 13:08:20 -03:00
Klaus Klein
8095620fac Change to arrow function 2017-04-05 11:23:05 -03:00
Klaus Klein
a140f7567a HTML5 close #3765 ,Added send button aside chat textbox 2017-04-05 10:21:30 -03:00
Ghazi Triki
ae866c88a1 Updated HTML5 emoji status names to match with the Flex client. 2017-04-05 09:23:44 +01:00
KDSBrowne
c852e2d7ec remove () and ! characters 2017-04-04 14:12:00 -07:00
Pedro Beschorner Marin
ee099b8f0d Merge pull request #390 from pedrobmarin/merging-into-bbb-1.1 
Remote tracking BBB master
 2017-04-04 17:46:48 -03:00
Chad Pilkey
f7b9782ef3 multi-user whiteboard clear works 2017-04-04 16:43:15 -04:00
Pedro Beschorner Marin
f59e42bb02 Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1 2017-04-04 20:42:15 +00:00
Anton Georgiev
54e34e8d5c Merge pull request #3755 from KDSBrowne/accessibility-update-01 
[HTML5] - Accessibility update 01
 2017-04-04 14:39:44 -04:00
gcampes
da25471e3c Adds missing lodash import 2017-04-04 14:51:05 -03:00
Chad Pilkey
73ab3d360e Merge pull request #3779 from riadvice/whiteboard-text-tool-update 
Improve user experience for whiteboard text tool
 2017-04-04 13:18:16 -04:00
KDSBrowne
ee31b29c96 add styles for separator 2017-04-04 09:49:01 -07:00