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

21903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
ee6325e29f
Merge pull request #5828 from antobinary/merge-bbb-web 
Merge #4842 to bbb2.2
 2018-07-06 14:05:44 -04:00
Tainan Felipe
3468447f81 add message in en.json 2018-07-06 14:47:06 -03:00
Tainan Felipe
b6aa7e5136 remove breakout URL of nav bar and remove code of service 2018-07-06 14:46:07 -03:00
Anton Georgiev
f20569aed7 Merge branch 'java-optimise' of github.com:riadvice/bigbluebutton into merge-bbb-web 2018-07-06 17:40:54 +00:00
Tainan Felipe
4e87260b59 add free join interface 2018-07-06 14:38:14 -03:00
Tainan Felipe
425c5da4ee allow get all meetings when is free join breakout room 2018-07-06 14:07:08 -03:00
Tainan Felipe
ccd045dbef add Method for request Breakout join URL 2018-07-06 14:00:44 -03:00
Fred Dixon
6c6362c576
Merge pull request #5824 from riadvice/hardware-acceleration 
Updated hardware acceleration hint and check
 2018-07-06 11:33:05 -04:00
Ghazi Triki
eb17100a89 Updated hardware acceleration hint and check. 2018-07-06 15:40:23 +01:00
JamesJung
7350c1f81b Don't push chat notification if chat is open (#5773) 
* Make the public/private chat notification not to be pushed when public/private chat is opened

* Make the public/private chat notification not to be pushed when public/private chat is opened

* Make the public/private chat notification not to be pushed when public/private chat is opened

* Make the public/private chat notification not to be pushed when public/private chat is opened

* Make the public/private chat notification not to be pushed when public/private chat is opened

* Make the public/private chat notification not to be pushed when public/private chat is opened

* Change variable name to more make sense

* Refactoring codes to make functions more readable

* Remove useless condition code

* Remove useless variable and condition
 2018-07-06 11:23:47 -03:00
Anton Georgiev
0722966cba
Merge pull request #5822 from Tainan404/fix-style-toast 
Fix white blocks when hover toast
 2018-07-06 09:32:43 -04:00
Fred Dixon
936d57e233
Update index_html5_vs_flash.html 
Fixed typo
 2018-07-06 08:57:24 -04:00
Tainan Felipe
9756517392 fix white blocks when hover toast 2018-07-06 09:08:50 -03:00
Anton Georgiev
1071bdaabd
Merge pull request #5820 from bigbluebutton/revert-5809-fix-5672 
Revert "Prevent screen from moving while drawing"
 2018-07-05 16:06:17 -04:00
Anton Georgiev
bc410c290c
Revert "Prevent screen from moving while drawing" 2018-07-05 16:05:02 -04:00
Anton Georgiev
e1570d81d4
Merge pull request #5819 from prlanzarin/screenshare-chrome-windows 
Improving WebRTC screenshare quality on chrome + windows
 2018-07-05 15:47:42 -04:00
Anton Georgiev
2939f1f980
Merge pull request #5814 from BobakOftadeh/Phone-Icon-Slashed 
Leave audio icon updated
 2018-07-05 15:33:31 -04:00
prlanzarin
6f01165df5 Added H264 profile preference option to screenshare. Fixes chrome + windows artifacts 2018-07-05 19:23:38 +00:00
Anton Georgiev
e16fb5ce56
Merge pull request #5818 from MaximKhlobystov/disable-chat-push-notif-by-default 
DIsable chat push notifications by default.
 2018-07-05 15:21:42 -04:00
Maxim Khlobystov
f3e8f18a1c DIsabled chat push notifications by default. 2018-07-05 15:04:53 -04:00
Bobak Oftadeh
c4d310c9e7 Font files updated. 2018-07-05 11:36:34 -07:00
Anton Georgiev
7be5b87125
Merge pull request #5809 from oswaldoacauan/fix-5672 
Prevent screen from moving while drawing
 2018-07-04 16:17:48 -04:00
Oswaldo Acauan
3e2008be3e Prevent screen from moving while drawing. Closes #5672 2018-07-04 17:11:04 -03:00
James Jung
09b604f954 tweak user menu to allow all text to be displayed 2018-07-04 14:41:05 -04:00
Anton Georgiev
c1a739a883
Merge pull request #5298 from OZhurbenko/akka-create-default-pods-groupchats 
Added missing messages for presentation pods and group chats
 2018-07-04 14:28:16 -04:00
Maxim Khlobystov
5bdc1bb88c
Merge pull request #5805 from MaximKhlobystov/move-current-user-to-top 
Move current user to the top of the users list.
 2018-07-04 14:11:18 -04:00
Maxim Khlobystov
fefec54832 Typo. 2018-07-04 13:51:59 -04:00
Maxim Khlobystov
0902bb33e6 Cleanup: removed unnecessary condition. 2018-07-04 13:48:58 -04:00
Maxim Khlobystov
6b9159ad28 Used sorting by whether the user is current or not. 2018-07-04 13:27:15 -04:00
Tainan Felipe
957a2ef02c Tiny fixes in chat and notifications (#5807) 
* don't notify old messages when user reload the client

* fix chat height
 2018-07-04 14:12:08 -03:00
Richard Alam
d0a2623a59
Merge pull request #5806 from ritzalam/fix-compile-error-due-to-merge 
Fix compile error
 2018-07-04 11:54:39 -04:00
Richard Alam
020943393e - accidentally deleted when fixing merge conflicts 2018-07-04 08:52:36 -07:00
Maxim Khlobystov
d0ade399ce Modified the userlist sorting order by pushing the current user to the top. 2018-07-04 11:33:54 -04:00
Richard Alam
700c8a84fd
Merge pull request #5801 from ritzalam/end-meeting-when-no-more-auth-users 
End meeting when last authed user left
 2018-07-04 10:10:13 -04:00
Anton Georgiev
fafa6d86d6
Merge pull request #5734 from musickiper/adjust-view-of-mobile-chatList 
Adjust view of mobile user actions list
 2018-07-04 09:47:53 -04:00
Richard Alam
a69029092b
Merge pull request #5802 from riadvice/red5-connection-params-log 
Better params check and logging for RTMP connections
 2018-07-03 17:39:37 -04:00
Ghazi Triki
1d9ef19dd0 Better params check and logging for RTMP connections. 2018-07-03 22:35:33 +01:00
James Jung
7462710905 adjust view of mobile user actions list 2018-07-03 17:03:27 -04:00
Richard Alam
fb234ae882 - end meeting after 2 minutes (configrable) after the last authenticated user leaves 2018-07-03 13:48:57 -07:00
Anton Georgiev
7fce137bf5
Merge pull request #5800 from antobinary/current 
Pull BBB 2.0 into BBB 2.2
 2018-07-03 16:21:08 -04:00
Anton Georgiev
eca2e50e1a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into current 2018-07-03 20:17:42 +00:00
Anton Georgiev
d80f3a579e
Merge pull request #5799 from antobinary/locales-07-03 
Pulled HTML5 locales - July 03, 2018
 2018-07-03 15:26:37 -04:00
Anton Georgiev
576214f465 pull locales July 03, 2018 2018-07-03 19:17:54 +00:00
Anton Georgiev
3414948f0e
Merge pull request #5795 from MaximKhlobystov/mod-only-message 
Moderator only message support.
 2018-07-03 11:48:08 -04:00
Anton Georgiev
4b30bb7a37
Merge pull request #5759 from KDSBrowne/fix-5637 
Prevent settings modal re-opening after dismiss
 2018-07-03 11:45:54 -04:00
Maxim Khlobystov
4a7a3cfcf9 Clearing user system messages when adding a user. 2018-07-03 11:45:44 -04:00
Anton Georgiev
3eeef57944
Merge pull request #5748 from musickiper/adj-chatlist-view-on-iphone-view 
Typing chat on iPhone partially hides the post button
 2018-07-03 11:44:32 -04:00
Maxim Khlobystov
d7b99f5ed4 Cleanup. 2018-07-03 11:37:06 -04:00
Anton Georgiev
cd6417aa33
Merge pull request #5779 from oswaldoacauan/whiteboard-fixes 
Whiteboard fixes and improvements
 2018-07-03 11:33:35 -04:00
Maxim Khlobystov
593a2ab744 Typo. 2018-07-03 11:31:00 -04:00