Richard Alam
|
5df4bef903
|
- toggle presentation downloads
|
2018-06-07 12:13:00 -07:00 |
|
Richard Alam
|
384df10746
|
- generate png files for uploaded presentation
|
2018-04-10 13:06:08 -07:00 |
|
Ghazi Triki
|
a2feb9bf5b
|
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0
# Conflicts:
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
# bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
# bigbluebutton-client/branding/default/style/css/V2Theme.css
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
# bigbluebutton-client/locale/en_US/bbbResources.properties
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
# bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
# bigbluebutton-html5/private/config/development/server/log.yaml
|
2018-01-23 12:27:42 +01:00 |
|
Richard Alam
|
9ff881f138
|
Merge pull request #4925 from riadvice/webcams-only-for-moderator-on-off
Switch webcamsOnlyForModerator on and off
|
2018-01-09 12:48:19 -08:00 |
|
Ghazi Triki
|
9cad3facc3
|
Set webcamsOnlyForModerator in MeetingActor when the meeting is creator.
|
2018-01-09 20:47:03 +01:00 |
|
Richard Alam
|
e9df643af4
|
- fix issue where muteOnStart doesn't work when set in bigbluebutton.properties
|
2018-01-09 07:46:16 -08:00 |
|
Ghazi Triki
|
4bf5a26ecf
|
Fix setters in Meeting.java
|
2017-12-29 09:44:16 +01:00 |
|
Richard Alam
|
7637cedd4b
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-12-21 12:48:20 -08:00 |
|
Richard Alam
|
78afb91562
|
- implement muteOnstart by passing on create API or using bigbluebutton.properties in bbb-web instead of setting it in config.xml
|
2017-12-21 10:40:44 -08:00 |
|
Richard Alam
|
d09abe92e4
|
- allow to pass custom copyright text using create API
|
2017-12-20 14:28:01 -08:00 |
|
Richard Alam
|
f5502a1a2a
|
- allow passing of custom param (logo) to override default logo
|
2017-12-20 11:06:00 -08:00 |
|
Richard Alam
|
8223a08029
|
- hardcode logoutTimer to zero as we don't use this feature in the release
- substitute keyworks in moderatorOnlyMessage
|
2017-12-18 12:52:33 -08:00 |
|
Richard Alam
|
beed7a1058
|
- make client logout timer configurable in bigbluebutton.properties
|
2017-12-15 14:59:00 -08:00 |
|
Richard Alam
|
07e9f78730
|
- do not ask moderator permissions if not guest or authenticated guest
|
2017-12-14 17:35:52 -08:00 |
|
Richard Alam
|
3e3e661856
|
Merge pull request #4799 from ritzalam/eject-duplicate-user
Eject duplicate user
|
2017-12-12 10:55:51 -05:00 |
|
Richard Alam
|
9923704012
|
- eject user with duplicate external userid
|
2017-12-11 12:51:00 -08:00 |
|
Richard Alam
|
9e7e2a199b
|
- switch how to calc checksum from sha1hex to sha256hex
|
2017-12-11 11:07:29 -08:00 |
|
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 |
|