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

508 Commits

Author SHA1 Message Date
jfederico
e12d3fa639 Cleaned up ApiController after merge 2016-01-29 10:24:30 -05:00
jfederico
e1e3aa6055 Merge branch 'pedrobmarin-getRecordings' into jfederico-getRecordings 
# Conflicts:
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
#	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
 2016-01-28 15:36:19 -05:00
jfederico
2f3bd5b3ce Reformatted files with conflicts 2016-01-28 13:58:05 -05:00
Jesus Federico
a0702903eb Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2016-01-28 09:06:53 -08: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
3cb59b8951 FreeMarker template in a separated file 2016-01-27 14:27:06 +00:00
jfederico
7ef3e62940 bigbluebutton-web: The statuses processing and processed can be returned by getRecordings 2016-01-26 17:17:28 -05:00
Pedro Beschorner Marin
6307b47ba8 Creating getRecordings XML response with FreeMarker 2016-01-26 18:59:36 +00:00
jfederico
2c214cafac bigbluebuttonbn-web: Implemented filter for recordIDs [id:eq:xxxx,yyyy,zzzz] 2016-01-22 18:16:47 -05:00
jfederico
6b911820e0 bigbluebutton-web: Added filter parameter to getRecordings for filtering queries based on the state of the recording [published|unpublished|deleted] 2016-01-22 11:38:33 -05:00
jfederico
3265709455 bigbluebutton-web: Extended getRecordings for making direct searches based on recordID(s) 2016-01-21 15:24:22 -05:00
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
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
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
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
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
Ghazi Triki
1da0bfe503 Inject maxSwfShapes to SwfAnalyser class. 2015-11-26 21:35:51 +01:00
Ghazi Triki
9d6f04ed16 Added SwfAnalyser to check the converted swf result. 2015-11-25 21:29:05 +01:00
Ghazi Triki
96aa42e5c2 Presentation upload returns a 200 HTTP status. 2015-10-07 14:17:04 +01:00
Richard Alam
a1a82f96d0 - remove printlns to cleanup logs 2015-09-23 20:11:06 +00: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
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
00c5cac9c9 Merge pull request #632 from daronco/api-merges 
API merges
 2015-08-06 17:58:34 -04:00
Maxim Khlobystov
5c0cb9c3d8 Merge branch 'meteor-client-pdf-conversion' of https://github.com/gthacoder/bigbluebutton into development 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala
 2015-08-06 16:21:31 -04:00
Richard Alam
d140ca0b40 - add an api to let us query the user sessions in bbb-web. We use this to see what sessions are hanging around 
that may be causing OOM exception on tomcat7
 2015-08-04 17:58:27 +00:00
Maxim Khlobystov
5f491bf43b Cleaning up. 2015-07-15 16:58:15 -04:00
Maxim Khlobystov
ceb3a3911c Made sure the image served for HTML5 client is in SVG format. 2015-07-07 12:19:05 -04:00
Maxim Khlobystov
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
Jesus Federico
9e51241b08 Added support for POST requests to getRecordings and getMeetings 2015-06-29 18:18:39 -04:00
Calvin Walton
9deb87d0b0 web: check that meeting is running before allowing presentation upload 2015-05-27 15:08:04 -04:00
Leonardo Crauss Daronco
0e77a9c71b Replace "videoStreams" by "videoCount" on getMeetingInfo 
Return only the total number of videos and whether a user has video or not
instead of returning the ID of each video stream available. Is now more
consistent with the response of getMeetings.
 2015-05-07 10:00:07 -04:00
Leonardo Crauss Daronco
c93d936a44 Merge remote-tracking branch 'mconf/090-get-recordings-metadata-filter' into api-merges 2015-05-05 12:39:06 -04:00
Leonardo Crauss Daronco
6cf4dc4b1d Merge remote-tracking branch 'mconf/090-audio-video-on-api' into api-merges 2015-05-05 12:38:47 -04:00
Richard Alam
337f5f0934 - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1917 2015-04-06 15:20:01 +00:00
Oleksandr Zhurbenko
98bd277324 Cleaninig 2015-03-25 14:34:01 -07:00
Oleksandr Zhurbenko
f8a41a78d8 Cleaning and formatting 2015-03-25 14:12:38 -07:00
Oleksandr Zhurbenko
67ef6129c0 Trimming leading and trailing whitespace for the meetingId and fullname for both cases 2015-03-25 13:02:03 -07:00
Oleksandr Zhurbenko
5a167f362c Fixed issue 1889, added checking for an empty username and removing trailing and leading whitespaces 2015-03-19 16:51:56 -07:00
Calvin Walton
1af70d8e4e Use configured stun/turn servers when making webrtc call 2015-02-17 12:00:04 -05: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