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

22423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Tainan Felipe
0372f736fc Add Double tap zoom and pan navigation 2018-09-12 11:36:04 -03:00
Bobak Oftadeh
5c3f6202b3 Fixed locked user to have the same height as a default user 2018-09-11 13:42:36 -07:00
Oswaldo Acauan
88f7d6d7dd Merge remote-tracking branch 'upstream/master' into upload-token 2018-09-11 16:17:38 -03:00
Oswaldo Acauan
5c9518bd27 Adjust the presentation upload to use the security token introduced in 2.1. Closes #4948 2018-09-11 16:00:49 -03:00
Ghazi Triki
c44e5aebb8 Merge remote-tracking branch 'bigbluebutton/master' into v2.0.x-code-cleanup 
# Conflicts:
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2018-09-11 18:07:07 +01:00
Richard Alam
45cd830f96
Merge pull request #6056 from riadvice/big-image-conversion 
Down-scale image sized over 2MB
 2018-09-11 11:24:49 -04:00
Ghazi Triki
b6055c70d8 More logging for document conversion error. 2018-09-11 15:55:46 +01:00
Ghazi Triki
dbf85bb597 Remove dev debug. 2018-09-11 12:54:37 +01:00
Ghazi Triki
b6a5e75459 Down-scale image sized over 2MB. 2018-09-11 12:51:03 +01:00
Anton Georgiev
35c0a12373
Merge pull request #6055 from bigbluebutton/v2.0.x-release 
Pull V2.0.x release into 2.2 (master) to propagate 2.0 fixes
 2018-09-10 15:09:55 -04:00
Anton Georgiev
cae1cc2190
Merge pull request #6052 from BobakOftadeh/publish-fix 
Only propagate necessary information to client
 2018-09-10 15:00:54 -04:00
Anton Georgiev
358fdd57bf
Merge pull request #6054 from antobinary/locales-2018-09-10 
HTML5 client -- pulled latest language files 2018-09-10
 2018-09-10 14:52:36 -04:00
Anton Georgiev
7e4f4d9eaa html5-locales-2018-09-10 2018-09-10 18:49:54 +00:00
Bobak Oftadeh
053e0f93fc Fixed issue where unnecessary information was being published to the client. 2018-09-10 08:34:25 -07:00
Anton Georgiev
7508f1d4f8
Merge pull request #6034 from KDSBrowne/02-iphone-polling-fix 
Fix poll answers not being displayed on mobile safari
 2018-09-10 10:08:51 -04:00
KDSBrowne
5f31deee11 use mq() instead of @media 2018-09-09 05:23:33 +00:00
Anton Georgiev
95b8b4e389
Merge pull request #6051 from antobinary/audio-state 
Update npm packages in bbb-html5
 2018-09-07 16:20:47 -04:00
Anton Georgiev
2330ead2e6 update npm packages to resolve sec vulnerabilities 2018-09-07 19:32:53 +00:00
Anton Georgiev
181b275193
Merge pull request #6049 from antobinary/audio-state 
Make some devDependency npm packages full depencencies (needed in production)
 2018-09-07 14:28:44 -04:00
Anton Georgiev
7a23aa40a1 make devDependency npm packages full depencencies (needed in production) 2018-09-07 18:03:18 +00:00
Anton Georgiev
d89885f3df
Merge pull request #6047 from antobinary/merge-2.0 
Merge 2.0 into 2.2(master)
 2018-09-06 18:36:07 -04:00
Anton Georgiev
68e02efe80 add missing Meeting const in addUser.js 2018-09-06 22:33:32 +00:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Richard Alam
b5430aa30d
Merge pull request #6046 from capilkey/reset-rollover-on-recycle 
Reset rolledOver when user itemrenderers are used for a different user
 2018-09-06 17:38:11 -04:00
Chad Pilkey
e3d9864f75 reset rolledOver when user itemrenderers are used for a different user 2018-09-06 13:43:37 -07:00
Anton Georgiev
d538a0ef54
Merge pull request #6045 from antobinary/audio-state 
Fix listenOnly being interpreted as muted audio (client side)
 2018-09-06 16:34:00 -04:00
Anton Georgiev
64e64b2b0d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 19:51:22 +00:00
Anton Georgiev
681422dc61 fix listenOnly being interpreted as muted audio (client side) 2018-09-06 18:44:59 +00:00
Tainan Felipe
cce66b352e Add hand icon 2018-09-05 16:28:10 -03:00