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

25180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
e409190114 - convert tabs to spaces 2019-07-10 13:09:38 -07:00
Richard Alam
d30a413e40 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into keep-events-for-non-recorded-meeting 2019-07-05 09:14:32 -07:00
Richard Alam
ec1343931c - add comments to explain how rap-archive-worker and rap-events-worker work together 2019-07-05 08:57:51 -07:00
Richard Alam
40c6dd8827 - run post events scripts 2019-07-05 08:57:22 -07:00
Anton Georgiev
91f10e4f9b
Merge pull request #7733 from antobinary/pull-locales 
Align You are disconnected label to the left; tweak label text
 2019-07-05 11:38:54 -04:00
Anton Georgiev
cd2caf8175
Merge branch 'master' into pull-locales 2019-07-05 11:36:16 -04:00
Anton Georgiev
b496a7d39b align You are disconnected label to the left 2019-07-05 15:29:45 +00:00
Anton Georgiev
249e5b2c47
Fix typo in html5 en.json 2019-07-05 11:20:38 -04:00
Anton Georgiev
1ff3443542
Merge pull request #7731 from antobinary/pull-locales 
Handle default value for isBreakoutUser property for dummy users
 2019-07-04 18:02:26 -04:00
Anton Georgiev
aaf9810589 handle default value for isBreakoutUser property for dummy users 2019-07-04 21:58:30 +00:00
Anton Georgiev
f96ae6033a
Merge pull request #7692 from KDSBrowne/issue-7137 
Fix blue screen after selecting share webcam (Chrome iOS)
 2019-07-04 16:18:16 -04:00
Anton Georgiev
86d33bbc1c
Merge pull request #7712 from MaximKhlobystov/user-ejection-permission-error 
Prevent user from being ejected when confirming start/stop recording or end meeting after losing moderator role
 2019-07-04 15:29:02 -04:00
Anton Georgiev
8e9cf43f71
Merge pull request #7730 from antobinary/pull-locales 
Pulled html5 locales Jul 4, 2019
 2019-07-04 15:27:36 -04:00
Anton Georgiev
d9ccd4131f pulled html5 locales Jul 4, 2019 2019-07-04 19:25:43 +00:00
Maxim Khlobystov
5f6a1c3a08 Add additional checks to verify that the user exists + Small cleanup 2019-07-04 15:25:25 -04:00
Anton Georgiev
14162aef96
Merge pull request #7691 from diegobenetti/issue7671-take-ownership-button 
Implements tooltip and label to the button to take over the captions
 2019-07-04 15:07:08 -04:00
Anton Georgiev
f095f04fd3
Merge pull request #7702 from capilkey/fix-user-roles 
Clean up user roles
 2019-07-04 14:57:19 -04:00
Anton Georgiev
1622b4ad53
Merge pull request #7583 from jfsiebel/reconnection-improvement 
Improve client reconnection
 2019-07-04 14:53:35 -04:00
Anton Georgiev
c14e6074d9
Merge pull request #7708 from Tainan404/fix-user-leaving 
Add ping-pong message to html5 client
 2019-07-04 14:41:59 -04:00
KDSBrowne
392aac9857 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into issue-7137 2019-07-04 18:37:40 +00:00
Joao Siebel
18670fdaf2 Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-07-04 15:09:06 -03:00
Richard Alam
61d9223a70 - format spaces to tabs 2019-07-04 11:07:57 -07:00
Anton Georgiev
595d46f9e2
Merge pull request #7727 from KDSBrowne/issue-7725 
Fix cannot read property 'focus' of null
 2019-07-04 14:02:22 -04:00
Richard Alam
82bd5e4a6f - run keep-events worker separate from archive-worker 2019-07-04 11:00:59 -07:00
KDSBrowne
7cc2f551b6 add parentheses to equation 2019-07-04 17:58:38 +00:00
KDSBrowne
2d3f43edf9 use calculation to find max z-index 2019-07-04 17:54:20 +00:00
KDSBrowne
2bf92f921b move comment 2019-07-04 17:48:13 +00:00
KDSBrowne
cd9e89ca88 fix Cannot read property 'focus' of null / lint issues 2019-07-04 17:35:32 +00:00
Paulo Lanzarin
918f23777b
Merge pull request #7726 from bigbluebutton/antobinary-userAgent 
Avoid re-defining userAgent in kurento-utils.js
 2019-07-04 13:13:35 -04:00
Anton Georgiev
02a09b9f1f
Avoid re-defining userAgent in kurento-utils.js 
Addresses the error seen in
`"stackTrace":"TypeError: can't redefine non-configurable property \"userAgent\""`

Note, there are still definitions of `ua` in the code so ideally we need to extract this out.
 2019-07-04 12:53:40 -04:00
Anton Georgiev
49add06af9
Merge pull request #7719 from Tainan404/issue-7714 
Add lock verification for users actions
 2019-07-04 10:27:15 -04:00
Tainan Felipe
00e4358a48 Pass lock verification to component 2019-07-03 15:40:07 -03:00
Maxim Khlobystov
e7d7094d4c Move the moderator checks for toggleRecording and endMeeting from client side to server side 2019-07-03 14:10:28 -04:00
Tainan Felipe
dbd0efebc3 Add lock verification for users actions 2019-07-03 11:18:46 -03:00
Anton Georgiev
1d0807b5de
Merge pull request #7713 from antobinary/logging-structure 
Prepend sessionToken to uniqueClientSession
 2019-07-02 17:18:12 -04:00
Anton Georgiev
15a834f4b8 prepend sessionToken to uniqueClientSession 2019-07-02 21:15:32 +00:00
Anton Georgiev
ed264351d0
Merge pull request #7709 from antobinary/logging-structure 
Logging structure - add extraInfo: {}
 2019-07-02 17:08:48 -04:00
Maxim Khlobystov
b01c0485ef Make sure only moderators can do Meteor.call to end meeting when confirming in the modal 2019-07-02 16:51:41 -04:00
Maxim Khlobystov
61aa1f6d7b Make sure only moderators can do Meteor.call to toggle recordings when confirming the toggle in the modal 2019-07-02 16:50:42 -04:00
Anton Georgiev
612aca99e6 sipjs logCode-s preserve inconsistencies 2019-07-02 20:50:25 +00:00
Anton Georgiev
b71bd48490 remove redundant audio log 2019-07-02 20:11:48 +00:00
Anton Georgiev
25ac147924
Merge pull request #7710 from KDSBrowne/issue-7705 
Add enabled poll property in settings.yml
 2019-07-02 16:04:42 -04:00
Anton Georgiev
004547f681 prepend sip.js logCode-s 2019-07-02 19:56:25 +00:00
Anton Georgiev
86a178fbf6 video-provider logger with extraInfo 2019-07-02 19:51:35 +00:00
KDSBrowne
c580ef3199 fix visible take presenter option for current presenter 2019-07-02 18:03:33 +00:00
Tainan Felipe
1819911054 Merge branch 'fix-user-leaving' of https://github.com/Tainan404/bigbluebutton into fix-user-leaving 2019-07-02 14:34:18 -03:00
Tainan Felipe
a6cc0286d0 Fix comparasion code 2019-07-02 14:32:16 -03:00
Anton Georgiev
b74d3d9bb0 correct logger.warning to .warn 2019-07-02 16:54:10 +00:00
Anton Georgiev
fb1c294312 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into logging-structure 2019-07-02 15:41:57 +00:00
KDSBrowne
ba9c9c431a add enabled poll prop in settings.yml 2019-07-02 14:54:37 +00:00