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

22455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhu
39adce2321
Fix compatibility in some old browser 
Trailing comma in function arguments does not allowed until ECMAScript 2017
 2018-09-28 18:30:50 +08:00
Anton Georgiev
c59e789ac4
Merge pull request #6114 from Tainan404/change-overlay-color 
Change modal overlay color for client consistency.
 2018-09-25 16:48:11 -04:00
Tainan Felipe
33655682f0 change modal overlay color for client consistency 2018-09-25 17:29:54 -03:00
Richard Alam
6c7fb11304
Merge pull request #6095 from jfederico/v2.2-dev 
Fix meeting tag in recordings migrated from BBB 1.0 and before (fixed #6089)
 2018-09-25 16:20:45 -04:00
Jesus Federico
35b2806b33
Merge pull request #5473 from mesutaydemir/patch-2 
suggested solution timestamp issue for student role lti integration w…
 2018-09-25 16:17:45 -04:00
Anton Georgiev
76180a0580
Merge pull request #6076 from jfsiebel/custom-user-settings 
Custom user settings
 2018-09-25 08:29:48 -04:00
Richard Alam
a30f1842ae
Merge pull request #6100 from kepstin/bbb-20-rec-fixes 
Recording fixes for BBB 2.2
 2018-09-21 14:38:40 -04:00
Calvin Walton
7a64756bba RaP: When generating poll image, grab the presentation name correctly. 
It was previously trying to get the presentation name from the wrong variable,
which resulted in a nil value (which was treated as a blank string in
filenames). This caused the poll images to not be inside the presentation
subdirectories, and the poll image references in the svg contained a `//`
path, which would break the recording if it was uploaded to e.g. AWS S3.
 2018-09-21 14:28:24 -04:00
Richard Alam
75a161adbf
Merge pull request #5207 from riadvice/mobile-no-force-debug 
Remove force debug in LoadingScreenMediator
 2018-09-21 11:36:21 -04:00
jfederico
b9f52a2438 Script for fixing meeting tag in recordings migrated from BBB 1.0 and before 2018-09-20 14:23:29 +00:00
João Francisco Siebel
b832921be2 fix settings list 2018-09-19 17:34:23 -03:00
João Francisco Siebel
bb58a3fde6 let server handle parameters 2018-09-19 17:32:17 -03:00
Anton Georgiev
8c0394f52e
Merge pull request #6085 from oswaldoacauan/fix-missing-stuff-on-meeting-removal 
Fix not clearing pods and token when removing a meeting
 2018-09-19 14:45:02 -04:00
Anton Georgiev
7ca66965da
Merge pull request #6086 from oswaldoacauan/fix-6012 
Fix fuzzy chat font rendering.
 2018-09-19 14:40:32 -04:00
Anton Georgiev
8df901e0bf
Merge pull request #6087 from Tainan404/zoom-implementation 
Zoom call only for presenter
 2018-09-19 14:15:41 -04:00
Tainan Felipe
61c4c62e54 Zoom call only for presenter 2018-09-19 15:13:09 -03:00
Oswaldo Acauan
750f1bc35a Fix fuzzy chat font rendering. Closes #6012 2018-09-19 14:57:39 -03:00
Oswaldo Acauan
1c12b380a2 Fix not clearing pods and token when removing a meeting 2018-09-19 14:48:15 -03:00
Anton Georgiev
fd02b04a2d
Merge pull request #6025 from BobakOftadeh/chat-width-increased-window 
Extended the Width of the Chat Area
 2018-09-19 13:05:06 -04:00
Bobak Oftadeh
121e47982f Changed chat-width from pixel to precent. 2018-09-19 08:21:14 -07:00
Anton Georgiev
eb275cfc93
Merge pull request #6084 from Tainan404/zoom-implementation 
Add hand in setting prod
 2018-09-19 11:04:43 -04:00
Tainan Felipe
3bfce89396 change the setting prod 2018-09-19 12:00:49 -03:00
Anton Georgiev
8e81fc46af
Merge pull request #6010 from Tainan404/zoom-implementation 
Zoom implementation for HTML5
 2018-09-19 10:11:34 -04:00
Tainan Felipe
7d202ada62 Remove comment 2018-09-19 09:55:47 -03:00
Tainan Felipe
24e0fc55cd Remove unused code 2018-09-19 09:09:45 -03:00
Tainan Felipe
2d045b415c Put the hand by default in mobile 2018-09-18 11:16:11 -03:00
Tainan Felipe
210dbbbeaf Merge remote-tracking branch 'upstream/master' into zoom-implementation 2018-09-17 15:20:20 -03:00
Tainan Felipe
ab75ffdddd Add pinch and double-tap zoom 2018-09-17 15:02:52 -03:00
João Francisco Siebel
e750ceb0a1 make a single makeCall in auth 2018-09-17 14:05:39 -03:00
João Francisco Siebel
ebe4b83a10 remove unnecessary comments 2018-09-14 15:01:24 -03:00
João Francisco Siebel
ebad6cf6a4 remove debug 2018-09-14 14:53:29 -03:00
Richard Alam
3a8e4c8f5c
Merge pull request #6075 from ritzalam/update-akka-transcode-build 
- try fixing this error
 2018-09-13 18:22:03 -04:00
Richard Alam
abf7bfb417 - try fixing this error 
/mnt/tmp/bbb-transcode-akka_2.2.0_xenial_m22/build.sbt:134: error: object ServerLoader is not a member of package com.typesafe.sbt.packager.archetypes
serverLoading in Debian := com.typesafe.sbt.packager.archetypes.ServerLoader.Systemd
 2018-09-13 15:19:27 -07:00
Richard Alam
bdbd423e7f
Merge pull request #6074 from ritzalam/update-akka-transcode-build 
- fix akka-transcode build failing on scalariform
 2018-09-13 17:46:42 -04:00
Richard Alam
d1553df373 - fix akka-transcode build failing on scalariform 2018-09-13 14:44:40 -07:00
Calvin Walton
c6674833c7 RaP: Have <p> in presentation format inherit font size 
This fixes font scaling in the presentation area, since that relied on
the <p> element inheriting the font size from the svg <g> that it was
inside of.

This was broken with the switch to the Foundation stylesheet base, which
set a fixed font size on the <p> element.
 2018-09-13 17:22:25 -04:00
Richard Alam
499d56975f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2018-09-13 13:11:25 -07:00
Richard Alam
f39f812a0d Merge branch 'riadvice-jvm-quality-improve' 2018-09-13 13:10:55 -07:00
Richard Alam
cc6f88d020 - my IntelliJ IDE seems to format differently with Ghazi's 
- fix screenshare redis connection error
 - fix bbb-web create meeting exception when second user joins
 2018-09-13 13:08:49 -07:00
Anton Georgiev
f2092114e0
Merge pull request #6061 from BobakOftadeh/Userlist-spacing 
Fixed locked user to have the same height as a default user
 2018-09-13 15:25:06 -04:00
Anton Georgiev
2e2208ef6f
Merge pull request #6060 from oswaldoacauan/upload-token 
Adjust the presentation upload to use the security token introduced in 2.1
 2018-09-13 15:18:27 -04:00
João Francisco Siebel
4c35608c2b Add users-settings collection and handle dynamic configuration 2018-09-13 15:09:30 -03:00
Ghazi Triki
845ffc8343 Merge remote-tracking branch 'bigbluebutton/master' into mobile-no-force-debug 
# Conflicts:
#	clients/flash/air-client/src/org/bigbluebutton/air/main/views/LoadingScreenMediator.as
 2018-09-13 09:25:40 +01:00
Ghazi Triki
83025a9d5e Merge remote-tracking branch 'bigbluebutton/master' into jvm-quality-improve 
# Conflicts:
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
 2018-09-12 18:49:25 +01:00
Richard Alam
cdaf447758
Merge pull request #5975 from riadvice/user-typing-feature 
Implementation of user typing feature to chat
 2018-09-12 13:43:43 -04:00
Tainan Felipe
43c45c71db Merge branch 'master' into zoom-implementation 2018-09-12 13:47:39 -03:00
Richard Alam
408a780cb3
Merge pull request #5965 from riadvice/rtl-minor-improve 
Update help button icon for RLT layout
 2018-09-12 12:19:38 -04:00
Richard Alam
c3494ee55d
Merge pull request #5849 from riadvice/v2.0.x-code-cleanup 
Clean unused parameters in ApiController.groovy
 2018-09-12 12:13:29 -04:00
Richard Alam
dca7364d77
Merge pull request #5681 from riadvice/ios-h264 
Display h264 video webcam stream for the iOS mobile client
 2018-09-12 12:05:11 -04:00
Richard Alam
5b03e0ef6c
Merge pull request #5581 from riadvice/recording-timer 
Add a new message RecordStatusResetSysMsg to be handled and saved in events.xml
 2018-09-12 12:03:09 -04:00