Richard Alam
d1c6624510
- fix compile issue
2017-10-27 15:06:29 -07:00
Richard Alam
84b12dfa94
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
2017-10-27 07:51:17 -07:00
Richard Alam
e02189b922
- fix https://github.com/bigbluebutton/bigbluebutton/issues/4541
2017-10-24 13:08:47 -07:00
Richard Alam
3e15405966
- show voice only users in get meeting api response
2017-10-24 12:59:09 -07:00
Richard Alam
53f1225c32
Merge branch 'v2.0.x-release' into synch-with-2.0.x-release
2017-10-12 11:32:54 -07:00
Pedro Beschorner Marin
5dfd772654
Updating presenter status
2017-10-10 14:38:27 -03:00
Anton Georgiev
b4210ea12f
enable presentation token storage in bbb-web
2017-10-04 18:38:28 -04:00
Richard Alam
a3e37dffa5
Merge branch 'information-bar' of https://github.com/riadvice/bigbluebutton
2017-10-03 14:04:12 -07:00
Ghazi Triki
e96d6ae726
Add new API options to display a banner in the client.
2017-10-03 21:49:06 +01:00
Anton Georgiev
d521b19623
Merge branch 'implement-multi-chat' of github.com:ritzalam/bigbluebutton into pods_vol3
2017-10-03 11:13:48 -04:00
Anton Georgiev
23dadc5477
work on separating pods - client/conversion/apps
2017-09-29 18:20:33 -04:00
Richard Alam
6e6bdd908c
- handle guest approval
2017-09-28 17:57:06 -07:00
Richard Alam
032562eab8
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-guest-policy
2017-09-28 16:58:03 -07:00
Richard Alam
e849e1b5ee
- approve guest user
2017-09-28 16:56:33 -07:00
Richard Alam
c1a98bd3a5
- manage a pool of libre office instances so we can process multiple docs at the same time
2017-09-28 10:00:47 -07:00
Richard Alam
84cfda3459
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-guest-policy
2017-09-27 11:32:13 -07:00
Richard Alam
9d9df0eee0
- lower timeout timer for validation
...
- change location of preschecker
2017-09-26 14:07:51 -07:00
Richard Alam
67eb305552
- log pres checker command so we can try running on cmd line if it fails
2017-09-26 13:13:10 -07:00
Richard Alam
a124b2d0e8
- call presentation checker from bbb-web
2017-09-26 12:23:39 -07:00
Richard Alam
e062e42cd0
- implement redirect of client to guest waiting
2017-09-25 14:12:54 -07:00
Richard Alam
df255c154b
- init guest status when joining
2017-09-22 14:53:37 -07:00
Richard Alam
4717a53182
- start implementing guest policy
2017-09-22 14:24:08 -07:00
Ghazi Triki
9b997392f0
Added new logoutTImer feature.
2017-09-21 20:12:59 +01:00
Anton Georgiev
32398bc40e
Merge branch 'implement-group-chat' of github.com:ritzalam/bigbluebutton into pods_vol1
2017-09-19 11:41:52 -04:00
Anton Georgiev
871498dd0d
Split POST upload request into two stages at nginx
...
Subrequest goes to different endpoint on bbb-web to ensure
that the content length (passed in header) is taken under
consideration prior to uploading file
2017-09-18 14:25:00 -04:00
Josh
7a3a5dbadc
convert to string
2017-09-15 12:27:46 -04:00
Josh
1b08b26113
fix conflicts
2017-09-15 11:48:31 -04:00
Josh
ace8eac1cf
no longer pretty print getRecordings response
2017-09-15 11:40:26 -04:00
Fred Dixon
59444dadc7
Merge pull request #4395 from joshua-arts/fix-playback-length-units
...
Convert playback length to minutes when writing to XML.
2017-09-13 16:39:45 -04:00
Josh
a25c9ba740
convert playback length to minutes when writing to xml
2017-09-13 15:34:37 -04:00
Richard Alam
136566d0d9
Merge branch 'fix-getRecordings-response' of https://github.com/joshua-arts/bigbluebutton into joshua-arts-fix-getRecordings-response
2017-09-13 08:55:59 -07:00
Josh
cc2a3f055a
remove recording tag from getRecordings resp
2017-09-13 11:50:39 -04:00
Anton Georgiev
f8087e0af3
store, check, exprire upload authz tokens in bbb-web
2017-09-13 10:39:28 -04:00
Richard Alam
b662c1c722
- log exception so we can get info of broken metadata.xml file
2017-09-08 13:18:44 -07:00
Richard Alam
8173c7ef0e
- escape text xml properly
2017-09-08 12:32:14 -07:00
Richard Alam
edc242f46b
- fix format of playback
2017-09-05 07:58:44 -07:00
Richard Alam
ab232b54d7
- update recording metadata
...
- publish/unpublish recording
- delete recording
2017-09-03 16:41:31 -07:00
Richard Alam
b14b04576d
- publish/unpublish recording
...
- get recordings
2017-09-03 13:44:43 -07:00
Richard Alam
cdb39d469e
- process get recordings api call
2017-09-03 10:52:18 -07:00
Richard Alam
bb740a6d72
- get metadata xml
2017-09-01 15:00:38 -07:00
Richard Alam
38a63427bd
- start implement metadata xml reader
2017-09-01 10:34:01 -07:00
Richard Alam
e066c1713f
- generate xml
2017-08-31 15:25:59 -07:00
Richard Alam
018c220986
- try using scala-xml library
2017-08-31 13:59:21 -07:00
Richard Alam
e8127fdb61
- do not include recordings with bad metadata.xml in the response for recording api calls
2017-08-31 08:06:15 -07:00
Richard Alam
63195ec5d2
- upgrade jodconverter lib to get PPT files converted to PDF working
2017-08-17 09:52:37 -07:00
Richard Alam
45160333e8
- log extra infor during doc conversion
2017-08-11 13:20:47 -07:00
Richard Alam
7956b561d2
- remove some printlns to minimize noise
2017-08-11 11:22:26 -07:00
Richard Alam
1a698058e1
- implement check to see if akka-apps is alive from bbb-web so we can return an
...
error to API requests
2017-08-08 12:16:00 -07:00
Richard Alam
5ecf0c3651
- hook up end meeting from api
2017-08-02 13:06:16 -07:00
Richard Alam
beb7155121
Merge branch 'recordings-size' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-recordings-size
2017-08-02 08:22:02 -07:00