BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,484 Commits 13 Branches 260 Tags 1.1 GiB
2faa49d8f0
Commit Graph

22484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maxim Khlobystov
89725fa461
Merge pull request #5905 from Tainan404/v2-fix-intl 
Fix intl id being showing.
 2018-07-24 14:03:13 -04:00
Richard Alam
16072ef9b2 - add back es_LA locale 2018-07-24 11:00:25 -07:00
Anton Georgiev
e4edb9f196
Merge pull request #5894 from prlanzarin/sfu-error-handling-3 
SFU error handling part 3
 2018-07-24 13:45:08 -04:00
Anton Georgiev
682f753432
Merge pull request #5890 from BobakOftadeh/screenshare-button-moved 
Desktop share button moved to the action bar component
 2018-07-24 13:41:58 -04:00
Calvin Walton
5f3b09e83d Merge branch 'revert-mconf-branding' into v2.2-dev 2018-07-24 13:19:54 -04:00
Calvin Walton
42cdf2e0dc Merge branch 'revert-mconf-branding' into v2.0.x-release 2018-07-24 13:18:53 -04:00
Calvin Walton
66ce4cde02 Revert copyright info in recording to say BigBlueButton 2018-07-24 13:18:18 -04:00
Bobak Oftadeh
95e62b42e6 Moved screen share check to a variable 2018-07-24 09:46:30 -07:00
Richard Alam
ba22c1bb28
Merge pull request #5908 from ritzalam/update-locales-jul-24-2018 
- updating locales
 2018-07-24 10:46:14 -04:00
Richard Alam
324aa8bc12 - updating locales 2018-07-24 07:37:02 -07:00
Calvin Walton
c43863eff6 Merge branch 'playback-async-requests' of https://github.com/fcecagno/bigbluebutton into v2.2-dev 2018-07-24 09:56:50 -04:00
Calvin Walton
62a37adb23 Merge branch 'playback-async-requests' of https://github.com/fcecagno/bigbluebutton into v2.0.x-release 2018-07-24 09:56:13 -04:00
Anton Georgiev
cf98f09027
Merge pull request #5901 from KDSBrowne/01-bug-fixes 
Fix upload modal and cam unshare bug
 2018-07-24 09:30:44 -04:00
Ghazi Triki
853f30a80e Clean bbb-conf from unused variables. 2018-07-24 10:35:48 +01:00
James Jung
204921e043 Make code more readable, and make clicking the mouse right button not to draw annotation 
Seperate the function 'contextMenuHandler' of drawing listeners into the service for reusability

Call the 'UndoAnnotation' method from Whiteboard-toolbar's service to use inside Whiteboard-overlay's draw listeners,
rather than initializing the same method inside Whiteboard-overlay's service to use

Make drawing annotations using the mouse right button inactive
 2018-07-23 17:25:06 -04:00
Anton Georgiev
3265b199b0
Merge pull request #5906 from Tainan404/issue-5904 
Fix audio lock setting not applied.
 2018-07-23 14:58:57 -04:00
Tainan Felipe
3cd9f1f381 Fix audio lock setting not applied 2018-07-23 15:54:49 -03:00
Anton Georgiev
ddbb2a64dc Merge branch 'custom-parameters' of github.com:lfzawacki/bigbluebutton into test-5822 2018-07-23 18:33:32 +00:00
prlanzarin
fd1c41ba94 Fixed handling of media server going offline on ongoing session 2018-07-23 17:46:04 +00:00
Anton Georgiev
7299f0d049
Merge pull request #5903 from BobakOftadeh/client-logger-settings 
Added client-logger settings to production
 2018-07-23 13:39:40 -04:00
Tainan Felipe
1c04aacb24 fix intl showing intl ids 2018-07-23 13:46:53 -03:00
Bobak Oftadeh
b4022f40af Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into client-logger 2018-07-23 09:16:52 -07:00
Bobak Oftadeh
c3172a7691 The client logger can now be configured on the production settings 2018-07-23 09:15:50 -07:00
KDSBrowne
37c9599a70 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into 01-bug-fixes 2018-07-23 15:37:28 +00:00
Anton Georgiev
3da9721e77
Merge pull request #5902 from antobinary/adjust-5808 
Remove redundant import causing HTML5 app to fail starting
 2018-07-23 11:13:02 -04:00
Anton Georgiev
8b0ec94405 remove duplicate import causing app to crash 2018-07-23 15:06:25 +00:00
Anton Georgiev
cbb4bbc2fc
Fixed missed unmerged code from #5808 2018-07-23 10:40:54 -04:00
Anton Georgiev
5dc3fe82c2
Merge branch 'v2.0.x-release' into custom-parameters 2018-07-23 10:29:29 -04:00
Anton Georgiev
084412c95c
Merge pull request #5808 from BobakOftadeh/client-logger 
Client Logger Implemented
 2018-07-23 10:11:16 -04:00
KDSBrowne
1f7ff24b63 add return to prevent cam unsharing on first route change 2018-07-22 17:45:33 +00:00
KDSBrowne
c502027427 use withModalMounter to prevent the modal re-opening 2018-07-22 17:45:14 +00:00
Ghazi Triki
d65eb30fed Improve RTL styles init. 2018-07-22 15:17:03 +01:00
Ghazi Triki
7f96487eba Improve RTL layout behaviour and fix its display. 2018-07-22 14:45:18 +01:00
Fred Dixon
f536467879
Merge pull request #5896 from riadvice/pen-muw 
Fix pen only multi-user whiteboard  and make it work for late joiners
 2018-07-22 06:53:21 -06:00
Ghazi Triki
199558b6b9 Fix pen only multi-user whiteboard and make it work for late joiners. 2018-07-21 18:21:19 +01:00
Chad Pilkey
3fe94acfa9
Merge pull request #5895 from capilkey/assertive-wb-clear 
More assertive annotation and cursor clearing
 2018-07-20 17:34:23 -04:00
Chad Pilkey
6ac17bd220 more assertive annotation and cursor clearing 2018-07-20 14:28:06 -07:00
James Jung
df17e36462 Change the functionality for discard current annottation via right-click, based on its purpose 
The annotaion can be discarded using the mouse right button, only when it is being drawn
 2018-07-20 16:17:41 -04:00
prlanzarin
727e6b3fc5 Removed trailing comma from locale 2018-07-20 20:16:04 +00:00
James Jung
cf96835280 Change the functionality for discard current annottation via right-click, based on its purpose 
The annotaion can be discarded using the mouse right button, only when it is being drawn
 2018-07-20 16:05:24 -04:00
Richard Alam
cd32391976
Merge pull request #5887 from kepstin/turn-stun-fix 
Fix comments in turn-stun-servers.xml (v2.0.x-release)
 2018-07-20 15:39:45 -04:00
Richard Alam
aef2fe577d
Merge pull request #5889 from kepstin/turn-stun-fix 
Fix comments in turn-stun-servers.xml (v2.2-dev)
 2018-07-20 15:39:17 -04:00
Richard Alam
56f1dea33c
Merge pull request #5893 from ritzalam/log-webrtc-screenshare-start-stop 
- log start/stop rtmp stream when sharing screen using webrtc
 2018-07-20 15:38:39 -04:00
Richard Alam
3c5015d6d0
Merge pull request #5888 from ritzalam/recording-timer-updates 
- send only recording timer updates to clients when the meeting is r…
 2018-07-20 15:38:25 -04:00
Richard Alam
a58e4ed44d
Merge pull request #5886 from riadvice/pdf-export-improve 
Fix multi-line PDF text export
 2018-07-20 15:38:05 -04:00
Richard Alam
023c2354ee - log start/stop rtmp stream when sharing screen using webrtc 2018-07-20 12:36:15 -07:00
prlanzarin
75f70ad06c Added SFU error handling in video-provider component with localized messages 2018-07-20 19:34:50 +00:00
Bobak Oftadeh
e1fbc5059b Desktop share button moved to the action bar component 2018-07-20 10:07:10 -07:00
Bobak Oftadeh
0db93d35b9 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into client-logger 2018-07-20 09:42:11 -07:00
James Jung
03cabb7c80 Change the 'contentMenuHandler' method of every whiteboard-draw-listener component to static 
This is for preventing Lint shows the error which a class method is implemented without using 'this' inside
 2018-07-20 12:05:06 -04:00