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
Fred Dixon
7dc0871a28
Change from 1.0.0-Beta to 1.0.0-RC
2016-04-13 17:14:40 -04: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
Anton Georgiev
e834637b5a
upgrade grails from 2.3.6 to 2.5.2
2016-03-08 21:43:35 +00: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
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
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
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
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
