Commit Graph

24431 Commits

Author SHA1 Message Date
Pedro Beschorner Marin
a8d38fd156 Pulling presentation-close-button upfront 2019-03-20 09:57:54 -03:00
bobakoftadeh
cb6757864c Improved permissions-overlay 2019-03-19 20:59:12 +00:00
Vitor Mateus
7d5e47666c Fix End Meeting errors #7021 2019-03-19 17:06:13 -03:00
Tainan Felipe
770f4d543c Add logger 2019-03-19 16:55:12 -03:00
Pedro Beschorner Marin
b0c3480fb1 Trying to fix fit-to-width 2019-03-19 16:50:08 -03:00
Tainan Felipe
7da092f3bd Remove clear credentials that cause new client subscriptions 2019-03-19 15:48:54 -03:00
Richard Alam
322c909b5c
Merge pull request #7046 from capilkey/2.2-fix-banner
Fix enter API parsing and cleaned up the ChatTab
2019-03-19 14:06:14 -04:00
Diego Benetti
0cda5bf5ad Messages of the locks improved 2019-03-19 14:48:33 -03:00
Chad Pilkey
d3656ef022 clean up of the buttons. simplified and reduced 2019-03-19 10:11:48 -07:00
Diego Benetti
f3b9fe26de Rule to show notification to viewers of webcam, microphone and chatting locks implemented 2019-03-19 11:15:44 -03:00
Joao Siebel
b4e03af60c prevent some unnecessary re-render when processing pages 2019-03-19 09:58:21 -03:00
Joao Siebel
99ae611090 order presentation by upload timestamp. close #6840 2019-03-18 15:13:15 -03:00
Tainan Felipe
2ac89f27f7 Merge branch 'issue-6919' of https://github.com/Tainan404/bigbluebutton into issue-6919 2019-03-18 15:12:44 -03:00
Tainan Felipe
6d730b700a improve code quality 2019-03-18 15:10:27 -03:00
Anton Georgiev
bb5bff6c45
Omit "BigBlueButton" in language file
(keeping it only in the optional Feedback which is disabled by default)
2019-03-18 11:17:16 -04:00
Ghazi Triki
e3d36b4bc6 Fix audio test path using a CDN. 2019-03-18 14:21:57 +01:00
Anton Georgiev
719c3f99d6
Merge pull request #7042 from antobinary/chat-updates
Only process chat msgs when requested from html5
2019-03-18 09:13:54 -04:00
Ghazi Triki
5a06f36009 Removed all content from external origin as the html5client is the consumer not the provider. 2019-03-18 14:12:55 +01:00
Anton Georgiev
c9b6a7c6c1
Update updateVoiceUser.js 2019-03-18 09:12:25 -04:00
Anton Georgiev
49d30e9860
Merge pull request #7064 from Tainan404/issue-4937
Remove old folders references of .gitignore file.
2019-03-18 09:05:28 -04:00
Tainan Felipe
a1b6cc6c3a Remove old folders refereces of .gitignore file 2019-03-18 10:03:36 -03:00
Anton Georgiev
8d6ba4ba2d
Merge pull request #7063 from Tainan404/issue-7026
Fix weird number in breakout user counter
2019-03-18 08:39:14 -04:00
Tainan Felipe
8a10657b83 Fix weird number in breakout user counter 2019-03-18 09:22:25 -03:00
Ghazi Triki
106058e1dd Support loading the HTML5 main JS file and its assets from a CDN. 2019-03-18 09:57:43 +01:00
Fred Dixon
260741d24c
Merge pull request #7052 from ffdixon/fix-bbb-conf-29
Fixed typo in updating settings.yml
2019-03-16 19:19:57 -04:00
Fred Dixon
660376aa03 Fixed typo in updating settings.yml 2019-03-16 18:19:09 -05:00
Richard Alam
90641d5280 Merge branch 'ritzalam-track-user-register-join' 2019-03-16 09:37:12 -07:00
Richard Alam
1e26e8ce29 Merge branch 'track-user-register-join' of https://github.com/ritzalam/bigbluebutton into ritzalam-track-user-register-join 2019-03-16 09:32:55 -07:00
Richard Alam
53d990c9d2 Merge branch 'riadvice-bbb-conf-clean' 2019-03-16 09:01:14 -07:00
Richard Alam
42982482d8 - fix typo 2019-03-16 08:54:06 -07:00
Richard Alam
b41d25d847 Merge branch 'bbb-conf-clean' of https://github.com/riadvice/bigbluebutton into riadvice-bbb-conf-clean 2019-03-16 08:07:36 -07:00
Richard Alam
059ab329d1 Merge branch 'riadvice-flash-deprecation' 2019-03-16 08:02:50 -07:00
Richard Alam
3cda13b145 Merge branch 'flash-deprecation' of https://github.com/riadvice/bigbluebutton into riadvice-flash-deprecation 2019-03-16 07:54:16 -07:00
Fred Dixon
da1c5e4e56
Merge pull request #7047 from ffdixon/fix-bbb-conf-32
Fix bbb conf 32
2019-03-15 19:47:51 -04:00
Fred Dixon
b34ca1d8b8 update public.note.url on bbb-conf --setip 2019-03-15 18:46:46 -05:00
Fred Dixon
2335c1d8a5 Added more checks to sip.nginx 2019-03-15 18:32:06 -05:00
Fred Dixon
395f5787de Need to specify proper path to apply-lib.sh 2019-03-15 18:29:30 -05:00
Fred Dixon
3bec6a2702
Merge pull request #7023 from riadvice/bbb-conf-update
Refactoring to bbb-conf shell script application for 2.2
2019-03-15 18:59:38 -04:00
Chad Pilkey
5507af57d1 remove unneeded whitespace in ChatTab 2019-03-15 14:08:01 -07:00
Chad Pilkey
b022318464 fix enter response parsing 2019-03-15 14:06:35 -07:00
Tainan Felipe
e7a6639909
Merge branch 'master' into issue-6919 2019-03-15 17:10:14 -03:00
Tainan Felipe
57603084d4 Add banner bar for custom parameters 2019-03-15 17:07:14 -03:00
Vitor Mateus
1e520258c9 Clean up 2019-03-15 17:02:02 -03:00
Vitor Mateus
d5a70fd684 Fix end meeting console error 2019-03-15 15:58:54 -03:00
Anton Georgiev
d8c55bb603 only process chat msgs when requested from html5 2019-03-15 18:39:48 +00:00
Calvin Walton
581dd58596
Merge pull request #7041 from capilkey/2.2-flash-cache-busting
Add cache busting to JS files that were missing it
2019-03-15 13:54:09 -04:00
Chad Pilkey
931bd35430 add cache busting to js files that were missing it 2019-03-15 10:34:16 -07:00
KDSBrowne
a24b2567fb Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-Imp-poll-result 2019-03-15 16:09:12 +00:00
Anton Georgiev
23a3deee34
Merge pull request #7035 from KDSBrowne/2-2.add-youtube-note
Add message to share YouTube modal
2019-03-15 09:58:43 -04:00
KDSBrowne
04c11ad26d fix for issue #7033 2019-03-15 13:04:19 +00:00