Richard Alam
715a0177fd
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
2017-12-08 11:26:09 -08:00
Chad Pilkey
5fc5cdbf8d
Merge remote-tracking branch 'upstream/master' into cleanup-akka-apps
2017-12-04 21:42:21 -05:00
Chad Pilkey
158fb6c7b2
cleanup of old java messages and other unused code
2017-12-04 12:31:16 -05:00
Anton Georgiev
d6e8396407
add configuration to join via html5 for attendee or mod
2017-11-30 15:19:03 -05:00
Richard Alam
35277b7447
- remove unused imports
2017-11-28 10:54:58 -08:00
Richard Alam
5bf8258074
- make max file uploaded presentation
2017-11-27 14:03:50 -08:00
Richard Alam
9329e9316b
- determine guest status properly for moderators
2017-11-15 12:39:06 -08:00
Anton Georgiev
84df0dfdd4
Merge pull request #4646 from ritzalam/fix-chat-issues
...
Fix chat issues
2017-11-09 13:46:31 -02:00
Richard Alam
42b96e370d
- propagate guest policy change to bbb-web
2017-11-05 20:21:42 -08:00
Richard Alam
4a5e4d4238
- cleanup
2017-11-03 08:38:49 -07:00
Richard Alam
9f28f240a5
- hardcode default presentation window for pre-uploaded presentations and for creation of breakout rooms
2017-10-30 13:05:06 -07:00
Richard Alam
f2709d7294
- stop start recording of webcam
2017-10-24 18:31:09 -07:00
Richard Alam
8939902143
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat
2017-10-24 13:24:38 -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
1f99106ba1
- write chapter break done file to kick off processing
2017-10-23 13:31:07 -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
Richard Alam
3b44d0eac2
- fix issue where late joiners displays the wrong slide
2017-08-01 14:50:44 -07:00
Pedro Beschorner Marin
ca36ec29d8
Included missing getters and setters for recordings size and raw size
2017-08-01 16:33:45 +00:00
Pedro Beschorner Marin
73443fe2db
Clean up unused redis message service
2017-08-01 15:14:03 +00:00
Pedro Beschorner Marin
835f7d5371
Removed unused playbacks included with mconf merge
2017-08-01 15:11:49 +00:00
Richard Alam
47f012f08f
- start fixing breakout rooms
2017-07-21 14:15:51 -07:00
Richard Alam
bf1031374a
- pass timeout expire when last user leaves from bbb-web to akka-apps
2017-07-16 08:11:48 -07:00
Richard Alam
8994c7f644
Merge branch 'bbb-2x-mconf' into implement-meeting-expiry
2017-07-16 07:49:45 -07:00
Richard Alam
0f39d99ce5
- implement meeting expiry
2017-07-15 19:10:04 -07:00
Chad Pilkey
1bb72e6391
clean up pre-2.0 voice message code
2017-07-15 17:33:25 -04:00
Richard Alam
a0467f319c
Merge branch 'bbb-2x-mconf' into work-on-meeting-lifcycle
2017-07-15 09:30:02 -07:00
Richard Alam
b04519ef0f
FreeSWITCH webrtc screenshare
...
- use webrtc screenshare using FS Verto
- publish screenshare as rtmp to red5
- flash clients view screenshare from red5 rtmp
Fix mute/unmute/talking of user in voice conference
2017-07-11 13:31:56 -07:00
Richard Alam
1320988a95
- handle register user properly
2017-07-08 07:22:45 -07:00
Richard Alam
507cc69939
- fix compile issues
2017-07-07 14:51:25 -07:00
Richard Alam
50d73880bd
- cleanup
2017-07-04 13:02:51 -07:00
Richard Alam
53bdd7f008
- handle messages from akka-apps to update meeting state in bbb-web used to return
...
in GetMeetingInfo API requests
2017-07-04 12:58:26 -07:00
Richard Alam
955b162915
- send new presentation conversion progress messages
2017-07-04 10:32:30 -07:00
Richard Alam
33b4cf45cd
- remove not needed files
2017-07-03 12:31:34 -07:00
Richard Alam
8ca0d6c9fe
- wire up new message path
2017-07-03 07:44:13 -07:00
Richard Alam
c2c6b19e95
- group messages into it's own file
2017-06-28 07:23:49 -07:00
Richard Alam
582cdf07ec
- fix compile issue due to breaking of messages
2017-06-21 08:05:49 -07:00
Ghazi Triki
5fc84b50f0
Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages
...
# Conflicts:
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/UserJoinMeetingReqMsgHdlr.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
# bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala
# bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
2017-06-19 17:46:46 +01:00
Richard Alam
5c84354715
- try to consolidate meeting state in one place
2017-06-15 19:09:32 -07:00
Ghazi Triki
1e3f91bb6e
Improve code and replace deprecated parts.
2017-06-14 15:11:38 +01:00
Ghazi Triki
0478a3f658
First pass moving breakout rooms messages to v2 format.
2017-06-12 20:32:10 +01:00
Richard Alam
5ef4dd9e88
- change how we deserialize message so we can log errors
...
- add helper methods to add routing info for messages
- add a way to deserialize message from client
2017-06-06 14:25:40 -07:00
Richard Alam
5fed6779d4
- enable logging of akka system in bbb-web
2017-06-02 09:35:24 -07:00
Richard Alam
1a58703fa4
- redo how we deserialize messages
2017-06-01 09:47:14 -07:00
Richard Alam
84bfd93701
- handle register user message
2017-05-29 12:17:25 -07:00
Richard Alam
240176ca32
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web
2017-05-27 18:30:50 -07:00
Richard Alam
73ec6bb25d
- implement validate auth token
2017-05-26 10:04:38 -07:00
Richard Alam
18cce3a818
- send and handle meeting created event
2017-05-25 14:34:46 -07:00
Richard Alam
72f7272eb7
- handle create meeting request message
2017-05-25 13:02:26 -07:00
Richard Alam
e56a758c5f
- send create message from bbb-web
2017-05-24 15:19:03 -07:00
Richard Alam
4aedea9f5a
- try new messages
2017-05-23 17:02:40 -07:00
Richard Alam
6b14d31853
- wire up bbb-web
2017-05-19 19:13:25 -07:00
Richard Alam
8e3efa5df3
- handle meetign created event
2017-05-19 13:38:00 -07:00
Richard Alam
d305b02a42
- rename messages
2017-05-19 12:52:52 -07:00
Richard Alam
330faf317d
- rename core message
2017-05-19 11:37:13 -07:00
Richard Alam
d9647b8292
- start handling create meeting
2017-05-19 08:50:13 -07:00
Richard Alam
63f26e901b
- add voice user
2017-05-18 19:07:34 -07:00
Richard Alam
1266579ee0
- user custom data
2017-05-18 13:59:49 -07:00
Richard Alam
0c827a7d49
- start refactoring meetings in bbb-web
2017-05-18 12:43:29 -07:00
Richard Alam
d1779d9948
- refactor bbb-web
2017-05-17 19:43:08 -07:00
Richard Alam
f993593b1c
- setup meeting properties
2017-05-17 14:57:12 -07:00
Richard Alam
2f9a94608a
- refactor bbb-web
2017-05-17 14:39:50 -07:00
Richard Alam
9bb77173e8
- start refactoring bbb-web
2017-05-17 10:50:58 -07:00
Richard Alam
c0e4a4d681
- handle json message in akka apps
2017-05-12 15:33:46 -07:00
Richard Alam
b55beeb8fa
- wire up redis publisher
2017-05-10 14:37:14 -07:00
Richard Alam
0d53d2bf93
- fix compile issues
2017-05-10 14:24:36 -07:00
Richard Alam
76a6d99ca3
- move java classes from bbb-web into bbb-common-web
2017-05-10 13:22:50 -07: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
a9590976c2
- allow setting default guest policy for meeting
2017-04-18 19:45:32 +00: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
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
Richard Alam
c99de6c4db
- display length of recording in minutes instead of milliseconds
2017-03-31 19:54:51 +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
158102774b
- cleanup
2017-03-27 21:14:18 +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
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
414d44a799
- log exceptions
2017-03-15 13:47:10 -07:00
Richard Alam
5e2c021c32
- log failures when processing recording api requests
2017-03-15 12:38:51 -07:00
Richard Alam
1441c3e59c
- publish, unpublish, delete recording
2017-03-15 09:47:26 -07:00
Richard Alam
058a4044d6
- publish/unpublish recording
2017-03-15 14:29:10 +00:00
Richard Alam
1ccf55fd97
- add sample recording
2017-03-15 14:28:29 +00:00
Richard Alam
72c42f9d70
- build get recordings api response
2017-03-13 21:43:39 +00:00
Richard Alam
73b16db384
- deserialize metadata.xml
2017-03-11 09:35:06 -08:00
Richard Alam
f45acfaf53
- deserialize playback from metadata.xml
2017-03-11 15:04:01 +00:00
Richard Alam
80a0c9f386
- start implementing recording metadata reader
2017-03-10 22:01:56 +00:00
Richard Alam
90b5350260
- add sample metadata.xml
2017-03-10 19:38:35 +00:00
Richard Alam
adffa8d673
- build getMeetings and getMeetingInfo responses using freemarker
2017-03-09 20:32:14 +00:00
