Commit Graph

421 Commits

Author SHA1 Message Date
Richard Alam
84cfda3459 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-guest-policy 2017-09-27 11:32:13 -07:00
Richard Alam
4804d69a62 - reject user on enter api if guest has been denied 2017-09-25 14:29:02 -07:00
Richard Alam
e062e42cd0 - implement redirect of client to guest waiting 2017-09-25 14:12:54 -07:00
Richard Alam
df255c154b - init guest status when joining 2017-09-22 14:53:37 -07:00
Richard Alam
4717a53182 - start implementing guest policy 2017-09-22 14:24:08 -07:00
Ghazi Triki
9b997392f0 Added new logoutTImer feature. 2017-09-21 20:12:59 +01:00
Anton Georgiev
20fe6c0d46 cleanup 2017-09-18 14:38:03 -04:00
Anton Georgiev
871498dd0d Split POST upload request into two stages at nginx
Subrequest goes to different endpoint on bbb-web to ensure
that the content length (passed in header) is taken under
consideration prior to uploading file
2017-09-18 14:25:00 -04:00
Anton Georgiev
f8087e0af3 store, check, exprire upload authz tokens in bbb-web 2017-09-13 10:39:28 -04:00
Richard Alam
b14b04576d - publish/unpublish recording
- get recordings
2017-09-03 13:44:43 -07:00
Richard Alam
cdb39d469e - process get recordings api call 2017-09-03 10:52:18 -07:00
Richard Alam
e8127fdb61 - do not include recordings with bad metadata.xml in the response for recording api calls 2017-08-31 08:06:15 -07:00
Richard Alam
3b44d0eac2 - fix issue where late joiners displays the wrong slide 2017-08-01 14:50:44 -07:00
JaeeunCho
0a73c4ec40 bbb_web - modified stun/turn api 2017-07-14 09:13:09 -07:00
Richard Alam
c0cc7138b3 - add new user joined voice event message 2017-06-12 11:39:53 -07:00
Anton Georgiev
e59f5ac3ff drop requirement for session[sessionToken]; send sessionToken in enterAPI redirect=false 2017-06-02 13:54:13 -04:00
Richard Alam
61d7b18345 - remove reconnect number in userId 2017-04-28 14:21:59 -07:00
Richard Alam
b8de0c9231 - add authorized role to registered user 2017-04-17 21:23:17 +00:00
Pedro Beschorner Marin
f59e42bb02 Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1 2017-04-04 20:42:15 +00:00
Pedro Beschorner Marin
49855b4c80 Removed some callback API methods from bigbluebutton web that were missed on merge 2017-03-31 12:18:33 +00:00
Richard Alam
8122f984ea - convert "success" to upper case to match previous API. Maybe users are matching with uppercase. 2017-03-28 21:04:52 +00:00
Pedro Beschorner Marin
0ab207c997 Merge remote-tracking branch 'mconf/mconf' 2017-03-21 19:47:11 +00:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Richard Alam
058a4044d6 - publish/unpublish recording 2017-03-15 14:29:10 +00:00
Richard Alam
72c42f9d70 - build get recordings api response 2017-03-13 21:43:39 +00:00
Felipe Cecagno
21170265e2 implement the ability to add artificial remote ICE candidates to the SDP, so we can better handle servers behind NAT (and other situations); extend the /api/stun call in order to retrieve the list of remote ICE candidates from a XML file 2017-03-12 21:45:08 -03:00
Richard Alam
adffa8d673 - build getMeetings and getMeetingInfo responses using freemarker 2017-03-09 20:32:14 +00:00
Richard Alam
3ec0167812 - synchronize create meeting to prevent race condition where 2 meetings
with different voice bridge gets created.
2017-03-06 19:20:23 +00:00
Ghazi Triki
4c4d768883 Added new "webcamsOnlyForModerator" parameter for create meeting API. 2017-01-02 16:56:32 +01:00
Richard Alam
fa16d266b9 - add more logging to track issues 2016-11-10 22:35:06 +00:00
Richard Alam
662218a96f - getmeetinginfo is throwing exception 2016-10-25 20:47:04 +00:00
Ghazi Triki
5e002d845e Store breakout room sequence in akka-apps and bbb-web. 2016-10-13 12:53:53 +01:00
Ghazi Triki
054037c6d6 Revert replacing the deprecated shaHex DigestUtils by sha1Hex and updated API controller. 2016-10-13 09:04:41 +01:00
Ghazi Triki
f7be426305 Breakout rooms refactoring: generated uniques external ID and internal ID. 2016-10-11 20:50:51 +01:00
Ghazi Triki
12021467f5 Unify uploaded presentation file naming across bigbluebutton-web. 2016-10-01 19:40:19 +01:00
Fred Dixon
6c2259d8ff Merge pull request #3399 from riadvice/breakout-rooms-use-current-presentation
Breakout rooms use current presentation - part 2
2016-10-01 12:24:08 -04:00
Ghazi Triki
a9acf9e3e5 Use apache commongs FilenameUtils.getExtension to extract the extension from the file name. 2016-09-29 18:47:11 +01:00
jfederico
039d85fe5c bbb-web: Added internalMeetingID to xml response from create and getMeetings 2016-09-27 15:27:28 -04:00
jfederico
b88328ea4e bbb-web: Removed debugging log used on development 2016-08-03 17:32:10 -04:00
jfederico
a41646e4c4 bbb-web: Fix for issue #2960 2016-08-03 15:35:20 -04:00
Richard Alam
1081564997 Merge pull request #3249 from riadvice/improve-meeting-retrieval
Improve meeting retrieval in MeetingService
2016-08-02 13:28:21 -04:00
Ghazi Triki
962ef49302 Rewritter MeetingService "getMeeting" method to make the difference between normal and breakout rooms. 2016-08-02 17:15:39 +01:00
jfederico
7c0b0a3856 bbb-web: Log error message on invalid 2016-07-28 15:46:44 -04:00
jfederico
3763b0da24 bbb-web: Fix for issue #3148 2016-07-22 16:01:28 -04:00
jfederico
623071005e bbb-web: Simplified action updateRecordings by removing support for force parameter 2016-07-22 11:34:00 -04:00
jfederico
ac60cad84a bbb-web: Added parameter to updateRecording "force=[true|false]"
when force=false or not included
if meta_parameter exists and passed meta_parameter='' update to blank
if meta_parameter does not exists and passed meta_parameter!='' do nothing

when force=true
if meta_parameter exists and passed meta_parameter='' delete
if meta_parameter does not exists and passed meta_parameter!='' add it
2016-07-11 17:57:27 -04:00
jfederico
34ad74646a bbb-web: Added code for updating recording metadata 2016-07-11 15:57:11 -04:00
jfederico
a518a3a092 Reverted changes to error rendering response from join 2016-06-30 17:52:10 -04:00
jfederico
da32546095 Restored changes for making maxPartiipants filter and html responses work on join requests 2016-06-27 11:22:10 -04:00
Richard Alam
785ee34453 Flex 4 UI
- build using gradle
 - launch from outside flex builder
2016-05-26 19:07:27 +00:00