BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,924 Commits 13 Branches 260 Tags 1.1 GiB
871498dd0d
Commit Graph

412 Commits

Author SHA1 Message Date
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
Richard Alam
a615ed7583 - rearrange new flex client source to conform with gradlefx convention 2016-05-25 20:14:13 +00:00
Richard Alam
aafc420d53 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-24 20:17:47 +00:00
Richard Alam
58c239bc43 Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	record-and-playback/core/scripts/bigbluebutton.yml
 2016-05-16 11:35:36 -04:00
Richard Alam
433f09f72d Merge branch 'dfengBBB' of https://github.com/dfeng99/bigbluebutton into dfeng99-dfengBBB 
Conflicts:
	bbb-common-message/build.sbt
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-20 15:40:50 +00:00
jfederico
470971d598 bbb-web: Verified that all error messages from join are displayed in html 2016-05-19 16:12:30 -04:00
jfederico
c65cea3804 bbb-web: Adjustments for the new error management 
- Removed old error managment from join
- Refactored method respondWitErrors so it may responde with html or xml
- Added validation for ignoring masUsers filter if maxUsers=0
 2016-05-19 11:41:46 -04:00
jfederico
4ce332ecce bbb-web: Fix for race condition that causes the maxParticipants filter to fail (changed the format to error parameter) 
[{"message":"You did not pass a checksum parameter.","key":"MissingParam"},{"message":"You did not pass a meetingID parameter.","key":"MissingParam"}]
 2016-05-18 15:39:34 -04:00