Commit Graph

747 Commits

Author SHA1 Message Date
Chad Pilkey
13da7042b3 add option to save user names to a file to gear button 2018-06-06 16:17:57 -07:00
Richard Alam
d8976e3f79 - handle user inacitivity audit message on the client 2018-04-09 12:22:58 -07:00
Richard Alam
39284f1d18 - start implementing user inactivity timer 2018-04-06 14:52:21 -07:00
Richard Alam
962b520d6a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-29 12:53:20 -08:00
Fred Dixon
036a23cfb1 Updated copyright date 2018-01-28 13:33:18 -05:00
Fred Dixon
189c05001e Adjusting the wording in Lock Settings dialog 2018-01-28 13:06:58 -05:00
Fred Dixon
728c71c327 Minor tweek in wording for Polling dialog 2018-01-28 12:17:16 -05: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
Ghazi Triki
307f12448a Add new hint box to LockSettings and update style. 2018-01-20 18:33:02 +01:00
Fred Dixon
6c36f8dc00 Tweeked feedback dialog 2018-01-17 12:42:17 -06:00
Ghazi Triki
cf92e1aeef Implemented "user rating feedback on logout" feature. 2018-01-16 20:37:05 +01:00
Ghazi Triki
38ab186b53 Change webcamsOnlyForModerator property and handle saving it in server and client. 2018-01-07 16:45:24 +01:00
Richard Alam
d43527d8aa Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-12-21 13:36:27 -08:00
Richard Alam
becf60b389 Merge branch 'breakout-room-closing-warning' of https://github.com/capilkey/bigbluebutton into capilkey-breakout-room-closing-warning 2017-12-21 12:52:50 -08: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
Chad Pilkey
5b367f6101 add a minute warning when breakout rooms are going to close 2017-12-21 15:13:52 -05:00
Richard Alam
d13b01def7 - change all kick works to remove 2017-12-21 11:11:32 -08:00
Ghazi Triki
e8683436a9 UI updates for presentation pods list. 2017-12-20 22:34:41 +01:00
Ghazi Triki
986b9598ef Localised allow/disallow presentation dowload label and tooltip. 2017-12-15 21:26:06 +01: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
7f51071f9e - display specific eject reason to user 2017-12-11 14:03:14 -08:00
Ghazi Triki
d8cbbfe682 Created new layouts for presentations : 2x1, 2x2, 3x3 2017-12-11 21:51:57 +01:00
Richard Alam
dda21b4a5e
Merge pull request #4793 from capilkey/disabled-moderator-unmute
Fix meeting mute and disable unmute of others
2017-12-11 11:00:41 -05:00
Chad Pilkey
860fd2a5df fix meeting mute and disable unmute of others 2017-12-11 00:00:32 -05:00
Richard Alam
85f8873910 - change some locale strings 2017-12-08 14:14:52 -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
Richard Alam
3f7b7d1544 - show list of authenticated and guest users waiting for approval 2017-12-05 17:00:21 -08:00
Chad Pilkey
5c1a656f6d add a microphone warning for chrome on http 2017-12-05 11:47:37 -08:00
Ghazi Triki
1285a4e203 Fix PresentationWindow title. 2017-11-30 11:16:32 +01:00
Ghazi Triki
8201d54088 Update and fix displaying private and group chats. 2017-11-28 09:58:28 +01:00
Ghazi Triki
57f5719e22 Fix guest tooltips. 2017-11-25 18:32:03 +01:00
Ghazi Triki
de500c3dbd Add a new button to display pending guests. 2017-11-23 22:30:05 +01:00
Ghazi Triki
f3ee06fc5b Update group chats list. 2017-11-16 21:12:18 +01:00
Ghazi Triki
7124d8b12f Show group chat in options tab. 2017-11-15 21:51:46 +01:00
Ghazi Triki
2f07c4a67a Move create group chat button to chat options tab. 2017-11-15 20:32:42 +01:00
Richard Alam
d61129927e Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-11-14 13:55:18 -08:00
Ghazi Triki
08eda408cd Add a new UnselectableItemsComboBox component for PresentationWindow. 2017-11-09 20:25:09 +01:00
Ghazi Triki
cc6718007a Center popups and alerts when the application is resized. 2017-11-07 17:57:35 +01:00
Ghazi Triki
ca1fad923e Make logout happen when using a wrong session token. 2017-11-06 15:26:17 +01: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
Ghazi Triki
900955e6b2 Make alert buttons larger. 2017-10-25 17:53:36 +01:00
Ghazi Triki
16e5e4e304 Updated PendingGuestsWindow to display guests and authenticated users. 2017-10-24 20:53:16 +01:00
Ghazi Triki
e8b52f31e1 Improve GuestSettingsWindow implementation. 2017-10-24 17:40:03 +01:00
Ghazi Triki
b36bf8f4c1 Rename GuestWindow to PendingGuestsWindow and change the users VBox to a List. 2017-10-24 15:56:56 +01:00
Ghazi Triki
525fd7b294 Move guest settings button from the top bar to the user settings menu. 2017-10-23 23:05:08 +01:00
Richard Alam
66349664bb Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4 2017-10-23 07:47:27 -07:00
Anton Georgiev
6f8abff77c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4 2017-10-21 08:50:25 -04:00
Ghazi Triki
d1772901f9 Remove locale version check feature. 2017-10-20 22:03:33 +01:00
Anton Georgiev
030567368a add/remove user from presenter groups 2017-10-20 17:01:57 -04:00
Richard Alam
cfec9de678 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into update-with-20 2017-10-19 18:20:25 -07:00