Commit Graph

23680 Commits

Author SHA1 Message Date
Richard Alam
4e32514e03 Merge branch 'riadvice-akka-transcode-update' 2019-02-09 09:21:46 -08:00
Richard Alam
3941e6bb54 - make executable 2019-02-09 09:21:22 -08:00
Richard Alam
733923de99 Merge branch 'akka-transcode-update' of https://github.com/riadvice/bigbluebutton into riadvice-akka-transcode-update 2019-02-09 09:04:04 -08:00
Richard Alam
3e286f1ed6
Merge pull request #6473 from zhu/patch-3
Fix convert jpg with orientation metadata
2019-02-09 12:03:03 -05:00
Richard Alam
b3e78b89ed Merge branch 'pedrobmarin-authenticate-sfu-pad-connections' 2019-02-09 09:01:12 -08:00
Richard Alam
4c5bd2df7e - set the bbb-web port to 8090 2019-02-09 08:36:27 -08:00
Richard Alam
7c76930feb Merge branch 'authenticate-sfu-pad-connections' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-authenticate-sfu-pad-connections 2019-02-09 08:27:12 -08:00
Richard Alam
bce0b62c11
Merge pull request #6742 from capilkey/2.2-fix-flash-browser-detection
Use bowser for browser detection - 2.2 Edition
2019-02-09 10:07:58 -05:00
Fred Dixon
482cf4463d
Merge pull request #6743 from riadvice/fix-bbb-video-broadcast
Update video-broadcast/build.gradle
2019-02-09 00:12:04 -07:00
Ghazi Triki
5b7acbb050 Update video-broadcast/build.gradle 2019-02-09 08:11:07 +01:00
Chad Pilkey
269cb3d911 [Flash] add the raw UA to the browser_info log 2019-02-08 16:02:57 -08:00
Chad Pilkey
0e7bc8ae93 [Flash] use bowser for browser detection, fix ss browser detection 2019-02-08 14:49:48 -08:00
Anton Georgiev
245eb4ad44
Merge pull request #6687 from KDSBrowne/2.2-fix-SR-duplicate-labels
Prevent SR from repeating button labels twice
2019-02-08 13:11:01 -05:00
Anton Georgiev
4c169e7329
Merge pull request #6720 from vitormateusalmeida/issue-6521
Implement reset zoom
2019-02-08 12:58:22 -05:00
Fred Dixon
bf9850e29d
Merge pull request #6740 from riadvice/remove-tomcat
Update permissions and config file path for the new bbb-web
2019-02-08 10:54:04 -07:00
Ghazi Triki
85bb9b4184 Fix triplicated bbb-web service in bbb-conf 2019-02-08 18:45:39 +01:00
Anton Georgiev
2f843f3cc3
Merge pull request #6727 from vitormateusalmeida/issue-6726
Fix log error when meteor restart
2019-02-08 12:40:02 -05:00
Vitor Mateus
bee218adfb Merge remote-tracking branch 'upstream/master' into issue-6521 2019-02-08 15:23:53 -02:00
Anton Georgiev
205bb63e84
Merge pull request #6654 from vitormateusalmeida/issue-6639
Fix Warning when closing private chat
2019-02-08 12:09:25 -05:00
Ghazi Triki
99aa2b5fcc Use the right bigbluebutton user for recording directories. 2019-02-08 17:53:57 +01:00
Fred Dixon
4baec1290c
Merge pull request #6738 from bigbluebutton/ffdixon-patch-2
Properly update API demos with correct path
2019-02-07 18:40:24 -07:00
Fred Dixon
e7bc3aedae
Properly update API demos with 2019-02-07 18:39:41 -07:00
Fred Dixon
39c4d9522a
Merge pull request #6737 from ffdixon/fix-bbb-conf-15
Added support to start/stop bbb-web
2019-02-07 18:23:49 -07:00
Fred Dixon
f4a0fbdc4e Added support to start/stop bbb-web 2019-02-07 19:23:00 -06:00
Fred Dixon
22a42aa572
Merge pull request #6736 from ffdixon/update-bbb-conf-14
Updated bbb-conf for new bbb-web
2019-02-07 18:11:41 -05:00
Fred Dixon
e2d593dbd5 Updated bbb-conf for new bbb-web 2019-02-07 17:10:55 -06:00
Anton Georgiev
48a951d253
Merge pull request #6660 from KDSBrowne/2.2-accessibility-minor-update
Fix minor accessibility issues
2019-02-07 15:23:39 -05:00
Anton Georgiev
a6d3ab510b
Merge pull request #6728 from pedrobmarin/youtube-url-formats
Matching extra YouTube video IDs from different URL formats
2019-02-07 14:12:34 -05:00
Anton Georgiev
e5df6d9727
Merge pull request #6730 from KDSBrowne/2.2-fullscreen-element-label
Improve the label used by FullscreenButtonComponent
2019-02-07 14:05:50 -05:00
KDSBrowne
2df9f0829d fix existing lint errors 2019-02-07 17:47:28 +00:00
Richard Alam
6413565b05
Merge pull request #6731 from ritzalam/instructions-to-build-new-bbb-web
- update doc to build and run bbb-web during development
2019-02-07 11:07:15 -05:00
Richard Alam
df289e241d - update doc to build and run bbb-web during development 2019-02-07 08:05:50 -08:00
Anton Georgiev
69c70bcff2
Merge pull request #6729 from vitormateusalmeida/issue-6565
Fix error when user is not moderator
2019-02-07 10:46:06 -05:00
Vitor Mateus
7e4eccf5a0 Past Meteor.status to container 2019-02-07 13:34:21 -02:00
Anton Georgiev
7e94f096db
Merge pull request #6618 from Tainan404/issue-6450
Add meeting time remaining notification bar status
2019-02-07 10:20:34 -05:00
Vitor Mateus
879c99be90 Fix error when user is not moderator 2019-02-07 12:01:03 -02:00
Pedro Beschorner Marin
a2146dfa3a Matching extra YouTube video IDs from different URL formats 2019-02-07 11:17:05 -02:00
Vitor Mateus
bc8d021560 Error Fixed 2019-02-07 09:31:15 -02:00
Vitor Mateus
f3440561c2 Code improvement 2019-02-07 09:19:35 -02:00
Vitor Mateus
5679c31193 Fix log error when meteor restart. #6726 2019-02-07 08:56:29 -02:00
KDSBrowne
e172220287 make fullscreen btn label include element name 2019-02-06 21:12:59 +00:00
Anton Georgiev
b126c2b08b
Merge pull request #6637 from BobakOftadeh/add-webcam-flag
Added flag to hide dropdown menu in webcam
2019-02-06 13:41:55 -05:00
KDSBrowne
eb3bf6010e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-accessibility-minor-update 2019-02-06 17:09:47 +00:00
Anton Georgiev
6b1db968d2
Merge pull request #6686 from KDSBrowne/2.2-accessibility-update-02
Improve create breakoutroom modal accessibility
2019-02-06 11:52:43 -05:00
Vitor Mateus
b62f78e9a9 Change locale for zoom in and zoom out labels 2019-02-06 14:51:40 -02:00
Anton Georgiev
8ea5205f7e
Merge pull request #6719 from gustavotrott/safari-audiooutput-list
Show 'Default' in Speakers list when browser is Safari
2019-02-06 11:47:44 -05:00
Vitor Mateus
8a8c5a997b Add locale for reset zoom button 2019-02-06 14:42:12 -02:00
Vitor Mateus
100d9a4825 Refactor variable names 2019-02-06 14:05:24 -02:00
Fred Dixon
a744f7ab1c
Merge pull request #6721 from riadvice/grails-gradle-update
Add settings.gradle for pres-checker project
2019-02-06 10:30:40 -05:00
Ghazi Triki
e30a37db26 Add settings.gradle for pres-checker project. 2019-02-06 16:09:59 +01:00