BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,066 Commits 13 Branches 260 Tags 1.1 GiB
46d65489d9
Commit Graph

23066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
10e9cb9c37
Merge pull request #6224 from Tainan404/breakout-room-html5 
Change the method permissions for moderator
 2018-11-12 11:25:51 -05:00
Anton Georgiev
74879b76be
Merge pull request #6236 from MaximKhlobystov/long_build 
Make sure Travis CI doesn't fail when command doesn't produce output for too long
 2018-11-12 07:30:10 -05:00
Tainan Felipe
460cbdbcde Re-add settings 2018-11-12 09:46:20 -02:00
bobakoftadeh
87f63baa5a Improved interface for lock settings modal 2018-11-09 16:25:15 -08:00
Maxim Khlobystov
478349606c Prevent Travis from failing when there is no output for 10 minutes 2018-11-09 15:27:57 -05:00
Ghazi Triki
fc4028d6de Redis refactoring : remove duplicate classes, factorisation and build configuration update. 2018-11-09 20:19:46 +01:00
João Francisco Siebel
076864ffd0 merge with master 2018-11-09 13:54:33 -02:00
Tainan Felipe
164835d49b
Merge branch 'master' into breakout-room-html5 2018-11-09 13:49:15 -02:00
Ghazi Triki
6b1fa41777 Updated bbb-fsesl-client project to use sbt 1.2.6 and scala 2.12.7 2018-11-09 10:33:45 +01:00
Anton Georgiev
adbe9bb546 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into iframe-outside-commands 2018-11-08 19:34:57 +00:00
Anton Georgiev
81122251f4
Merge pull request #6231 from KDSBrowne/remove-recording-label 
Remove visible recording label
 2018-11-08 14:17:54 -05:00
KDSBrowne
718942668e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into remove-recording-label 2018-11-08 19:15:17 +00:00
KDSBrowne
32dd7ce944 use calc() instead of new variables 2018-11-08 19:13:14 +00:00
Anton Georgiev
423d3a5819
Merge pull request #6225 from Tainan404/add-meteor-disconnect 
Add meteor disconnect
 2018-11-08 14:03:04 -05:00
bobakoftadeh
020ac800af Implemented functionality of lock settings 2018-11-08 10:55:12 -08:00
Anton Georgiev
9555cd68b8
Merge pull request #6105 from KDSBrowne/start-poll-01 
Add start, stop and publish a poll for Presenter
 2018-11-08 13:52:36 -05:00
Ghazi Triki
0614ccd763 Updated akka-bbb-apps project to use sbt 1.2.6 and scala 2.12.7 2018-11-08 14:53:00 +01:00
Maxim Khlobystov
9b27c89bc8 Adjustments to the autoShareWebcam 2018-11-07 16:45:52 -05:00
Maxim Khlobystov
a2c490f4f6 Stopping the tracks to avoid fetching two cameras at the same time + Making the constraints less restricted 2018-11-07 16:16:36 -05:00
Ghazi Triki
3c758cc9d1 Replace lettuce methods by custom commands. 2018-11-07 21:02:54 +01:00
Maxim Khlobystov
91dad9d882 Fixing some linter error 2018-11-07 14:30:36 -05:00
KDSBrowne
565b55e8e7 remove unused styles 2018-11-07 13:00:21 +00:00
KDSBrowne
10d5d0706e remove visible recording label / add missing formatted string / fix recording icon 2018-11-07 02:20:19 +00:00
Maxim Khlobystov
9f67ce4106 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webcam-choice 2018-11-06 18:17:52 -05:00
Maxim Khlobystov
90f38561c3 Add Webcam Settings to choose a camera 2018-11-06 18:10:56 -05:00
bobakoftadeh
856459e989 Merge branch 'user-manage-b' of https://github.com/BobakOftadeh/bigbluebutton into user-manage-C 2018-11-06 13:47:38 -08:00
Bobak Oftadeh
edc941da9e Implementation of lock-view modal menu 2018-11-06 13:39:07 -08:00
Ghazi Triki
21cb59487c Move RedisStorageService from bigbluebutton-web to bbb-common-message and replace jedis with lettuce-core. 2018-11-06 18:54:27 +01:00
Tainan Felipe
060435d54e Rename from Breakout-room to breakout-room 2018-11-06 13:42:30 -02:00
Ghazi Triki
e812160ee9 Fix bbb-common-message unit tests. 2018-11-06 15:45:42 +01:00
Ghazi Triki
d330c6687b Updated bbb-common-web project to use sbt 1.2.6 and scala 2.12.7 2018-11-06 14:43:03 +01:00
Ghazi Triki
acd42835b4 Updated bbb-common-message project to use sby 1.2.6 and scala 2.12.7 2018-11-05 21:11:58 +01:00
Anton Georgiev
471a847f0f
Merge pull request #6227 from ritzalam/change-meetingid-to-meetingID 
- change meetingid param to meetingID so it's consistent with how ot…
 2018-11-05 15:09:38 -05:00
Richard Alam
5f8803917c - change meetingid param to meetingID so it's consistent with how other params are spelled. 2018-11-05 12:03:35 -08:00
João Francisco Siebel
016efcc0eb Remove ACL from client side. close #6138 2018-11-05 17:30:37 -02:00
KDSBrowne
c552b3522c prevent breakout and poll pane both open 2018-11-05 17:52:06 +00:00
Richard Alam
eaf41f719d
Merge pull request #6220 from riadvice/meetingid-for-end-meeting-callback 
Add `meetingid` GET parameter to endCallbackUrl
 2018-11-05 12:23:13 -05:00
Tainan Felipe
958e7b06ba Remove the intl id 2018-11-05 14:02:04 -02:00
Tainan Felipe
50d8995600 Add the meteor disconnect on meeting ended and error screen 2018-11-05 13:51:39 -02:00
Tainan Felipe
1768c49169 Add the meteor disconnect on meeting ended and error screen 2018-11-05 13:48:57 -02:00
Tainan Felipe
fd8a63fbbb Change the method permissions for moderator 2018-11-05 10:27:56 -02:00
Fred Dixon
18c3836886
Merge pull request #6222 from fcecagno/webhooks-on-1.1 
Fix webhooks
 2018-11-03 23:42:58 -04:00
Felipe Cecagno
f2c4cb7165 add external meeting id to rap-archive-started from mapping 2018-11-04 00:27:01 -03:00
Ghazi Triki
0f41551530 Add meetingid GET parameter to endCallbackUrl. 2018-11-03 17:06:16 +01:00
KDSBrowne
8378606889 move presenter and poll check to UserPolls 2018-11-02 21:43:49 +00:00
Richard Alam
ccf79b8bca
Merge pull request #6214 from riadvice/merge-2.x-release-into-master 
Merge 2.0-RC7 release into master
 2018-11-02 17:39:48 -04:00
KDSBrowne
538e248058 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-11-02 21:25:40 +00:00
Ghazi Triki
ff80b30df1 Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master 
# Conflicts:
#	bigbluebutton-html5/imports/ui/services/audio-manager/index.js
 2018-11-02 21:02:02 +01:00
Ghazi Triki
827a900d9a Update MainApplicationShell code style. 2018-11-02 20:58:12 +01:00
Ghazi Triki
a52e907593 Fix API calls. 2018-11-02 20:57:54 +01:00