BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,424 Commits 13 Branches 260 Tags 1.1 GiB
7dfe3f3093
Commit Graph

20424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
09cf94cb8a - simplify check 2018-02-07 13:57:22 -08:00
Chad Pilkey
d0bc56972c [AIR] reset new messages when viewing chat and scroll to bottom 2018-02-07 16:45:38 -05:00
Richard Alam
72a310ecaf
Merge pull request #5112 from ritzalam/disable-broadcast-layout 
- hide broadcast layout button for viewers
 2018-02-07 16:43:25 -05:00
Richard Alam
c67cb19dd4 - exclude pencil draw update and end status from being dropped by rights management so that pencil lines will smooth out 2018-02-07 13:39:24 -08:00
Richard Alam
34bc824472 - hide broadcast layout button for viewers 2018-02-07 12:36:12 -08:00
Richard Alam
8a1a1fc3ce - clean up formatting 2018-02-07 12:34:39 -08:00
Richard Alam
d2fd54e6e9 - drop whiteboard and cursor messages instead of enforcing rights management 2018-02-07 11:31:36 -08:00
Richard Alam
7f9d5c8585
Merge pull request #5109 from ritzalam/prevent-duplicate-wav-files 
Prevent duplicate wav files
 2018-02-07 10:35:18 -05:00
Richard Alam
47147056c4 - handle properly out of order recording started/stopped events from freeswitch 2018-02-07 07:30:33 -08:00
Chad Pilkey
cb59793703 [AIR] reposition chat send button 2018-02-06 18:52:33 -05:00
Chad Pilkey
9f7887e687 [AIR] add welcome and clear messages 2018-02-06 18:22:14 -05:00
Fred Dixon
00d0242111
Merge pull request #5105 from ffdixon/update-bbb-conf-2 
Fix updating of config.xml
 2018-02-06 17:35:06 -05:00
Fred Dixon
4b0e804dd6 Fix updating of config.xml 2018-02-06 16:34:23 -06:00
Richard Alam
4375ff1b37 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-group-chat 2018-02-06 10:50:33 -08:00
Richard Alam
02a3586d9e
Merge pull request #5095 from ritzalam/fix-group-chat 
Fix group chat
 2018-02-06 11:52:31 -05:00
Richard Alam
916baa4597 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-group-chat 2018-02-06 07:31:35 -08:00
Richard Alam
2fa91e3308 - silence log 2018-02-05 17:30:51 -08:00
Fred Dixon
799d17c7cf
Merge pull request #5098 from capilkey/update-air-2.1 
First pass at chat in the AIR client for 2.1
 2018-02-05 20:22:15 -05:00
Chad Pilkey
32df263d18 first pass at updating chat in AIR client for 2.1 2018-02-05 19:27:44 -05:00
Richard Alam
96a77ef9c6 - remove trace logs 2018-02-05 11:08:56 -08:00
Richard Alam
8188dff9dc - fix double welcome messages 2018-02-05 08:47:41 -08:00
Richard Alam
b91f2abde5 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-02-01 12:50:43 -08:00
Richard Alam
784d5cb6d9
Merge pull request #5080 from ritzalam/logos-folder 
- put logos into its own directory
 2018-02-01 11:49:16 -05:00
Richard Alam
5a5232d43d - put logos into its own directory 2018-02-01 08:47:36 -08:00
Richard Alam
1b8d0a06c1 Merge branch 'riadvice-moderator-message-ui' into v2.0.x-release 2018-02-01 08:26:28 -08:00
Richard Alam
6f7669c390 Merge branch 'moderator-message-ui' of https://github.com/riadvice/bigbluebutton into riadvice-moderator-message-ui 2018-02-01 08:26:15 -08:00
Richard Alam
9e62dfb979 Merge branch 'riadvice-2.0-updates' into v2.0.x-release 2018-02-01 08:00:21 -08:00
Richard Alam
d58f1ec5e7 Merge branch '2.0-updates' of https://github.com/riadvice/bigbluebutton into riadvice-2.0-updates 2018-02-01 07:40:27 -08:00
Fred Dixon
feff36a352
Merge pull request #5076 from riadvice/remove-spark 
Replace remnant spark labels by mx label and text
 2018-02-01 09:03:29 -05:00
Fred Dixon
4d9138300a
Merge pull request #5075 from riadvice/2.0-ui-fixes 
Show "Viewers Locked" when webcamsOnlyForModerator is on
 2018-02-01 09:03:07 -05:00
Ghazi Triki
26aa84c4cc Replace remnant spark labels by mx label and text. 2018-02-01 11:17:34 +01:00
Ghazi Triki
47cd5309b0 Show "Viewers Locked" when webcamsOnlyForModerator is on. 2018-02-01 10:26:09 +01:00
Fred Dixon
c0f0303051
Merge pull request #4027 from hakaz/patch-1 
Issue #3985: bbb-conf --debug incorrectly flags
 2018-01-31 20:08:08 -05:00
Fred Dixon
7617828770
Merge pull request #5064 from riadvice/microphone-highlight 
Highlight microphone icon in users list when microphone is locked
 2018-01-31 20:03:53 -05:00
Richard Alam
e34fa44ad3
Merge pull request #5072 from ritzalam/merge-20-with-master 
Merge 20 with master
 2018-01-31 17:49:32 -05:00
Richard Alam
06faa8a448 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-31 14:38:43 -08:00
Fred Dixon
af9d70896e
Merge pull request #5071 from ffdixon/fix-bbb-conf-4 
Fix bbb-conf to correctly use rtmp[s] with porttest
 2018-01-31 17:37:48 -05:00
Fred Dixon
1a6b5b1aac Fix bbb-conf to correctly use rtmp[s] with porttest 2018-01-31 16:36:48 -06:00
Richard Alam
40b3c6aff8
Merge pull request #5069 from ritzalam/backport-rtmps-support-to-2.0 
Backport rtmps support to 2.0
 2018-01-31 16:43:36 -05:00
Chad Pilkey
3c89514905 [AIR] fix potential exception with the annotations 2018-01-31 16:39:48 -05:00
Chad Pilkey
846eca5f41 [AIR] disable video connection temporarily to avoid connection failure 2018-01-31 16:39:22 -05:00
Chad Pilkey
bc6840dd8c [AIR] fixes for UserDetailsView to avoid exception 2018-01-31 16:38:44 -05:00
Ghazi Triki
e407060486 Fully rely on binding to display chat messages. 2018-01-31 21:40:18 +01:00
Richard Alam
bdf6f6c953 - new signed screenshare jar 2018-01-31 10:32:18 -08:00
Richard Alam
6485110a72 - clean up logging 2018-01-31 08:38:54 -08:00
Anton Georgiev
528f94b15a
Merge pull request #5062 from antobinary/html5-daily-log-rotation-2 
Added daily log rotation in production env
 2018-01-31 11:11:58 -05:00
Richard Alam
c4085c4482 - use proper video context url 2018-01-30 13:17:23 -08:00
Richard Alam
0bc3a06837 - backpot rtmp support 2018-01-30 12:54:20 -08:00
Anton Georgiev
f789842ccb
Merge pull request #5009 from KDSBrowne/z.0.6-prevent-ghost-user 
Prevent kicked user's ability to rejoin meeting via back btn
 2018-01-30 15:10:46 -05:00
Anton Georgiev
ef9c21cadf
Merge pull request #5053 from prlanzarin/sfu-logging 
Added better logging capabilities to bbb-webrtc-sfu
 2018-01-30 15:01:59 -05:00