BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,158 Commits 13 Branches 260 Tags 1.1 GiB
48e5f5f638
Commit Graph

288 Commits

Author SHA1 Message Date
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
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
Calvin Walton
9deb87d0b0 web: check that meeting is running before allowing presentation upload 2015-05-27 15:08:04 -04: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
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
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
1ea57596d0 Merge branch '090-audio-video-on-api' into HEAD 2015-01-23 15:05:18 -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
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
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
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
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