Richard Alam
561c5d88e5
- add instructions on how to convert old message to new message
2017-06-05 07:36:55 -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
5fed6779d4
- enable logging of akka system in bbb-web
2017-06-02 09:35:24 -07:00
Richard Alam
240176ca32
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web
2017-05-27 18:30:50 -07:00
Richard Alam
e56a758c5f
- send create message from bbb-web
2017-05-24 15:19:03 -07:00
Ghazi Triki
7d283cd154
Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x
...
# Conflicts:
# bigbluebutton-client/resources/config.xml.template
# bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
# bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
# record-and-playback/core/scripts/rap-process-worker.rb
2017-05-22 17:35:24 +01:00
Ghazi Triki
a5482b506d
Revert text object conversion threshold to 2000
2017-05-22 10:27:11 +02:00
Richard Alam
82371a41de
- try to start system
2017-05-19 19:27:09 -07:00
Richard Alam
6b14d31853
- wire up bbb-web
2017-05-19 19:13:25 -07:00
jfederico
a4b0cb7436
bbb-web: Fixed issue in getRecordings not responding the meetingID correctly
2017-05-19 15:11:08 +00:00
Ghazi Triki
f5366fbc88
Update document conversion threshold values with lower values.
2017-05-11 17:03:24 +01:00
Richard Alam
9a628da93d
- remove bbb-commons-message dependency
2017-05-10 17:21:55 -07:00
Richard Alam
b55beeb8fa
- wire up redis publisher
2017-05-10 14:37:14 -07:00
Richard Alam
76a6d99ca3
- move java classes from bbb-web into bbb-common-web
2017-05-10 13:22:50 -07:00
Pedro Beschorner Marin
d4b6fb1158
Removed bbb-web a domain file that was already moved to bbb-common-web
2017-05-04 15:24:06 +00:00
Pedro Beschorner Marin
66a12c9c7a
Moving the meeting life cycle management from bbb-web to akka-apps
2017-05-03 17:02:16 +00:00
Richard Alam
61d7b18345
- remove reconnect number in userId
2017-04-28 14:21:59 -07:00
Richard Alam
e89c832c8a
Merge branch 'master' into bbb-2x-mconf
2017-04-25 07:40:30 -07:00
Richard Alam
011ebd7e81
Merge pull request #3847 from ritzalam/add-catch-all-exception
...
Add catch all exception to bbb-web redis subscriber
2017-04-24 17:51:03 -04:00
Richard Alam
5126e40762
- spell the word correctly
2017-04-24 20:46:43 +00:00
Richard Alam
4c32f130df
- minimize logging
2017-04-24 20:43:11 +00:00
Richard Alam
80e3c7eabb
Add catch all exception to bbb-web redis subscriber
...
On redis-cli, we noticed that BbbWebSub isn't on the "client list". The auto-reconnect on bbb-web
wasn't triggered as not log was generated in bbb-web.log. Maybe the exception was something we
did not handle. Try catching all exception on this jedis connection.
2017-04-24 20:20:39 +00:00
Richard Alam
69ba485fcc
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf
2017-04-21 08:12:56 -07:00
Ghazi Triki
8142031afe
Faster PDF pages counting by replacing "pdf2swf" command with "pdfinfo".
2017-04-20 18:02:31 +01:00
Ghazi Triki
1255e41758
Fallback again to 72 DPI PNG for complex PDF pages.
2017-04-20 13:44:58 +01:00
Ghazi Triki
3ff28e3e9d
Rename GhostscriptPageExtractor to PageExtractorImp.
2017-04-19 19:10:14 +01:00
Ghazi Triki
466c931b92
Remove usage of GhostScript and replace it by pdftocairo and pdfseparate.
2017-04-19 16:30:46 +01:00
Richard Alam
a9590976c2
- allow setting default guest policy for meeting
2017-04-18 19:45:32 +00:00
Ghazi Triki
106dbb3275
Clean dependencies for bigbluebutton-web.
2017-04-18 17:16:57 +01:00
Richard Alam
b8de0c9231
- add authorized role to registered user
2017-04-17 21:23:17 +00:00
Richard Alam
262c7250c8
Merge branch 'master' with bbb-mconf
2017-04-17 15:57:31 +00:00
Ghazi Triki
bc898c145a
More fine tuning for document conversion fall-back.
2017-04-17 15:35:29 +01:00
Ghazi Triki
a2644c430c
Improve the document conversion fallback logic by merging the pdf page extraction and image conversion using 'convert' to a single step page to image conversion using 'gs'. Anti-aliasing for text and shapes is also improved.
2017-04-13 18:29:33 +01:00
Ghazi Triki
0ef12cd076
Delete the initially converted swf to be sure that if fallback convertion does not work we get the blank swf loaded.
2017-04-12 18:17:08 +01:00
Richard Alam
7c9c09b5b0
Cleanup
...
- remove extra > on meeting name on getRecording API response
2017-04-11 17:22:54 +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
Richard Alam
ced8c23387
- escape all user passed strings
2017-04-03 18:48:28 +00:00
Pedro Beschorner Marin
84fd8d4101
Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images!
2017-04-03 17:06:16 +00:00
Richard Alam
c99de6c4db
- display length of recording in minutes instead of milliseconds
2017-03-31 19:54:51 +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
Richard Alam
fcca81783e
- escape image alt attribute as it's breaking xml format in some metadata.xml
2017-03-28 20:16:26 +00:00
Richard Alam
7fdbc5b293
- try fix broken get recording api call
2017-03-28 19:32:01 +00:00
Richard Alam
364f781104
- fix issue where GetRecordings API was failing because support of old metadata.xml broke.
2017-03-27 21:10:24 +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
b3787c411e
- remove control chars from meeting name param on create api request
...
- return an error if external meeting id contains comma (,) on create api request
2017-03-16 20:34:44 +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
6f6ca61077
- store breakout metadata and breakout rooms into redis
2017-03-10 19:40:33 +00:00
Richard Alam
71bcd779b7
- process breakout rooms in events.xml and metadata.xml
2017-03-09 23:01:15 +00:00
Richard Alam
adffa8d673
- build getMeetings and getMeetingInfo responses using freemarker
2017-03-09 20:32:14 +00:00
Richard Alam
217b70bce2
Merge pull request #3711 from ritzalam/synchronize-create-meeting
...
Synchronize create meeting
2017-03-07 13:41:11 -05:00
Richard Alam
1a2bd4d74d
- add delay to processing of presentation to make sure that meeting has already been
...
created. This makes sure that the meeting is able to handle the presentation
processing events.
2017-03-06 20:05:26 +00:00
Fred Dixon
c28c78a405
Minor updates for release -- bumped the API version
2017-03-06 13:57:54 -06: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
34e569c8e1
Increased PDF2SWF timeout for some PDF files containing a lot of elements.
2017-02-23 10:48:02 +01:00
alexandre
f39874ac9b
Returning number of users that participated in each meeting in getRecordings call
...
Resolves #3623
2017-02-10 16:19:32 -02:00
Richard Alam
19f29e8bec
Merge pull request #3616 from riadvice/detect-heavy-to-convert-pptx
...
Avoid converting some pptx files with certain properties and inform the user.
2017-02-06 13:22:39 -05:00
Ghazi Triki
dfbf8c8c0a
Avoid converting some pptx files with certain properties and inform the user.
2017-01-30 19:50:10 +01:00
Pedro Beschorner Marin
32cab1bcab
Escaping Java's properties file instructions
2017-01-27 12:58:45 +00:00
Ghazi Triki
2e3bb4754d
Fixed typos in webcamsOnlyForModerator naming.
2017-01-04 19:02:17 +01:00
Ghazi Triki
4c4d768883
Added new "webcamsOnlyForModerator" parameter for create meeting API.
2017-01-02 16:56:32 +01:00
Calvin Walton
b2c1f00356
Merge pull request #3472 from jfederico/fix-recording-preview-alt-error
...
record-and-playback: Fixed issue with text gathered from slids used o…
2016-12-07 11:30:59 -05:00
Fred Dixon
21b953bc7c
Removed carriage returns from bigbluebutton.properties
2016-11-28 17:21:36 -06:00
jfederico
96c8109732
bbb-web: Fix bug that was breaking getRecordings in test-install
2016-11-17 16:39:03 -05:00
Richard Alam
fa16d266b9
- add more logging to track issues
2016-11-10 22:35:06 +00:00
jfederico
dd1fb9e6ac
bbb-web: Escaped strings used in freemarker template for thumbnails
2016-11-07 18:55:27 +00:00
Pedro Beschorner Marin
1e014f9298
Included metadata reading at server. Setting meeting timeleft and deadline as meta_inactivity-timeleft and meta_inactivity-deadline on create params
2016-10-31 16:51:07 +00:00
Ghazi Triki
1c45633028
Lower SWF conversion threshold from 2500 to 2000 for text objects.
2016-10-26 14:36:27 +01:00
Richard Alam
662218a96f
- getmeetinginfo is throwing exception
2016-10-25 20:47:04 +00:00
Richard Alam
ece6edcb12
- fix check for breakout room
...
- insert breakout metadata into events.xml
- delete breakout metadata from redis
2016-10-21 19:05:30 +00:00
Ghazi Triki
638b6d0433
Store breakout meeting info in redis under "meeting:breakout" key instead of "meeting:info"
2016-10-14 16:59:22 +01:00
Ghazi Triki
e187634c2a
Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room.
2016-10-14 16:33:17 +01: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
bf5de153a0
Deleted unused imports from bigbluebutton-apps and bigbluebutton-web
2016-10-12 20:24:51 +01:00
Ghazi Triki
a80b6d9c45
Replace the deprecated shaHex DigestUtils by sha1Hex.
2016-10-12 20:20:37 +01:00
Ghazi Triki
ff9bc17c15
Send sequence number when creating breakout rooms and correctly generate a unique externalMeetingId for breakout rooms.
2016-10-12 19:55:20 +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
b10237ebad
Upgrade commons-codec dependency version to 1.10
2016-10-05 17:29:37 +01:00
Ghazi Triki
27fd992294
Handle non PDF slide conversion for breakout rooms.
2016-10-03 17:39:02 +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
Fred Dixon
ce4ef05c21
Merge pull request #3388 from jfederico/extension_preview_for_thumbnails_on_recordings
...
Extension preview for thumbnails on recordings
2016-09-30 17:17:48 -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
Ghazi Triki
7b6abc1dbe
Reverted deleted methods from PresentationUrlDownloadService.java
2016-09-29 18:46:31 +01:00
Ghazi Triki
0e72d7523d
Make breakout rooms use the selected slide of the current presentation as default presentation.
2016-09-28 22:19:48 +01:00
Ghazi Triki
87b4b8ca07
Update nuprocess version to 1.1.0
2016-09-28 17:40:10 +01:00
jfederico
039d85fe5c
bbb-web: Added internalMeetingID to xml response from create and getMeetings
2016-09-27 15:27:28 -04:00
Ghazi Triki
4f01dd5c00
Generated PDF pages are now saved under "pdfs" directory under the presentation directory instead of the "tmp" directory under "svgs" directory.
2016-09-27 17:29:02 +01:00
jfederico
36dfbe7088
bbb-web: Added validation to freemarker template to verify image elements are included when extension preview used
2016-09-24 10:59:26 -04:00
jfederico
0506db4f26
bbb-web: Fixed issue with publish/unpublish removing extensions from metadata.xml
2016-09-24 10:54:09 -04:00
jfederico
6839ffeb15
bbb-web: removed text element from extension preview
2016-09-22 13:11:27 -04:00
jfederico
d567254b9c
bbb-web: Updated internal xml example for a recording descriptor
2016-09-22 10:05:21 -04:00
jfederico
870e9d5b79
bbb-web: Modified freeMarker template for adding support to alt text per slide on previews
2016-09-21 16:43:11 -04:00
Pedro Beschorner Marin
694c9564a5
Added record_id to redis recording events
2016-09-21 20:12:57 +00:00
Pedro Beschorner Marin
49d5f9c41c
Refactored redis recording events
2016-09-21 16:32:11 +00:00
jfederico
8adf729e0f
recording-and-playback: Added general text to the preview
2016-09-20 16:46:45 -04:00
jfederico
e94fcf8d01
bbb-web: Fixed getRecording freemarker template, it works even if preview images have no attributes
2016-09-19 17:40:29 -04:00
jfederico
48fc5d6458
bbb-web: Fixed issue in freemarker template so get recording support extension preview with one or multiple images
2016-09-16 15:12:27 -04:00
jfederico
a995979ce5
bbb-web: Refactored Extension converting attributes to properties
2016-09-16 15:11:58 -04:00
jfederico
1e092eaff9
Adjusted freemaker template and parser to support attributes on preview extension
2016-09-16 12:20:30 -04:00
jfederico
4a6b6c6eec
bbb-web Modified domain for adding support to Extensions in recordings
2016-09-15 14:03:28 -04:00
Richard Alam
591fe8eff8
- changing config.xml requires a bbb restart. Do not cache the config.xml but read it each request.
2016-09-13 21:43:06 +00:00
Richard Alam
310ec81345
- propagate meeting metadata from parent to breakout room
2016-08-31 19:34:07 +00:00
jfederico
3058564ae1
bbb-web: Fixed issue with registeredUser map not cleaned up
2016-08-29 13:53:50 -04:00
Ghazi Triki
c41483448c
Make breakout rooms inherit the welcome message template of their parent room.
2016-08-23 15:40:43 +01:00
Fred Dixon
d0638df437
Merge pull request #3275 from jfederico/bbb-web_fixMaxParticipants-by-tracking-joins-III
...
bbb-web: Set defaultMaxUsers=0 in bigbluebutton.properties
2016-08-12 14:34:24 -04:00
Anton Georgiev
9fb1c343f2
server side changes for switching recordType:String to record:Boolean
2016-08-11 21:30:06 +00:00
jfederico
aac104c77d
bbb-web: Set defaultMaxUsers=0 in bigbluebutton.properties
2016-08-09 15:24:46 -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
Richard Alam
8a57a7c75c
Merge branch 'bbb-web_fix-configXML' of https://github.com/jfederico/bigbluebutton into jfederico-bbb-web_fix-configXML
2016-08-02 15:19:03 +00:00
jfederico
7c0b0a3856
bbb-web: Log error message on invalid
2016-07-28 15:46:44 -04:00
Ghazi Triki
7d2cef9b9f
Added recording options for breakout rooms.
2016-07-25 22:31:04 +01: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
Richard Alam
7882735076
Record breakout rooms
...
If the parent meeting is recorded, record also the breakout rooms.
2016-07-18 17:07:31 +00: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
Pedro Beschorner Marin
78313fda46
Merge remote-tracking branch 'rafael/feature-1944' into rafafp-branches-merged-1.0
2016-06-22 14:23:59 +00:00
Pedro Beschorner Marin
e47cd67903
Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0
...
Conflicts:
bbb-video/build.gradle
bbb-voice/build.gradle
bigbluebutton-apps/build.gradle
bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/build.xml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
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/RecordingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
deskshare/app/build.gradle
deskshare/build.gradle
2016-06-20 16:11:04 +00:00
Felipe Cecagno
eed8a390c7
Merge branch 'issue-257' into mconf-live0.7.5
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
2016-06-10 17:51:27 -03:00
Felipe Cecagno
78fb35833d
refactor the way bbb-web publishes on redis the events of publish, unpublish and delete of recordings
2016-06-10 17:48:09 -03: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
7ae9b7b204
Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-fsesl/build.sbt
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
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/Util.java
bigbluebutton-apps/build.gradle
bigbluebutton-web/grails-app/conf/spring/resources.xml
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-05-20 20:27:52 +00: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
875ad47aaf
bbb-web: Fix for race condition that causes the maxParticipants filter to fail (registeredUser now tracks the timestamp instead of Date)
2016-05-19 10:31:59 -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
Anton Georgiev
228dfb4061
Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-apps/src/main/resources/application.conf
akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-fsesl/build.sbt
bbb-common-message/build.sbt
bbb-fsesl-client/build.sbt
bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
bigbluebutton-apps/build.gradle
bigbluebutton-client/build.xml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-html5/app/client/NotificationControl.coffee
bigbluebutton-html5/app/client/globals.coffee
bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
bigbluebutton-html5/app/client/main.coffee
bigbluebutton-html5/app/client/main.html
bigbluebutton-html5/app/client/stylesheets/whiteboard.less
bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
bigbluebutton-html5/app/client/views/modals/settings.coffee
bigbluebutton-html5/app/client/views/modals/settings.html
bigbluebutton-html5/app/client/views/users/user_item.coffee
bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
bigbluebutton-html5/app/collections/collections.coffee
bigbluebutton-html5/app/config.coffee
bigbluebutton-html5/app/lib/router.coffee
bigbluebutton-html5/app/server/collection_methods/meetings.coffee
bigbluebutton-html5/app/server/collection_methods/users.coffee
bigbluebutton-html5/app/server/publish.coffee
bigbluebutton-html5/app/server/server.coffee
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
record-and-playback/presentation/scripts/process/presentation.rb
record-and-playback/presentation/scripts/publish/presentation.rb
2016-05-18 15:14:04 +00: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
Chad Pilkey
24c6d48dc2
removing files that should not have been committed
2016-05-02 12:45:25 -07:00
maxdoumit
e00ca4f184
Update build.gradle
...
Change the build.gradle to make is work with gradle 2.12
2016-04-28 14:38:06 -05:00
Richard Alam
b86f32b8c1
Sync with upstream repository
...
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2016-04-26 20:01:20 -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
Ghaz Triki
11d86f6aa8
Merge 'branch air-ui' into 'mobile-client'
2016-04-26 09:19:17 +01:00
David Feng
67c14f9056
This enable avatar to be display in other participants video window
2016-04-20 14:08:13 +08:00
Fred Dixon
7dc0871a28
Change from 1.0.0-Beta to 1.0.0-RC
2016-04-13 17:14:40 -04:00
RafaFP
de36cce0f8
created an intermediate step in order to have API end and client endMeeting to work in the same way
...
refs #1944
2016-03-30 21:29:43 +00:00
Richard Alam
7d5c9d63e4
Upgrade to Java 8
...
Upgrade to Java 8 and merge screenshare feature.
Conflicts:
bigbluebutton-client/.actionScriptProperties
2016-03-21 20:19:48 +00: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
Felipe Cecagno
506acc0e61
fix wrong path while unpublishing recording
2016-03-20 22:56:57 -03:00
Felipe Cecagno
d56230a948
fix getRecordings issue caused by the recording size when the record is unpublished
2016-03-20 20:17:03 -03:00
Felipe Cecagno
26c6e7d32e
add processingTime to the getRecordings API call
2016-03-08 19:42:56 -03:00
Felipe Cecagno
9e4156bf26
fix getRecordings issue caused by the recording size when the record is unpublished
2016-03-08 19:42:18 -03:00
Anton Georgiev
e834637b5a
upgrade grails from 2.3.6 to 2.5.2
2016-03-08 21:43:35 +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
Anton Georgiev
7480243f4d
edits to stun/turn info
2016-02-18 19:39:53 +00:00
Anton Georgiev
cdf1ee0729
add a request/reply for stun/turn info
2016-02-17 18:36:17 +00:00
Ghaz Triki
b08ebb308a
Fixe the case where the breakout room document conversion is triggered before the actor is brought to life.
2016-02-16 17:45:42 +01:00
jfederico
932f66e47b
bigbluebutton-web: Prevented apiController to crash if in a getRecordings request the metadata.xml fiel doesn't exist
2016-02-12 12:48:26 -05:00
jfederico
3bb127ed88
bigbluebutton-web: Validated nulls and empty strings in new template for getRecordings
2016-02-12 12:07:20 -05:00
Felipe Cecagno
bfb2560374
close stream while reading filesystem for getRecordings
2016-02-11 17:07:43 -02:00
jfederico
f92200c692
bigbluebutton-web: On changeState, create the directory named by the pathname, including any necessary but nonexistent parent directories.
2016-02-08 16:59:38 -05:00
jfederico
c40f499b94
bigbluebutton-web: Closed DirectoryStream after the directory is processed
2016-02-08 16:48:40 -05:00
Richard Alam
40ba49113e
- fix issue 2812 by setting end time when last user leaves
2016-02-04 22:40:06 +00:00
Richard Alam
c31857b9da
Merge pull request #3001 from bigbluebutton/getRecordings-merged-enhancements
...
Get recordings merged enhancements
2016-02-04 17:01:03 -05:00
Richard Alam
1e0be140a2
Change API version to 1.0
2016-02-04 14:43:59 -05:00
Felipe Cecagno
6414d94c1c
add download and size/rawSize tags on getRecordings response
2016-02-03 19:09:44 -02: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
84bac52c57
Removed identation whitespaces of get-recordings XML when building it.
2016-02-03 13:51:44 -02:00
Pedro Beschorner Marin
38130c8a66
Added CDATA fields to FreeMarker template
2016-02-03 13:51:43 -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
Felipe Cecagno
cbaee9d990
try to speedup getrecordings, could reduce from 35s to 25s, but it's still not enough; need to better understand where's the bottleneck
2016-02-03 13:47:14 -02:00
jfederico
84e4221c47
bigbluebutton-web: Extended filterRecordingsByMetadata in order to support wildcards
2016-02-01 15:08:51 -05:00
jfederico
f6453e3bc4
bigbluebutton-web: Removed methods not used after refactoring
2016-02-01 10:22:17 -05:00
jfederico
ab6db94d9a
bigbluebutton-web: Refactoring some methods in RecordingService for reducing duplication
2016-01-29 18:32:39 -05:00
jfederico
f23158ccd7
bigbluebutton-web: Fixed issue with recordings not publishing/unpublishing
2016-01-29 13:36:24 -05:00
jfederico
87eee3746f
bigbluebutton-web: Added state to the new xml template
2016-01-29 11:03:07 -05:00
jfederico
e12d3fa639
Cleaned up ApiController after merge
2016-01-29 10:24:30 -05:00
jfederico
440bc6ece7
Cleaned up merge conflicts in RecordingService.java
2016-01-28 16:59:16 -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
de1ee8575d
Reformatted files in conflict
2016-01-28 14:03:57 -05:00
jfederico
2f3bd5b3ce
Reformatted files with conflicts
2016-01-28 13:58:05 -05:00
Jesus Federico
a0702903eb
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2016-01-28 09:06:53 -08:00
jfederico
9941668094
Updated .gitignore and removed config files specific for eclipse from bigbluebutton-web
2016-01-28 12:05:13 -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
Pedro Beschorner Marin
23f9d226cc
Removed identation whitespaces of get-recordings XML when building it.
2016-01-27 18:00:49 +00:00
Ghazi Triki
8b503b3676
Fixed variable name in getMeetingInfo API method.
2016-01-27 18:38:40 +01:00
Ghazi Triki
62a721b310
Update gson library version to 2.5 for all server projects.
2016-01-27 16:44:22 +01:00
Pedro Beschorner Marin
5e79f26709
Added CDATA fields to FreeMarker template
2016-01-27 14:52:22 +00:00
Pedro Beschorner Marin
3cb59b8951
FreeMarker template in a separated file
2016-01-27 14:27:06 +00:00
Ghazi Triki
0385d05001
Merge branch 'master' into breakout-rooms-porto-algre-2015
...
# Conflicts:
# akka-bbb-apps/build.sbt
# akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
# akka-bbb-fsesl/build.sbt
# bbb-common-message/build.sbt
# bigbluebutton-apps/build.gradle
# bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
2016-01-27 14:16:05 +01:00
jfederico
7ef3e62940
bigbluebutton-web: The statuses processing and processed can be returned by getRecordings
2016-01-26 17:17:28 -05:00
Felipe Cecagno
2a3b95daf7
Merge remote-tracking branch 'bigbluebutton/master' into mconf
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-config/bin/bbb-conf
2016-01-26 18:33:31 -02:00
Pedro Beschorner Marin
6307b47ba8
Creating getRecordings XML response with FreeMarker
2016-01-26 18:59:36 +00:00
Ghazi Triki
afcc925380
Added missing message EndBreakoutRoom
2016-01-25 16:59:06 +01:00
Felipe Cecagno
e5b5669663
try to speedup getrecordings, could reduce from 35s to 25s, but it's still not enough; need to better understand where's the bottleneck
2016-01-25 14:49:33 +00:00
Ghazi Triki
4f30127003
Ending a breakout room message goes to to bbb-web to be handled then send the response back to the client trgouh akka-apps and bbb-apps.
2016-01-23 18:44:50 +01:00
jfederico
2c214cafac
bigbluebuttonbn-web: Implemented filter for recordIDs [id:eq:xxxx,yyyy,zzzz]
2016-01-22 18:16:47 -05:00
RafaFP
19bae41130
Added redis messages for the events of Publish, Unpublish and Remove recordings triggered by the API calls.
...
refs #1693
2016-01-22 20:47:34 +00: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
Richard Alam
e7a46aa3cf
- cleanup formatting
2016-01-21 17:31:25 +00:00
Richard Alam
0b898d0d29
- change how we process upload presentation. Before, an uploaded presentation consumes all of the
...
presentation conversion threads. If the presentation takes a lot of time and cpu to convert,
other uploaded presentations gets queued up and cannot be processed in parallel.
2016-01-21 17:24:13 +00:00
jfederico
65a2b6d16c
bigbluebutton-web: Implemented the new state [deleted] for recordings
2016-01-21 11:12:33 -05:00
jfederico
ca88c05dde
bigbluebutton-web: corrected identation to RecordingService.java
2016-01-19 15:50:12 -05:00
jfederico
2abb0acbc1
bigbluebutton-web: Updated state when recording is published/unpublished
2016-01-19 15:39:10 -05:00
jfederico
91b0e54600
bigbluebutton-web: RecordingService process a new directory 'deleted' that represents a new state for processed recordings
2016-01-19 15:19:36 -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
jfederico
374982254e
bigbluebutton-web: Modified Config.groovy to allow log messages from controllers and services to be shown
2016-01-19 15:02:39 -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
jfederico
52b171584f
bbb-web: Added WebXmlConfig.groovy in order to remove warning on plugins:webxml:1.4.1
...
https://grails.org/plugin/webxml
2016-01-14 16:33:16 -05:00
jfederico
e47c1895a8
bbb-web: Removed non used plugin (jquery) and updated the other plugins for eliminating WARNING messages
2016-01-14 16:05:25 -05: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
Richard Alam
16499b3da1
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-master-into-ghazi
...
Conflicts:
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-fsesl/build.sbt
bigbluebutton-web/build.gradle
2016-01-07 22:58:04 +00: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
8f08e13dcc
Merge remote-tracking branch 'bigbluebutton/master' into mconf
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
2015-12-30 18:35:13 -02:00
Ghazi Triki
e0dd7a174f
Added missing Pdf2PngPageConverterHandler class.
2015-12-18 19:33:38 +01:00
Ghazi Triki
b51dbd94b5
Updated faulty PDF file conversion mechanism. Now, we go through the following process:
...
- Extract the PDF page to a single PDF file.
- Convert the PDF file to a PNG image.
- Conert the PNG image to a SWF file.
2015-12-17 20:47:05 +01:00
Felipe Cecagno
ad7e3999e7
include size for the download formats on the getRecordings api call
2015-12-17 13:37:02 -02:00
Ghazi Triki
3c236b2b6a
Revert back pdf2swf conversion option to 'poly2bitmap'
2015-12-11 09:12:47 +01:00
Ghazi Triki
febc7ca9ea
- Implemented a new logic for detecting heavy converted swf files from PDF, using obejct placements, text and bitmap count.
...
- pdf2swf conversion fallback to 'bitmap' instead of 'poly2bitmap' to garantee that file can be opened fast with flash player.
2015-12-10 19:58:21 +01:00
Felipe Cecagno
1dc6a675e4
use BigInteger to calculate the recording size
2015-12-09 23:42:22 -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
Ghazi Triki
b50badc886
Renamed "swfdump" to "swfdumpfx" to avoid any collision with any existing install of SWFTools or Flex SDK.
2015-11-26 21:58:14 +01:00
Ghazi Triki
1da0bfe503
Inject maxSwfShapes to SwfAnalyser class.
2015-11-26 21:35:51 +01:00
Ghazi Triki
57eda6e54b
Improved issue detection in presentation generated SWF files.
2015-11-26 19:34:50 +01:00
Ghazi Triki
9d6f04ed16
Added SwfAnalyser to check the converted swf result.
2015-11-25 21:29:05 +01: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
Ghazi Triki
47f8a7c493
Fixed destination file command parameter for Pdf2Swf page conversion.
2015-11-24 17:01:47 +01:00
Ghazi Triki
98e966bef1
Fixed NuProcessBuilder use for the second command in Pdf2SwfPageConverter.
2015-11-24 16:52:21 +01:00
Ghazi Triki
ce31bdd369
Pdf2SwfPageConverter is now using NuProcess library instead of the native Java Process.
2015-11-24 16:47:24 +01:00
Felipe Cecagno
ee357aa7ac
fixed the issue on the retrieving of the download size by bbb-web
2015-11-24 13:21:47 -02:00
Ghazi Triki
6e9b95e347
BreakoutRoomStarted event finally arrives to the client.
2015-11-20 19:06:11 -02:00
Ghazi Triki
bc18e92601
fixed do not create a new internal meeting id for breakout rooms
2015-11-20 12:32:39 -02:00
Richard Alam
9e3f0fb2b6
- do not create a new internal meeting id for breakout rooms
2015-11-18 04:57:32 -05:00
Ghazi Triki
7989b897f3
Create breakout room and send the message to akka-bbb-apps
2015-11-19 16:54:06 -02:00
Ghazi Triki
5a6266e395
bbb-web sends back the breakout room created event to bbb-akka-apps
2015-11-19 12:33:00 -02:00
Ghazi Triki
b299e3fd50
Accept processing RequestBreakoutJoinURL message in akka-bbb-apps
2015-11-18 18:20:56 -02:00
Ghazi Triki
ef23cacefa
Breakout room feature server updates.
2015-11-18 16:45:46 -02:00
Ghazi Triki
3c6586749f
Updated gson library dependency to version 2.4
2015-11-18 14:35:32 -02:00
Ghazi Triki
b3951dc4af
Added bin folder to bigbluebutton-web/.gitignore
2015-11-03 21:49:21 +01:00
Richard Alam
5c6ab0422e
- fix compile issue
2015-11-03 20:14:40 +00:00
Richard Alam
b899eeebcf
- distinguish breakout rooms in create meeting request
2015-10-22 19:36:20 +00:00
Richard Alam
cecbc46d1d
- create breakout room in bbb-web
2015-10-22 17:13:53 +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
9d04103225
- start implementing create breakout room
2015-10-21 15:47:49 +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
3db1299059
- start implementing breakout room messages
...
- use class to serialize/deserialize JSON
- add test to message classes
2015-10-15 23:05:19 +00:00
Richard Alam
fa72b06500
Merge pull request #2826 from riadvice/presentation-upload-status
...
Presentation upload returns a 200 HTTP status.
2015-10-09 12:48:57 -04:00
Richard Alam
c995a7a587
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into support-multiple-logins
2015-10-08 14:34:02 +00:00
Richard Alam
d89a34209d
- make presentation api use session
2015-10-07 21:44:01 +00:00
Ghazi Triki
3078f8ea40
Setting the correct number of builder analysed pages in sendFailedToCountPageMessage of paPdfToSwfSlidesGenerationService, the value should be is set from the CountingPageException not from UploadedPresentation.
2015-10-07 22:12:33 +01: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
2f4eae512f
- cleanup more logs
2015-09-23 21:01:53 +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
a63a211143
- change poll config for jedis
...
- attempt to reconnect redis pubsub subscriber if disconnected
2015-08-23 07:09:00 -04:00
Richard Alam
0e2e79fce8
- change redis pool config
...
- reconnect to redis if connection to subscribe disconnected
2015-08-23 04:56:30 -04:00
Richard Alam
46ba98f737
- add ping/pong message between different components to verfiy that we have working path
2015-08-20 20:44:40 +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
15a368f444
- remove some printlns to lessen noise
2015-08-07 21:37:16 +00:00
Richard Alam
3357529104
- update properties file
2015-08-07 19:48:27 +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
93f129c363
- remove user sessions when a user calls the JOIN API but actually fails to join the meeting.
...
Not removing the user sessions results in OOM after a while.
2015-08-07 10:00:24 -03: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
5444c4fd62
- remove user sessions when a user calls the JOIN API but actually fails to join the meeting.
...
Not removing the user sessions results in OOM after a while.
2015-08-04 22:35:34 +00: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
Richard Alam
514055cf14
- removing extensions element from getRecordings call. See if this is causing memory to hang around.
2015-07-23 21:27:06 +00:00
Maxim Khlobystov
5f491bf43b
Cleaning up.
2015-07-15 16:58:15 -04:00
Maxim Khlobystov
b08f82542d
Made HTML5 client handle presentations uploaded as a single image.
2015-07-13 19:00:46 -04:00
Maxim Khlobystov
ce17feef7d
Set decent resolution for the SVG files.
2015-07-08 14:01:51 -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
cf1c6390be
Made SVG images accessible by HTML5 client.
2015-07-06 14:26:13 -04:00
Maxim Khlobystov
16314d5edd
Started generating SVG images for HTML5 client instead of PNG.
2015-07-03 12:20:37 -04:00
Richard Alam
60d01a450b
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into cleanup-webcam-stream-in-bbb-video
2015-06-30 17:36:45 +00:00
Jesus Federico
9e51241b08
Added support for POST requests to getRecordings and getMeetings
2015-06-29 18:18:39 -04:00
Pedro Beschorner Marin
cbfe8b8859
Added an update script for sizes injection in old recordings metadata and some refactoring
2015-06-10 17:07:11 +00:00
Richard Alam
3e53b5ab08
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-akka-fs-and-akk-apps
2015-06-09 19:38:46 +00:00
Pedro Beschorner Marin
6ef2bf6b27
Getting playback and full meeting published sizes
2015-06-09 14:39:35 +00:00
Jesus Federico
bb95ec52e8
Added null validation to the querystring in the checksum calculation
2015-06-08 10:23:56 -04:00
Richard Alam
e72a828628
- get users in voice conference when meeting is started
2015-06-05 21:57:26 +00:00
Richard Alam
70f725ef93
- add keep alive monitoring of bbb-apps
2015-06-05 19:49:36 +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
a4993bbeb1
Merge branch 'welcome-server-url' into mconf-live0.6.3
2015-05-26 21:15:14 -03:00
Felipe Cecagno
91a342c816
process keyword %%SERVERURL%% and replace it by the server URL, same value configured on bigbluebutton.properties
2015-05-26 21:14:57 -03: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
2a5f4ebedb
cleanup; reverted the implementation which avoid the user to join twice using the same internal user id because the enter call was modified to change the internal user id everytime it's called; reverted a few files with different line endings than the original; merged properly the html5 client code
2015-05-17 23:08:41 -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
3f7f19fe6f
Fix "cannot find symbol Date" on bbb-web
2015-05-05 12:55:21 -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
b24debe225
more cleanup
2015-04-20 23:39:02 -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
Chad Pilkey
ec6dffea13
Merge pull request #589 from OZhurbenko/fix-issue-1889
...
Cleaninig
2015-03-25 17:36:24 -04:00
Oleksandr Zhurbenko
98bd277324
Cleaninig
2015-03-25 14:34:01 -07:00
Richard Alam
8bfdd5a5f7
Merge pull request #586 from OZhurbenko/fix-issue-1889
...
Fix issue 1889
2015-03-25 17:22:14 -04: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
Mateus Dalepiane
dcb7e19651
Set pdf2swf target Flash version to 7 to support Adobe AIR
...
When generating swf files for later versions of Flash pdf2swf will insert an
unsupported command "allowDomain" into the generated swf files.
2015-03-20 13:06:16 -03:00
Felipe Cecagno
71313059e0
Merge branch 'meeting-created-params' into meeting-created-params-master
2015-03-20 12:39:17 -03:00
Felipe Cecagno
6bab3adf61
Merge branch 'meeting-created-params' into mconf-live0.6.2
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/Constants.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.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/OutMessages.scala
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/Constants.java
2015-03-20 12:37:58 -03:00
Mateus Dalepiane
514f2b928d
Adding information to create_meeting_request event [Bug #1429 ]
...
This information is necessary so bbb-apps can send with the
meeting_created_message event
2015-03-20 12:32:43 -03: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
e1d66c9e15
- fix https://code.google.com/p/bigbluebutton/issues/detail?id=1898
2015-03-18 17:51:40 +00:00
Fred Dixon
c4bfaa7c5b
Merge pull request #546 from kepstin/stun-turn-js
...
Fix timestamp calculation generating turn server credentials
2015-03-05 16:45:40 -05:00
Calvin Walton
0a6d03ca79
TURN: The timestamp is actually the expiry time
...
Make sure to add the TTL to the current time, so the generated expiry
time is in the future.
2015-03-05 16:27:30 -05:00
Calvin Walton
dfa9fd00e2
TURN server password: Use second-based timestamps
...
The expiration timestamp should be a standard unix timestamp measured in
seconds, not the millisecond-based Java time.
2015-03-05 16:21:46 -05:00
Anton Georgiev
a035e9bc5a
fix some log strings
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2015-02-19 19:53:19 +00:00
Calvin Walton
1af70d8e4e
Use configured stun/turn servers when making webrtc call
2015-02-17 12:00:04 -05:00
Felipe Cecagno
6d52b3eeea
Merge branch '090-guest-role' into mconf-live0.6.2
2015-02-12 15:47:40 -02:00
Mateus Dalepiane
5de1af44e0
Fix NPE in the register_user_request [Bug #1462 ]
2015-02-12 15:37:15 -02:00
Richard Alam
96e8fde865
- change format of logs to add timezone
2015-02-09 18:40:31 +00: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
Richard Alam
ee7731626b
- try to format logging
2015-01-23 19:59:26 +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
Anton Georgiev
b0ccef5af0
Added config pngImagesRequired. If true, the slides will be converted to png for HTML5 client. False by default.
2015-01-09 16:14:05 +00:00
Anton Georgiev
7e3c2f6eb0
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-ui-less
2014-12-15 20:11:49 +00:00
Richard Alam
1b4c4f5f5e
- change logging for bbb-web to rollover at midnight and add date to the filename
2014-12-11 22:07:22 +00:00
Felipe Cecagno
12f7aacf4b
Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1
...
Conflicts:
bigbluebutton-client/locale/fr_CA/bbbResources.properties
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.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/chat/views/ChatView.mxml
2014-12-09 16:52:43 -02:00
Richard Alam
234a95902d
- change api version to 0.9 from 0.81
2014-12-01 11:52:40 -08:00
Richard Alam
ce07751d79
- fix https://code.google.com/p/bigbluebutton/issues/detail?id=1837
2014-11-28 14:24:28 -08:00
Anton Georgiev
4172537f24
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-merge-with-m
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml
2014-11-28 20:33:11 +00: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
Felipe Cecagno
8caa85f333
Merge branch '090-change-role' into mconf-live0.6.1
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
bigbluebutton-client/src/org/bigbluebutton/common/Images.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/videoconf/views/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
2014-11-23 21:58:27 -02:00
Felipe Cecagno
3a9df05015
cleanup
2014-11-23 21:13:46 -02:00
Felipe Cecagno
a3acb00893
Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1
...
Conflicts:
bbb-video/build.gradle
bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
bigbluebutton-config/web/default.pdf
2014-11-22 20:28:39 -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
Felipe Cecagno
8a89cd1a71
sending the externalMeetingId from bbb-web to bbb-apps, so bbb-apps can use it on redis pubsub message meeting_created_message
2014-11-11 17:54: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
Richard Alam
9599d65ad1
- add more logging
2014-11-05 20:36:01 +00: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
e3b850764a
More cleanup
2014-11-03 16:09:18 -02:00
Pedro Beschorner Marin
2d3a941f70
Some cleanup
2014-11-03 15:45:39 -02:00
Pedro Beschorner Marin
1de0756aac
Refactoring to bbb-090
2014-11-03 14:13:53 -02:00
Pedro Beschorner Marin
2c5ff4f7cd
Merging with mconf old branch
2014-11-03 14:12:47 -02:00
Richard Alam
20393bd4c7
- init the bbb-apps state to not-available to prevent race condition where
...
a meeting gets created but bbb-apps isn't ready to handle the request.
2014-10-27 19:01:47 +00:00
Richard Alam
5a83eab737
- return api version when url is http://<host>/bigbluebutton
2014-10-27 19:01:01 +00:00
Felipe Cecagno
0af623e9e7
Merge branch '090-listen-only-by-default' into mconf-live0.6.1
2014-10-24 23:38:09 -02:00
Richard Alam
4c277607d9
- modify lib path
2014-10-22 02:44:15 -07: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
3db4ead6e4
Merge branch '090-listen-only-by-default' into mconf-live0.6.1
...
Conflicts:
bigbluebutton-client/locale/ru_RU/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
2014-10-15 00:22:27 -03:00
Felipe Cecagno
03b53eba21
cleanup
2014-10-14 22:08:40 -03:00
Pedro Beschorner Marin
831f890cd2
Merge remote-tracking branch 'bigbluebutton/master'
2014-10-13 12:06:38 -03:00
Richard Alam
0fb0e603ef
- increase log file size and number of backups kept
2014-10-12 05:43:18 -07:00
Felipe Cecagno
59debc5d1e
Merge branch '090-mconf-branding' into mconf-live0.6.1
2014-10-05 23:32:43 -03:00
Felipe Cecagno
5f2f2662af
Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1
...
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
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/PublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
2014-10-05 22:00:28 -03:00
Felipe Cecagno
015d708d7c
Merge branch 'mconf-branding-0.81' into 090-mconf-branding
...
Used the following command to comment the default copyright label for all languages except en_US
find -name bbbResources.properties | xargs sed -i "s:^\(bbb.mainshell.copyrightLabel2.*\):# \1:g"
Conflicts:
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/src/BigBlueButton.mxml
record-and-playback/presentation/playback/presentation/playback.html
2014-10-05 19:36:43 -03:00
Mateus Dalepiane
f5703f64bb
Port change user role to bbb 0.9.0
...
Merge branch 'changeRole-0.81' into 090-change-role
Conflicts:
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/ParticipantsService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LockButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/business/ListenersSOService.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/business/UsersProxy.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
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/views/ControlButtons.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
bigbluebutton-web/grails-app/conf/BigBlueButtonFilters.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.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-25 17:59:45 -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
Pedro Beschorner Marin
8b1c735429
Merge remote-tracking branch 'bigbluebutton/master'
2014-09-15 16:16:31 -03:00
Richard Alam
50352c0204
- make sure to cancel the thread after presentation conversion
2014-09-15 09:05:03 -07:00
Richard Alam
1e2a787af3
- cache default config xml
2014-09-14 09:33:13 -07:00
Richard Alam
38f77259f1
- return false when filter is applied
2014-09-14 09:06:11 -07:00
Richard Alam
e1234fcee4
- make sure the threads are not daemon...need to rework this
2014-09-12 15:10:13 -07:00
Richard Alam
a44362ccbf
- change timer to ScheduledExecutorService to use thread from the pool
2014-09-12 14:28:49 -07: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
Pedro Beschorner Marin
54f9f2c12e
Web config
2014-09-09 19:09:10 -03:00
Pedro Beschorner Marin
86ac2ad0ff
Merge remote-tracking branch 'origin/master'
2014-09-05 11:07:29 -03:00
Felipe Cecagno
c2eed678d9
cleanup
...
Conflicts:
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2014-09-04 15:02:16 -03:00
Richard Alam
2c53427a0d
- meeting with duration=0 should be destroyed after a certain period when last user leaves
2014-09-02 15:25:54 -07: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
Anton Georgiev
cf125781db
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
2014-09-02 17:54:14 +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
Richard Alam
98c96c3613
- a meeting that has duration zero (runs infinitely) should be cleaned-up if no one has ever joined on it
2014-09-02 10:21:06 -07:00
Pedro Beschorner Marin
ad5566b9a5
My web properties
2014-09-02 13:06:10 -03:00
Fred Dixon
93f6dcafab
Upping version from 0.9.0-dev to 0.9.0-beta
2014-09-01 17:05:33 -04: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
Richard Alam
8bdf8e28e9
kick off recording processing when meeting is ended
2014-09-01 15:21:01 -04:00
Richard Alam
6c857c04fa
- change log level for user join and leave so we can track them if the log level is above debug
2014-08-23 14:53:08 -07:00
Richard Alam
9075068f8e
- allow a way to change log level externally from bigbluebutton.properties
2014-08-23 13:04:06 -07:00
Richard Alam
c30c709ac3
- add comment on why we lowercase meta param
2014-08-21 10:11:56 -07:00
Richard Alam
4dbf327567
- maintain backward compatibility with 0.8.1 where it converts meta params keys to lowercase
2014-08-21 08:13:50 -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
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
Fred Dixon
6f727b6acc
Updated footer message in bigbluebutton.properties
2014-08-17 22:26:51 -04:00
Richard Alam
eb0caa9b3e
Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master
2014-08-13 12:07:50 -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
Richard Alam
9b299a9f91
- add better logging for meeting create and doc conversion
2014-08-13 06:10:15 -07:00
Ghazi Triki
bb09eb6d75
After checking we bumped projects version and Flex locales to 0.9.0 with some fixes
2014-08-13 12:20:10 +01:00
Ghazi Triki
9a794f854a
Bumped projects version and Flex locales to 0.9
2014-08-13 10:28:08 +01:00
Anton Georgiev
04494aa8a4
cleaning up
2014-08-11 18:46:10 +00: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
Richard Alam
49687d2f8a
- fix setconfigxml exception
2014-08-05 11:14:35 -07:00
Richard Alam
1323492180
- cleanup
2014-08-05 11:13:40 -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
55b31809bc
- cleanup. We'll have to re-implement these tests
2014-07-30 14:26:39 -07:00
Richard Alam
adce0d1f63
- changing dependecies seems to have broken the build
2014-07-30 13:19:03 -07:00
Richard Alam
80666c001e
- fix https://code.google.com/p/bigbluebutton/issues/detail?id=1442
2014-07-30 12:36:19 -07: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
fee5a208c8
- minimize the number of threads required for doc conversion
2014-07-22 14:42:30 -07:00
Richard Alam
89af96714f
- don't create threads unnecessarily when processing uploaded presentations
2014-07-22 14:26:18 -07:00
Richard Alam
bc655811c6
- don't clear newer pending ping messages when red5 recovers
2014-07-05 03:38:12 -07:00
Richard Alam
fb269a3c6b
- remove user sessions from hashmap when user leaves and when meeting is destroyed to
...
prevent memory leaks
2014-05-26 08:32:56 -07:00
Richard Alam
4a4241ee78
- make sure create, register user and validate are in correct sequence
2014-05-21 13:56:37 -07:00
