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

537 Commits

Author SHA1 Message Date
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
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
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
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
jfederico
84e4221c47 bigbluebutton-web: Extended filterRecordingsByMetadata in order to support wildcards 2016-02-01 15:08:51 -05:00
jfederico
f23158ccd7 bigbluebutton-web: Fixed issue with recordings not publishing/unpublishing 2016-01-29 13:36:24 -05:00
jfederico
e12d3fa639 Cleaned up ApiController after merge 2016-01-29 10:24:30 -05:00
jfederico
e1e3aa6055 Merge branch 'pedrobmarin-getRecordings' into jfederico-getRecordings 
# Conflicts:
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
#	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
 2016-01-28 15:36:19 -05:00
jfederico
2f3bd5b3ce Reformatted files with conflicts 2016-01-28 13:58:05 -05:00
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
Ghazi Triki
8b503b3676 Fixed variable name in getMeetingInfo API method. 2016-01-27 18:38:40 +01:00
Pedro Beschorner Marin
3cb59b8951 FreeMarker template in a separated file 2016-01-27 14:27:06 +00:00
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
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
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
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
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
10f7f3f852 - play around with akka http 2015-10-20 15:43:41 +00:00
Richard Alam
14aabf9da6 - allow joining breakout room 2015-10-19 19:00:21 +00:00
Richard Alam
d89a34209d - make presentation api use session 2015-10-07 21:44:01 +00:00
Richard Alam
c5b5b11725 - check if user has sessionToken 2015-10-07 20:34:37 +00:00
Richard Alam
c182f85403 - use sessionToekn on signOut API call 2015-10-07 16:09:31 +00:00
Ghazi Triki
96aa42e5c2 Presentation upload returns a 200 HTTP status. 2015-10-07 14:17:04 +01:00
Richard Alam
bcfe18d0d9 - use sessionToken to get configxml 2015-10-06 22:18:56 +00:00
Richard Alam
7968273501 - pass sessionToken to get configXML from bbb-web 2015-10-06 21:08:01 +00:00
Richard Alam
e2533f1f0c - load config.xml first before doing anything else 2015-10-05 20:06:35 +00:00