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
jfederico
a4b0cb7436
bbb-web: Fixed issue in getRecordings not responding the meetingID correctly
2017-05-19 15:11:08 +00: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