Ghazi Triki
aa91cf6562
Code quality improve for bbb-common-web project.
2017-12-18 20:54:18 +01:00
Richard Alam
715a0177fd
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
2017-12-08 11:26:09 -08:00
Anton Georgiev
446f539e89
add bool join parameter joinViaHtml5 -- to prefer html5 over flash client
2017-12-04 15:29:25 -05:00
Anton Georgiev
d6e8396407
add configuration to join via html5 for attendee or mod
2017-11-30 15:19:03 -05:00
Richard Alam
5bf8258074
- make max file uploaded presentation
2017-11-27 14:03:50 -08:00
Richard Alam
9329e9316b
- determine guest status properly for moderators
2017-11-15 12:39:06 -08:00
Richard Alam
3056622283
- setup polling of guest while waiting for approval from moderator
2017-10-31 12:50:54 -07:00
Richard Alam
0036b5734d
- create guest lobby html page
2017-10-30 14:21:09 -07:00
Richard Alam
9f28f240a5
- hardcode default presentation window for pre-uploaded presentations and for creation of breakout rooms
2017-10-30 13:05:06 -07:00
Anton Georgiev
ff1aac2698
hardcode podId for first pod (for default.pdf)
2017-10-24 16:54:55 -04:00
Richard Alam
a3e37dffa5
Merge branch 'information-bar' of https://github.com/riadvice/bigbluebutton
2017-10-03 14:04:12 -07:00
Ghazi Triki
e96d6ae726
Add new API options to display a banner in the client.
2017-10-03 21:49:06 +01:00
Anton Georgiev
d521b19623
Merge branch 'implement-multi-chat' of github.com:ritzalam/bigbluebutton into pods_vol3
2017-10-03 11:13:48 -04:00
Anton Georgiev
23dadc5477
work on separating pods - client/conversion/apps
2017-09-29 18:20:33 -04:00
Richard Alam
fe44a79298
- send guest waiting message to client
2017-09-27 12:48:30 -07:00
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
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
jfederico
f075895792
bbb-web: Fix for race condition that causes the maxParticipants filter to fail (implemented cleaner)
2016-05-17 10:55:37 -04:00
jfederico
9b48a68d7d
bbb-web: Fix for race condition that causes the maxParticipants filter to fail (tracking the joins)
2016-05-12 15:03:38 -04:00
jfederico
54d2c0fcb3
bbb-web: Implemented maxUsers/maxParticipants filter in Join
2016-05-10 15:15:46 -04:00
Ghaz Triki
f1ffbc525f
Making MeetingService able to find a meeting using an exact match of its internal ID, by adding a new signature to the getMeeting method.
2016-05-05 10:04:05 +01:00
jfederico
5d06841432
Fix for issue #3110
2016-05-04 17:31:07 -04:00
Richard Alam
0323b7203a
Add logging on why cannot find user session
...
We need to know which part of the code failed to get the user's session.
2016-04-26 14:41:22 -04:00
David Feng
67c14f9056
This enable avatar to be display in other participants video window
2016-04-20 14:08:13 +08:00
Richard Alam
7fe44355d4
Merging breakout rooms with the master branch
...
Merge breakout rooms feature with master branch. This
also includes closed captioning feature.
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-web/.classpath
bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-03-21 17:52:23 +00:00
Ghaz Triki
45362941ce
Use first sessionToken implementation in API.
2016-03-02 21:16:26 +01:00
Ghaz Triki
871843d4ec
Fix session token redirection merge.
2016-03-02 12:39:57 +01:00
Felipe Cecagno
e4da408c08
Merge branch 'mconf' into bigbluebutton/bigbluebutton@master
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationService.java
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingServiceHelper.java
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
record-and-playback/presentation/playback/presentation/0.9.0/playback.html
record-and-playback/presentation/scripts/publish/presentation.rb
2016-03-02 01:19:09 -03:00
Felipe Cecagno
66392e0a6b
Merge remote-tracking branch 'mconf/mconf-live0.7.4' into mconf
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
2016-03-02 00:19:30 -03:00
Ghaz Triki
990e786340
Merge branch 'master' into breakout-rooms-porto-algre-2015
...
# Conflicts:
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
# bigbluebutton-web/.classpath
# bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
# bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
# bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-02-28 21:34:33 +01:00
Felipe Cecagno
a64a9c5940
remove unnecessary logs; order getRecordings response by recordId, and metadata by meta key
2016-02-03 19:09:16 -02:00
Pedro Beschorner Marin
00d378831e
FreeMarker template in a separated file
2016-02-03 13:51:42 -02:00
Pedro Beschorner Marin
497930b06d
Creating getRecordings XML response with FreeMarker
2016-02-03 13:51:36 -02:00
jfederico
84e4221c47
bigbluebutton-web: Extended filterRecordingsByMetadata in order to support wildcards
2016-02-01 15:08:51 -05:00
jfederico
f23158ccd7
bigbluebutton-web: Fixed issue with recordings not publishing/unpublishing
2016-01-29 13:36:24 -05:00
jfederico
e12d3fa639
Cleaned up ApiController after merge
2016-01-29 10:24:30 -05:00
jfederico
e1e3aa6055
Merge branch 'pedrobmarin-getRecordings' into jfederico-getRecordings
...
# Conflicts:
# bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
# bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
2016-01-28 15:36:19 -05:00
jfederico
2f3bd5b3ce
Reformatted files with conflicts
2016-01-28 13:58:05 -05:00
jfederico
a0c2e337cd
bigbluebutton-web: Changed approach for filtering states/recordIDs. the query is now based on recordID and state parameters instead of filter
2016-01-28 11:45:12 -05:00
Ghazi Triki
8b503b3676
Fixed variable name in getMeetingInfo API method.
2016-01-27 18:38:40 +01:00
Pedro Beschorner Marin
3cb59b8951
FreeMarker template in a separated file
2016-01-27 14:27:06 +00:00
jfederico
7ef3e62940
bigbluebutton-web: The statuses processing and processed can be returned by getRecordings
2016-01-26 17:17:28 -05:00
Pedro Beschorner Marin
6307b47ba8
Creating getRecordings XML response with FreeMarker
2016-01-26 18:59:36 +00:00
jfederico
2c214cafac
bigbluebuttonbn-web: Implemented filter for recordIDs [id:eq:xxxx,yyyy,zzzz]
2016-01-22 18:16:47 -05:00
jfederico
6b911820e0
bigbluebutton-web: Added filter parameter to getRecordings for filtering queries based on the state of the recording [published|unpublished|deleted]
2016-01-22 11:38:33 -05:00
jfederico
3265709455
bigbluebutton-web: Extended getRecordings for making direct searches based on recordID(s)
2016-01-21 15:24:22 -05:00
jfederico
334d4e4beb
bigbluebutton-web: Added state to xml responded by getRecordings
2016-01-19 15:16:45 -05:00
jfederico
67a70ccbc3
bigbluebutton-web: Reformatted code in apiController
2016-01-19 15:15:18 -05:00
Ghazi Triki
73614b4013
Fixed issue by assigning a value to a non existing iSbreakout property to UserSession class.
2016-01-16 18:30:17 +01:00
Ghazi Triki
b24ae090b0
Returning isBreakout conference state in join and enter API calls.
2016-01-14 17:15:36 +01:00
Ghazi Triki
827b74fe78
Fixed isBreakout parameter name when joining a breakout room.
2016-01-12 21:52:41 +01:00
Ghazi Triki
c0055c848f
The API returns "isBreakout" value for "getMeetings" and "getMeetingInfo" methods.
2016-01-12 16:53:37 +01:00
Felipe Cecagno
019cfa6cfb
Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/components/CustomRichTextEditor.as
2016-01-04 15:14:27 -02:00
Felipe Cecagno
ad7e3999e7
include size for the download formats on the getRecordings api call
2015-12-17 13:37:02 -02:00
Felipe Cecagno
555e037d79
fix merge and refactor a few pieces to fit better on BigBlueButton 1.0.0
2015-11-30 01:06:38 -02:00
Pedro Beschorner Marin
36bbcc06d6
Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf-live0.7.3-merge
...
Conflicts:
akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
bbb-video/.classpath
bbb-video/build.gradle
bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
bbb-video/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationApplication.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/es_LA/bbbResources.properties
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-client/src/BigBlueButton.mxml
bigbluebutton-client/src/SharedNotesModule.mxml
bigbluebutton-client/src/org/bigbluebutton/common/Images.as
bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as
bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as
bigbluebutton-client/src/org/bigbluebutton/core/services/StreamMonitor.as
bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
bigbluebutton-client/src/org/bigbluebutton/main/model/NetworkStatsData.as
bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeMyRole.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeRoleEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/LowerHandEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/StreamStoppedEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/LanguageSelector.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/red5/Connection.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMapDelegate.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/WindowLayout.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/AddButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/ToolbarComponent.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/UploadedPresentationRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/Client.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/HTTPServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/XMLServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/GraphicsWrapper.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoDock.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
bigbluebutton-config/bigbluebutton-release
bigbluebutton-config/bin/bbb-conf
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy
bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisStorageService.java
bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
2015-11-25 15:58:36 +00:00
Richard Alam
c47272fd2c
- refactor how default presentation is downloaded
2015-10-21 20:51:58 +00:00
Richard Alam
9c527be4f0
- fix json response
2015-10-21 18:30:25 +00:00
Richard Alam
a80a0562c5
- return json on create api call
2015-10-21 18:25:00 +00:00
Richard Alam
c9b4f7e9a0
Merge branch 'support-multiple-logins' into add-http-to-akka-apps
...
Conflicts:
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy
2015-10-21 17:44:44 +00:00
Richard Alam
10f7f3f852
- play around with akka http
2015-10-20 15:43:41 +00:00
Richard Alam
14aabf9da6
- allow joining breakout room
2015-10-19 19:00:21 +00:00
Richard Alam
d89a34209d
- make presentation api use session
2015-10-07 21:44:01 +00:00
Richard Alam
c5b5b11725
- check if user has sessionToken
2015-10-07 20:34:37 +00:00
Richard Alam
c182f85403
- use sessionToekn on signOut API call
2015-10-07 16:09:31 +00:00
Ghazi Triki
96aa42e5c2
Presentation upload returns a 200 HTTP status.
2015-10-07 14:17:04 +01:00
Richard Alam
bcfe18d0d9
- use sessionToken to get configxml
2015-10-06 22:18:56 +00:00
Richard Alam
7968273501
- pass sessionToken to get configXML from bbb-web
2015-10-06 21:08:01 +00:00
Richard Alam
e2533f1f0c
- load config.xml first before doing anything else
2015-10-05 20:06:35 +00:00
Richard Alam
3918dd3238
- try to figure out when configXml gets loaded
2015-10-05 15:22:39 +00:00
Richard Alam
a1a82f96d0
- remove printlns to cleanup logs
2015-09-23 20:11:06 +00:00
Felipe Cecagno
ed366e6b21
Merge branch '090-recordings-size' into mconf-live0.7.3
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
2015-09-08 17:43:20 -03:00
Richard Alam
9570a9e765
- fix formatting
2015-08-11 19:24:27 +00:00
Richard Alam
f47344b134
- fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1966
2015-08-11 18:57:40 +00:00
Richard Alam
839e7ebf58
Merge branch 'svg-conversion' of https://github.com/gthacoder/bigbluebutton into gthacoder-svg-conversion
2015-08-07 18:28:16 +00:00
Richard Alam
839473395a
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-leonardo-api-changes
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
2015-08-07 15:06:40 +00:00
Richard Alam
00c5cac9c9
Merge pull request #632 from daronco/api-merges
...
API merges
2015-08-06 17:58:34 -04:00
Maxim Khlobystov
5c0cb9c3d8
Merge branch 'meteor-client-pdf-conversion' of https://github.com/gthacoder/bigbluebutton into development
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala
2015-08-06 16:21:31 -04:00
Richard Alam
d140ca0b40
- add an api to let us query the user sessions in bbb-web. We use this to see what sessions are hanging around
...
that may be causing OOM exception on tomcat7
2015-08-04 17:58:27 +00:00
Maxim Khlobystov
5f491bf43b
Cleaning up.
2015-07-15 16:58:15 -04:00
Maxim Khlobystov
ceb3a3911c
Made sure the image served for HTML5 client is in SVG format.
2015-07-07 12:19:05 -04:00
Maxim Khlobystov
16314d5edd
Started generating SVG images for HTML5 client instead of PNG.
2015-07-03 12:20:37 -04:00
Pedro Beschorner Marin
6ef2bf6b27
Getting playback and full meeting published sizes
2015-06-09 14:39:35 +00:00
Pedro Beschorner Marin
4225a87abd
Refactoring and cleanup
2015-06-04 16:03:20 +00:00
Pedro Beschorner Marin
a1a7096c3e
Getting the raw size of the meeting data
2015-06-03 15:19:41 +00:00
Pedro Beschorner Marin
cc55e6f6a4
Adding new attributes to bbb-web
2015-06-02 18:58:11 +00:00
Calvin Walton
9deb87d0b0
web: check that meeting is running before allowing presentation upload
2015-05-27 15:08:04 -04:00
Felipe Cecagno
da8b6efa0e
Merge branch 'enter-metadata' into mconf-live0.6.3
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
2015-05-18 12:39:05 -03:00
Felipe Cecagno
4dbf08f08e
removed the calls from bbb-web related to the webhooks
2015-05-18 12:38:00 -03:00
Felipe Cecagno
2ffcf01ef5
included the meeting metadata in the enter api call
2015-05-18 12:38:00 -03:00
Felipe Cecagno
7cb12f8b49
Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release
...
Conflicts:
bbb-api-demo/src/main/webapp/demo10_helper.jsp
bbb-video/build.gradle
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-client/locale/bg_BG/bbbResources.properties
bigbluebutton-client/locale/cs_CZ/bbbResources.properties
bigbluebutton-client/locale/cy_GB/bbbResources.properties
bigbluebutton-client/locale/de_DE/bbbResources.properties
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/es_419/bbbResources.properties
bigbluebutton-client/locale/es_ES/bbbResources.properties
bigbluebutton-client/locale/et_EE/bbbResources.properties
bigbluebutton-client/locale/fa_IR/bbbResources.properties
bigbluebutton-client/locale/fr_CA/bbbResources.properties
bigbluebutton-client/locale/fr_FR/bbbResources.properties
bigbluebutton-client/locale/hu_HU/bbbResources.properties
bigbluebutton-client/locale/hy_AM/bbbResources.properties
bigbluebutton-client/locale/it_IT/bbbResources.properties
bigbluebutton-client/locale/ms_MY/bbbResources.properties
bigbluebutton-client/locale/no_NO/bbbResources.properties
bigbluebutton-client/locale/pl_PL/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/locale/ru_RU/bbbResources.properties
bigbluebutton-client/locale/sk_SK/bbbResources.properties
bigbluebutton-client/locale/tr_TR/bbbResources.properties
bigbluebutton-client/locale/uk_UA/bbbResources.properties
bigbluebutton-client/locale/zh_CN/bbbResources.properties
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js
bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
bigbluebutton-client/resources/prod/lib/deployJava.js
bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2015-05-17 19:25:26 -03:00
Leonardo Crauss Daronco
0e77a9c71b
Replace "videoStreams" by "videoCount" on getMeetingInfo
...
Return only the total number of videos and whether a user has video or not
instead of returning the ID of each video stream available. Is now more
consistent with the response of getMeetings.
2015-05-07 10:00:07 -04:00
Leonardo Crauss Daronco
c93d936a44
Merge remote-tracking branch 'mconf/090-get-recordings-metadata-filter' into api-merges
2015-05-05 12:39:06 -04:00
Leonardo Crauss Daronco
6cf4dc4b1d
Merge remote-tracking branch 'mconf/090-audio-video-on-api' into api-merges
2015-05-05 12:38:47 -04:00
Felipe Cecagno
12cab928de
Merge branch '090-guest-role-refactoring' into mconf-live0.6.3
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/User.java
2015-04-23 14:37:17 -03:00
Felipe Cecagno
63e6da47de
reduced the number of messages exchanged between server and client regarding the guest access; fixed the problem of bbb-web answering the meeting is not running when there's a guest connected
2015-04-20 21:25:37 -03:00
Richard Alam
337f5f0934
- fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1917
2015-04-06 15:20:01 +00:00
Oleksandr Zhurbenko
98bd277324
Cleaninig
2015-03-25 14:34:01 -07:00
Oleksandr Zhurbenko
f8a41a78d8
Cleaning and formatting
2015-03-25 14:12:38 -07:00
Oleksandr Zhurbenko
67ef6129c0
Trimming leading and trailing whitespace for the meetingId and fullname for both cases
2015-03-25 13:02:03 -07:00
Oleksandr Zhurbenko
5a167f362c
Fixed issue 1889, added checking for an empty username and removing trailing and leading whitespaces
2015-03-19 16:51:56 -07:00
Richard Alam
24b9c5c525
- store stun and turn servers in client
2015-02-06 21:05:12 +00:00
Richard Alam
cdc6daced8
- add support for configuring stun and turn servers
...
- add new /stuns api to be called by the Flash client
2015-02-06 19:46:56 +00:00
Richard Alam
05ea33b261
- append connection number to userid. This allows us to track the connection for a user and clean
...
up properly the users list when the user gets disconnected. Also, it allows us to track how many
times a user gets disconnected in the meeting.
2015-01-26 15:31:12 +00:00
Felipe Cecagno
f6d6e4e40c
Merge branch '090-guest-role' into HEAD
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
2015-01-25 18:36:30 -02:00
Felipe Cecagno
1289e8a41e
Merge branch '090-get-recordings-metadata-filter' into mconf-live0.6.2
2015-01-25 00:44:52 -02:00
Felipe Cecagno
f7225848c9
Merge branch '090-get-recordings-metadata-filter' into HEAD
2015-01-25 00:44:14 -02:00
Richard Alam
71a2ca9443
- add connection number to userid so we are able to match the user with connection attempts
2015-01-23 20:02:40 +00:00
Felipe Cecagno
f2d1e24580
Merge branch '090-audio-video-on-api' into mconf-live0.6.2
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/User.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingConstants.java
2015-01-23 15:36:52 -02:00
Felipe Cecagno
1ea57596d0
Merge branch '090-audio-video-on-api' into HEAD
2015-01-23 15:05:18 -02:00
Felipe Cecagno
2761c31e52
Merge branch '090-encrypted-recording' into mconf-live0.6.2
...
Conflicts:
bbb-video/build.gradle
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/locale/de_DE/bbbResources.properties
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
2015-01-21 18:11:56 -02:00
Felipe Cecagno
8e12c909c5
Merge branch '090-encrypted-recording' into HEAD
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
record-and-playback/core/Gemfile
record-and-playback/deploy.sh
2015-01-21 15:51:29 -02:00
Felipe Cecagno
e9122a9637
Merge branch '090-download-presentation' into mconf-live0.6.1
...
Conflicts:
bigbluebutton-client/locale/pt_BR/bbbResources.properties
2014-11-23 23:02:22 -02:00
Anton Georgiev
0bf242900d
authToken is now different than userid
2014-11-20 19:09:41 +00:00
Lucas Zawacki
7d401dab53
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
2014-11-14 15:33:17 -02:00
Mateus Dalepiane
ef043602c6
Merge branch '090-guest-role' into mconf-live0.6.1
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
2014-11-07 14:49:28 -02:00
Felipe Cecagno
b954a42aa8
fix a runtime error that happens when the user uploads a presentation
2014-11-05 18:05:30 -02:00
Mateus Dalepiane
339acc9166
Send UserJoined only after guests are accepted
...
This means that the guest will be displayed on participants list
only after they accepted
2014-11-03 17:54:39 -02:00
Pedro Beschorner Marin
2c5ff4f7cd
Merging with mconf old branch
2014-11-03 14:12:47 -02:00
Richard Alam
9effb009d0
- follow redirects when downloading presentation
2014-10-22 02:43:03 -07:00
Richard Alam
5af452c39f
- start implementing auto start recording
2014-10-20 03:39:44 -07:00
Richard Alam
9c0280c129
- fix txt uri for accessibility
2014-10-20 01:18:13 -07:00
Mateus Dalepiane
36af1da3df
Port of guest role to bbb-090
...
**WARNING**: Not tested yet.
bbb-client and bbb-web compile.
bbb-apps does not compile yet.
@bbb-apps: Missing scala implementation.
@bbb-client: Missing message receiver implementation.
Conflicts:
bbb-api-demo/src/main/webapp/bbb_api.jsp
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/User.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/UsersConnectionEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-web/grails-app/conf/BigBlueButtonFilters.groovy
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
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/UserSession.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessageListener.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
2014-10-16 16:58:10 -03:00
Felipe Cecagno
31f225b856
Merge branch 'get-recordings-metadata-filter-0.81' into 090-get-recordings-metadata-filter
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
2014-09-18 17:43:39 -03:00
Felipe Cecagno
356fbcccad
Merge branch 'audio-video-on-api-v0.81' into 090-audio-video-on-api
...
Most of the work had to be done again because of the way BigBlueButton exchanges messages today.
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/Room.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserJoinedEvent.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomImp.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomManager.java
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.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/MessageListener.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingConstants.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
2014-09-18 17:09:00 -03:00
Felipe Cecagno
56f20fa5d3
Merge branch '090-encrypted-recording' into HEAD
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2014-09-10 17:27:47 -03:00
Anton Georgiev
4f25f2ced1
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master
2014-09-02 21:08:03 +00:00
Richard Alam
372b571b7b
- add pretty create date, duration, and user has joined info on getMeeting api response
2014-09-02 10:22:24 -07:00
Felipe Cecagno
dd97b8f80c
Merge branch 'encrypted-recording' into 090-encrypted-recording
...
Conflicts:
bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2014-09-01 16:46:03 -03:00
Anton Georgiev
e9113f3d9f
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton
2014-08-20 18:59:50 +00:00
Anton Georgiev
c9ad7035b1
Merge branch 'merging-html5-with-master' of https://github.com/antobinary/bigbluebutton
2014-08-20 18:57:55 +00:00
Richard Alam
11b8fa711e
- provide a way to support pre-built config.xml
2014-08-20 11:42:31 -07:00
Anton Georgiev
adf20cca7d
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merging-html5-with-master
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
2014-08-20 15:24:25 +00:00
Richard Alam
9f63ddd1f7
- add new param (moderatorOnlyMessage) on CREATE API
2014-08-20 07:37:31 -07:00
Richard Alam
c56fde0c42
Merge pull request #348 from speakserve/unify-version-number
...
Unify version number
2014-08-13 14:17:45 -04:00
Anton Georgiev
404ff72914
use high qulity png conversion for the slide, not just the thumbnail
2014-08-07 20:12:55 +00:00
Richard Alam
109f973cbd
- check on create api call if meeting has been forcibly ended
2014-08-07 09:32:18 -07:00
Ghazi Triki
57d7a15b89
Reverted back API version to 0.81 with updates in outdate files
2014-07-31 18:53:24 +01:00
Ghazi Triki
ac7af7dfea
Manually bumped all application version to the correct actual version 0.9.0-dev
2014-07-31 17:42:38 +01:00
Richard Alam
9eef8e994b
- fix https://code.google.com/p/bigbluebutton/issues/detail?id=1709
2014-07-28 13:56:49 -07:00
Richard Alam
c10bc2a42c
- return authToken when redirect=false on JOIN API call
2014-05-10 08:59:03 -07:00
Richard Alam
283a3fa3eb
- modify messages
2014-05-09 17:49:01 -07:00
Richard Alam
8dfe46bfba
- changing message format between bbb-web and bbb-apps
2014-05-09 21:21:21 +00:00
Richard Alam
ca089d6af0
- minor cleanup
2014-05-05 18:35:01 +00:00
Richard Alam
ba08100b35
Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into connect-bbb-apps-html5
2014-05-01 15:38:14 +00:00
Calvin Walton
7d78e46cad
Support passing through XML extensions in getRecordings
...
Recording processing scripts can now add arbitrary XML elements in
the extensions section of the metadata.xml file, and those
element will be copied to the getRecordings XML response.
2014-04-24 16:34:59 -04:00
Richard Alam
bee1320463
Merge branch 'merge-polling-with-master' into connect-bbb-apps-html5
...
Conflicts:
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
2014-04-08 19:07:37 +00:00
Anton Georgiev
2d89a73c0c
Merge branch 'addMsgLib' of /home/ubuntu/dev/antonHtml5/bigbluebutton into connect-bbb-apps-html5
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RedisMessagingService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesProcessor.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
bigbluebutton-web/grails-app/conf/UrlMappings.groovy
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
bigbluebutton-web/ivy.xml
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java
2014-04-08 15:55:04 +00:00
Richard Alam
7e0af3e042
- check if meeting has been forciblyEnded and don't let the user join if it is
2014-04-02 20:01:29 +00:00
Richard Alam
3742ebc1c2
- prevent the user from rejoining meeting when meeting has ended
2014-04-02 19:45:58 +00:00
Richard Alam
090cb4115b
- fix issue where getMeetings and getRecordings calls just loops back resulting in StakOverflow
2014-04-02 16:17:24 +00:00
Richard Alam
d15e8c3a5b
- continue cleaning up presentation
2014-02-27 21:41:25 +00:00
Richard Alam
9f00d960d1
- modify to generate presentation ids instead of using filename as id
2014-02-26 21:45:25 +00:00
Richard Alam
6cf30e9f07
- upgrade bigbluebutton-web to grails 2.3.6
2014-02-25 15:46:06 +00:00
Felipe Cecagno
417b518c2b
Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into guest-role-0.81
...
Conflicts:
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
2014-02-24 12:37:35 -03:00
Richard Alam
5559a2b8cc
Merge branch 'master' into merge-polling-with-master
...
- there are compile issues we need to fix
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
2014-01-23 20:49:04 +00:00
alexandrekreis
b6e3137596
refs #930
2013-11-28 11:16:52 -02:00
mohamed-ahmed
1c012aec32
merged html5-bridge with master
2013-10-29 18:33:25 +00:00
Richard Alam
a141928824
- Fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1671
...
Remove the beginning . (dot) from uploaded presentation.
2013-10-23 16:21:49 +00:00
Felipe Cecagno
0cf35712cf
added <voiceBridge> and <dialNumber> on create and getMeetings call
2013-10-14 11:48:39 -03:00
Felipe Cecagno
8e2ac7335b
Merging tag v0.81RC3 into audio-video-on-api
2013-10-14 10:58:57 -03:00
Felipe Cecagno
9a2c605866
Merge branch 'master' into multicamera-0.81
...
Conflicts:
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
2013-09-29 21:19:29 -03:00
Richard Alam
d402f7b333
Merge branch 'master'
...
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
2013-09-09 18:42:21 +00:00
Felipe Cecagno
65163c49ef
Merge branch 'master' into guest-role-0.81
...
Conflicts:
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/events/LogoutEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
2013-08-26 15:13:38 -03:00
Jorge Nunez
5b1d62f5d2
Merge remote branch 'upstream/master' into html5-bridge
...
Conflicts:
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2013-07-31 17:27:33 -07:00
Hugo Lazzari
c358fe33d8
Merge branch 'master' into get-recordings-metadata-filter-0.81
2013-07-31 09:20:40 -03:00
Hugo Lazzari
a91a2df678
Merge branch 'master' into guest-role-0.81
...
Conflicts:
bbb-api-demo/src/main/webapp/demo3.jsp
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/User.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/common/Images.as
bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/UsersConnectionEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-web/application.properties
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2013-07-24 11:25:36 -03:00
Richard Alam
34a9875766
- enable webhooks
2013-07-11 19:20:11 +00:00
Richard Alam
14d3b615bc
- handle prescreated polls and display them in client
2013-07-10 20:56:32 +00:00
Richard Alam
7d3e5afb5f
- remove re-encoding of posted XML data as grails 1.3.9 doesn't unencode automatically the data
2013-07-10 19:14:25 +00:00
Markos Calderon
dfbfae9c8d
change reject value when the meeting doesn't exist
2013-07-10 16:12:08 -05:00
Markos Calderon
ff893f36fe
Fix: disallow client to reconnect by refreshing the browser, when a meeting ends
2013-07-10 16:01:54 -05:00
Markos Calderon
d730300c8a
fix sending full meetingID
2013-06-12 18:59:32 -05:00
Markos Calderon
2597d47bba
listen to events in bbb-callbacks
2013-06-12 18:49:32 -05:00
Markos Calderon
f20f243b05
Correction to subscription API calls
2013-06-11 18:38:28 -05:00
Markos Calderon
51279ec549
API calls for subscribing to events
2013-06-10 18:38:35 -05:00
Markos Calderon
8ca16a3953
updating bbb-apps to handle polls
2013-06-06 18:53:57 -05:00
Markos Calderon
7f748fd809
reading polls from create API call
2013-06-05 17:56:03 -05:00
Calvin Walton
085294af6d
Fix typo 'defaulLayout' in join parameters
2013-05-30 17:47:26 -04:00
Richard Alam
b28cb66f32
- change how we create the base string and calculate checksum for setConfigXML API
2013-05-24 15:11:36 +00:00
Richard Alam
be8befb243
Merge branch 'master' into html5-bridge
...
Conflicts:
bigbluebutton-apps/build.gradle
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
2013-05-09 17:25:25 +00:00
Richard Alam
4d3e6de0e9
- return the default config xml without wrapping in a response xml. THis way, the config xml isn;t encoded.
2013-04-28 21:52:14 +00:00
Richard Alam
5cdf1b18f6
- sign the query string for get default config xml
2013-04-17 21:59:51 +00:00
Richard Alam
18bacaa632
- fix NPE when sending incorrect checksum to getDefaultConfigXML call
2013-04-17 18:43:10 +00:00
Jesus Federico
36ed2f6537
Made error messages consistent on setConfigXML
2013-04-05 00:07:41 -04:00
Richard Alam
e35071a050
- add API to allow querying for default config.xml
2013-03-27 18:21:54 +00:00
Richard Alam
27af71f208
- handle passing of config xml
2013-03-27 16:06:03 +00:00
Richard Alam
8c157a3914
- handle setConfigXML
2013-03-21 17:14:13 +00:00
Richard Alam
0e386adab2
Merge branch 'master' into merge-master-into-dynamic-config
2013-03-15 21:03:13 +00:00
Felipe Cecagno
f8180d3cee
very first implementation of the getRecordings call filtering by metadata; the idea is the same as on create, the user will specify some parameters as meta_*, and the call will return just the recordings that match all the metadata specified; it continues working with the meetingID filter, and both can be used together
2013-02-22 17:44:24 -03:00
Markos Calderon
3003280227
Added voicebridge and dialnumber to ExternalApiCalls
2013-02-22 15:37:59 -05:00
Markos Calderon
cc1e40d61c
Added user customdata to the client
2013-02-19 12:18:12 -05:00
Markos Calderon
1929526a4d
added custom data parameter when a user joins to a meeting
2013-02-14 15:59:52 -05:00
Richard Alam
e6fe97db36
Merge branch 'master' into merge-master-into-dynamic-config
2013-02-07 18:53:01 +00:00
Gilson Souza
891e12b815
including the field key into API getRecordings
2013-02-04 13:34:07 -02:00
Gilson Souza
7fc5db4b21
changing API to add the new object download into the getrecordings XML reply
2013-02-04 13:34:05 -02:00
Markos Calderon
ba2da7004c
Merge almost complete. Still red dot not working
2013-01-25 21:50:32 -05:00
Markos Calderon
983f93b0e4
Added license for bigbluebutton-web
2013-01-18 18:24:35 -05:00
Richard Alam
5a95875968
- hash the meeting id with the config xml
2012-12-10 19:05:41 +00:00
Richard Alam
02c6121a6c
- rename set and get configxml api
2012-12-09 20:44:52 +00:00
Richard Alam
a70d56ff56
- tie tokens to a meeting
2012-12-09 20:35:09 +00:00
Richard Alam
a0d4c61082
- add ability to post config xml for meeting
2012-12-09 19:29:48 +00:00
Richard Alam
1f620583a2
- allow passing of configURL in create and join api calls
2012-12-09 00:23:33 +00:00
Richard Alam
1cd682e1e0
- pass avatar in avatarURL during join API call. Have a default avatarURL
2012-12-02 10:57:58 +00:00
Richard Alam
787e1de310
- pass external meeting id to the client and provide JS api to query it
2012-11-20 19:30:08 +00:00
Richard Alam
e63bbfc449
- pass defaultLayout in join api call
2012-11-12 21:05:23 +00:00
Felipe Cecagno
604d08937c
refactoring some code to revert unwanted changes; extracted strings from GuestWindow; renamed the join parameter from isGuest to guest
2012-10-24 17:32:59 -02:00
Markos Calderon
9e45420a4c
load presentation in both sides html5 and flex
2012-10-20 14:18:39 -05:00
Richard Alam
2c6b067b01
- convert userid from Number to String
2012-10-02 17:23:15 +00:00
Markos Calderon
5dafac2b25
change long to string
2012-10-01 16:41:33 -05:00
Hugo Lazzari
d9aff81560
New Guest - Now guest isn't a role. You can be a moderator and guest at the time.
2012-09-26 13:14:03 -03:00
Markos Calderon
c878ff5d06
added redirect and clientURL parameters to the API
2012-09-21 16:03:53 -05:00
Prav-Hugo
8e29964f6a
Feature #389 Creation of "guest" role on BigBlueButton
2012-09-12 12:35:06 -03:00
Richard Alam
d9e5c80c6c
- try generating userid instead of using red5 connection id as userid
2012-08-23 19:49:31 +00:00
Markos Calderon
3c7419c5ef
load textfile from the client
2012-07-17 16:39:32 -07:00
Leonardo Crauss Daronco
1f4c32cef3
Added <listenerCount> and <videoCount> to the response of 'getMeetings'.
2012-05-25 14:19:15 -03:00
Leonardo Crauss Daronco
6a5c39d012
Added <participantCount> to the reponse of getMeetings.
2012-04-03 12:04:29 -03:00
Leonardo Crauss Daronco
f6f744cf5e
Removed the tag <isListener> from getMeetingInfo and added a tag <listenerCount>.
...
This is a simpler solution that doesn't require matching a voice conference user with a "normal" user.
2012-02-16 13:48:26 -02:00
Leonardo Crauss Daronco
1d848b1aaa
Added "isListener" to the response of "getMeetingInfo". Had to change bbb-apps, bbb-web and bbb-client to generate and detect events when the user starts/stops its audio. The method used in bbb-client to send the externalUserId can still be improved.
2012-02-16 14:14:23 +00:00
Leonardo Crauss Daronco
8da1535c28
Adding internalMeetingID, isPresenter, hasVideoStream, and videoStreamName to the response of getMeetingInfo.
2012-02-09 12:33:03 -02:00
Richard Alam
a73287ea29
- store logout url into a session to make sure we get a logour url for a user
2012-02-01 23:04:12 +00:00
Richard Alam
742fd24b2d
- redirect to landing page when user refresh the browser and there is no session
2012-02-01 22:11:36 +00:00
Richard Alam
bc54a34736
- test if storing user info in hashmap will cleanup on tomcat6 restarts...on tomcat6 restarts, sessions
...
aren't destroyed which allows users to join the meeting by just refreshing the browser which screws up
bbb-apps state
2012-02-01 20:51:43 +00:00
Richard Alam
456042f74c
- add logging when trying to join session...investigating why we are allowed to refresh
...
browser and join conference after restart of BBB
2012-02-01 19:05:52 +00:00
Markos Calderon
17097c26f7
Merge pull request #23 from gugat/issue1112
...
In Api upload, strip any extension from the presentation directory
2012-01-26 10:37:12 -08:00
Richard Alam
ecc979e274
- generate internal userid to be able to match users across subsytems
2012-01-18 15:46:29 +00:00
gugat
eba253fa04
In Api upload strip any extension from the presentation directory
2012-01-11 14:34:16 -05:00
Richard Alam
9c8aeae213
- if there are no pre-uploaded presentation passed through the api, pre-upload a default presentation
2012-01-10 16:25:46 +00:00
Markos Calderon
ea5331d0c9
now, bbb-web uses the internalUserId
2012-01-09 14:44:14 -08:00
Markos Calderon
c2b0f1588f
fix urlencode in pre upload
2011-11-11 09:23:30 -08:00
Richard Alam
b52f5ae158
make it return the same response as 0.71a (fix isse 1027 http://code.google.com/p/bigbluebutton/issues/detail?id=1027 )
2011-10-02 23:24:00 -04:00
Marco Calderon
d91607b1d8
changes to the length
2011-09-28 12:37:26 -05:00
Marco Calderon
6b7cdd3528
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-09-26 11:38:01 -05:00
Richard Alam
f60023e7c9
Make meeting name optional to not break Moodle 1.9 integration
2011-09-23 19:15:59 -04:00
Marco Calderon
3425db56e7
added voicebridge to getMeetingInfo
2011-09-23 11:04:14 -05:00
Marco Calderon
261707478b
fixed recording time
2011-09-22 12:50:35 -05:00
Richard Alam
1164bb3e8f
- setup logout url when user enters instead of when user leaves because when the user clicks on the OK button
...
on the logout window after one minute, the meeting is gone from bbb-web memory.
2011-09-13 14:34:36 -04:00
Fred Dixon
9e93cc7b86
Removed depreciated message (we can look at this post 0.8)
2011-09-08 17:25:19 -07:00
Marco Calderon
6a47157b22
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-09-06 12:47:35 -05:00
Marco Calderon
b80e4ea5a1
Added CDATA to getRecordings
2011-09-06 12:46:54 -05:00
Richard Alam
ed44841a4c
- handle only pre-upload on first create API call
2011-09-06 11:48:38 -04:00
Marco Calderon
6e41cae223
some fixes in the api
2011-08-31 17:22:10 +00:00
Marco Calderon
2db74d4d06
small fix for invalid password
2011-08-24 19:39:57 +00:00
Marco Calderon
deae7b0d15
fix for errors in api
2011-08-24 16:27:37 +00:00
Marco Calderon
dbd04839ec
added backward compatibility for errors
2011-08-23 19:19:25 +00:00
Marco Calderon
5e457b71d1
initial backward compability for 0.71a
2011-08-23 02:46:37 +00:00
Marco Calderon
18fba79c4c
Added metadata to getMeetingInfo
2011-08-04 23:14:08 +00:00
Richard Alam
8e983345b8
- add property to set timeout for allowing time between creating a meeting and joining a meeting
...
- change default meeting expiration to 1 minute
- trigger ingest and processing when the meeting is removed form memory instead of when the last
user leaves the meeting
2011-07-23 11:13:29 -04:00
Marco Calderon
d32110d36c
api according to the latest spec
2011-06-30 02:33:12 +00:00
Richard Alam
2c65cc9ac2
- fix possible NPE when getting internal id of non-existing meeting
2011-07-20 15:26:19 -04:00
Richard Alam
b9e5b69a20
- add messageId to redis pub/sub messages to be able to filter and identify easily
2011-07-20 11:44:11 -04:00
Marco Calderon
dd57d38fc4
fixed preupload
2011-06-24 21:04:10 +00:00
Marco Calderon
b9ee42b30d
finish demo recording
2011-06-24 16:28:32 +00:00
Marco Calderon
fd8296c183
finish API 0.8... need to update response messages
2011-06-16 18:37:14 +00:00
Marco Calderon
42f4acd250
added setpublish, pending response xml
2011-06-16 14:43:31 +00:00
Marco Calderon
fc55bb8aee
added to check multiple recordings in the call getRecordings
2011-03-08 21:06:04 +00:00
Marco Calderon
625d54e86c
getRecordings call... Need to show metadata values
2011-03-08 09:44:31 +00:00
Marco Calderon
81627bc616
initial cleanup
2011-03-07 20:18:33 +00:00
Richard Alam
15990d2f55
- start hooking the api for recording
2011-06-27 12:52:17 -04:00
Richard Alam
7f4d38b5a6
- process metdata properly and simple playback
2011-06-26 10:56:03 -04:00
Richard Alam
dbfd92bff2
- fix join and create api
2011-06-24 11:09:12 -04:00
Richard Alam
9b3d901e34
- move things around
2011-06-24 10:57:56 -04:00
Richard Alam
c9ad8f15d7
- temporary commit
2011-06-23 17:02:37 -04:00
Richard Alam
f8abc966e9
- fix logout
2011-06-23 14:18:20 -04:00
Richard Alam
8c8e009baa
- unit test passing again
2011-06-23 14:04:00 -04:00
Richard Alam
d044221d70
- start implementing get recording api
2011-06-22 15:53:27 -04:00
Richard Alam
0b6e59e8ab
- add duration parameter on creat API. This allows us to set a limit on the meeting length
...
to prevent continuously recording a meeting whe someone forgets to logout
2011-06-21 14:16:37 -04:00
Richard Alam
140c187fd0
- clean-up
2011-06-20 16:36:41 -04:00
Richard Alam
3b67e6b5ef
- group errors and send them all at once to the caller of the api
...
- make errors consistent
- return back createTime on a create API call
- require createTime parameter on a join API call. This way users with stale join link won't be
able to join a running meeting.
2011-06-20 16:18:57 -04:00
Richard Alam
2454e6b9a1
- add timestamp to internal meeting id. So that the external meeting id can be re-used
...
especially if the meeting is recorded.
2011-06-16 16:45:14 -04:00
Richard Alam
120275071e
- now DI works fine...had to delete bin and target dirs remnants from maven build
2011-06-15 17:28:31 -04:00
Richard Alam
769470e232
- remove jms messages
2011-06-10 15:29:11 -04:00
Marco Calderon
2ac6aaa09a
merge remove-bbb-commons, working prototype, need to add status method to listener
2011-06-09 01:35:24 +00:00
Richard Alam
50dac08e11
- cleanup sign out api
2011-06-01 14:16:35 -04:00
Richard Alam
c6626c7a9a
- write test for get meetings api
2011-06-01 12:42:50 -04:00
Richard Alam
ed1bf9d4f6
- implement test for get meeting info
2011-06-01 12:10:33 -04:00
Richard Alam
8d63e0a717
- continue refactoring bbb-web, renamed a few classes, and change get-meetings-info api
2011-06-01 10:51:40 -04:00
Richard Alam
46a769cf2f
- add test for end api
2011-06-01 02:47:01 +00:00
Richard Alam
c114289042
- add test for isMeetingRunning api
2011-05-31 17:51:07 -04:00
Richard Alam
e3ef2e5f6f
- add isMeetingRunning test
2011-05-31 16:59:04 -04:00
Richard Alam
6f9563b190
- put some steps into own methods
2011-05-31 16:10:31 -04:00
Richard Alam
78adae0696
- join and create api have unit tests
2011-05-31 15:23:44 -04:00
Richard Alam
c40976dab5
- generate default voice conf numbers if none has been passed in the param.
2011-05-31 10:05:09 -04:00
Richard Alam
26f98fe879
- write test for create api
2011-05-30 17:39:03 -04:00
Richard Alam
cfe20900f2
- now has setup for testing
2011-05-30 16:26:11 -04:00
Richard Alam
335fd9591d
- start refactoring bbb-web again...without trying to merge remove-bbb-commons branch
2011-05-30 01:42:50 +00:00
Marco Calderon
245070b366
removed bbb-commons. TODO: update process method and endrequest meeting
2011-05-14 05:56:35 +00:00
Marco Calderon
40cca71b04
added metadata parameter
2011-03-28 12:07:00 +00:00
Marco Calderon
7c2498597b
Added support pubsub for send updates from bbb-apps to bbb-web
2011-03-28 07:19:22 +00:00
Richard Alam
19694d87e0
Merge branch 'master' into record-and-playback-feature
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationHandler.java
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
2011-04-04 11:15:09 -04:00
Richard Alam
a1d983f204
- disable redis pubsub
2011-03-22 10:19:16 -04:00
Marco Calderon
0fdb2d4875
some changes in bbb-web and bbb-apps for pubsub
2011-02-22 17:13:00 +00:00
Richard Alam
8d895d7417
- add temp way to trigger ingest and processing
2011-02-11 15:31:34 -05:00
Jeremy Thomerson
7a236a6809
downloading and processing of files works for urls and encoded files
2011-01-25 17:28:57 -06:00
Richard Alam
0f82ae3e26
- add getters and setters
2011-01-19 11:36:48 -05:00
