BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,634 Commits 13 Branches 260 Tags 1.1 GiB
76e3759039
Commit Graph

411 Commits

Author SHA1 Message Date
Chad Pilkey
00ddba6de9 accessible close for TitleWindows 2017-09-06 19:31:50 -04:00
Pedro Beschorner Marin
a6d6b83712 Consolidated add new note and clear into single gear menu 2017-08-31 19:36:45 +00:00
Pedro Beschorner Marin
bef2483783 Replaced shared note text font colors to five shades of grey 2017-08-31 17:30:08 +00:00
Pedro Beschorner Marin
20779c4602 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into shared-notes-message-limit 2017-08-30 20:40:05 +00:00
Pedro Beschorner Marin
6ab641e7c3 Added shared notes clear button for moderators 2017-08-30 20:32:42 +00:00
Ghazi Triki
a5780bb890 Update presentation area background to lighter gray. 2017-08-30 11:22:10 +01:00
Ghazi Triki
1e46bbbbed Updated breakout rooms icons. 2017-08-30 11:12:29 +01:00
Ghazi Triki
46fde19356 Change join breakout room alert by a new JoinBreakoutRoomWindow component. 2017-08-29 17:53:19 +01:00
Ghazi Triki
02da94e000 Added prominent blue ribbon to display breakout room. 2017-08-29 13:52:54 +01:00
Ghazi Triki
c7377d2c81 Increase icon thickness for main buttons in the top toolbar. 2017-08-28 10:12:49 +01:00
Ghazi Triki
4da0052edd Updated shared notes icons. 2017-08-25 20:19:18 +01:00
Ghazi Triki
6211af3b83 Update chrome and firefox webcam and microhpone permissions helper. 2017-08-25 15:49:47 +01:00
Ghazi Triki
e630602e43 Use a custom label that inherits from spark Label and use TLF instead of FTE and to make it multiline and add a tab enabled feature to it. 2017-08-24 17:36:45 +01:00
Ghazi Triki
1cbf1cb6b0 Remove LoggedOutWindow and LogoutWindow height restriction. 2017-08-24 09:44:46 +01:00
Ghazi Triki
109820e9cd Fix MuteMeButton muted icon reset and glow colour. 2017-08-23 18:19:57 +01:00
Ghazi Triki
b0da784ca1 Fix icons for for RecordButton. 2017-08-23 12:10:29 +01:00
Richard Alam
a62742e1e7 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-08-17 12:41:58 -07:00
Ghazi Triki
1a58533024 Updated whiteboard toolbar style. 2017-08-17 20:37:20 +01:00
Ghazi Triki
1c6abe4ae7 Improve file upload and download features and UI. 2017-08-17 18:37:20 +01:00
Chad Pilkey
bf153d6efc fix multiuser icon and button visibility 2017-08-17 13:02:06 -04:00
Ghazi Triki
d4c888014d Improve item selection color and user list info position display. 2017-08-15 18:19:05 +01:00
Ghazi Triki
dee3e89d79 Updated audio join and leave icons. 2017-08-15 17:37:40 +01:00
Ghazi Triki
44c0b3b327 Added custom skin for scroll bars. 2017-08-15 16:56:50 +01:00
Ghazi Triki
d2ec64a2a3 Revert MuteMeButton to inherit CanvasButton. 2017-08-15 13:46:40 +01:00
Ghazi Triki
ccbd1b8070 Style improve and make screen sharing windows background white. 2017-08-15 10:11:15 +01:00
Ghazi Triki
51253910ac Visually disable user selection in users list. (reverted from commit 09ed1ba699) 2017-08-15 08:54:48 +01:00
Ghazi Triki
057a1732e5 Added dark background to SlideView. 2017-08-14 17:15:36 +01:00
Ghazi Triki
acb3a68613 Added padding to window title. 2017-08-14 16:00:58 +01:00
Ghazi Triki
09ed1ba699 Visually disable user selection in users list. 2017-08-14 11:34:13 +01:00
Ghazi Triki
950b3828cf Minor flash ui improvements. 2017-08-11 20:44:34 +01:00
Ghazi Triki
1994464e95 Always show PopUpButtonSkin separator. 2017-08-11 20:43:56 +01:00
Ghazi Triki
f1c73c1aad Swap sad and neutral icons to fix them. 2017-08-10 21:21:06 +01:00
Ghazi Triki
af123e25cd Added disabled icons for top toolbar buttons. 2017-08-10 20:58:46 +01:00
Ghazi Triki
7f3a5dfdd0 Update notification status for chat tab. 2017-08-10 18:38:08 +01:00
Ghazi Triki
e160084ab5 Updated settings windows style and highlighted tab style. 2017-08-10 16:12:20 +01:00
Ghazi Triki
14e10ce862 Updated text formatting icon for shared notes. 2017-08-09 10:50:05 +01:00
Ghazi Triki
733f122953 Use default selection and rollover colours for lists. 2017-08-09 10:36:45 +01:00
Ghazi Triki
d8278c24da Revert back dark style when video chat layout is selected. 2017-08-08 13:30:18 +01:00
Ghazi Triki
3462c716be Make SlideView background white. 2017-08-08 11:22:29 +01:00
Ghazi Triki
5b8ae10d3c Updated chat options style, default radio button and checkbox styles. 2017-08-08 11:09:46 +01:00
Ghazi Triki
b5bffb0816 Remove unused code in TabSkin class. 2017-08-07 21:14:47 +01:00
Ghazi Triki
35cc113996 Added new sking for the Tab component and updated chat list style. 2017-08-07 18:21:43 +01:00
Ghazi Triki
f6e0f3920c Change the selected background color of whiteboard buttons to make them more visible. 2017-08-04 10:23:46 +01:00
Ghazi Triki
f2e9ab2929 Updated windows titles styles and improved polling windows. 2017-08-04 10:03:26 +01:00
Ghazi Triki
3340808aac Updated WhiteboardTextToolbar style. 2017-08-04 08:18:19 +01:00
Ghazi Triki
35b8539bf7 Put ChromeWebcamPermissionImage in the front. 2017-08-03 22:01:32 +01:00
Ghazi Triki
f34a78018a Revert back old whiteboard cursors. 2017-08-03 20:59:15 +01:00
Ghazi Triki
bd6530fcd8 Updated file download window. 2017-08-03 19:16:02 +01:00
Ghazi Triki
6a8d066b7a Updated FileDownloadWindow and UploadedPresentationRenderer. 2017-08-03 15:09:55 +01:00
Ghazi Triki
8d0a74e904 Minor imprvements to icon sizes. 2017-08-02 16:12:52 +01:00
Ghazi Triki
dd9b71717a Add icons to users settings menu and imporve BreakoutRoomSettings window layout. 2017-08-02 13:45:34 +01:00
Ghazi Triki
961b417e65 Improve users list icons and item renders layout. 2017-08-02 12:53:20 +01:00
Ghazi Triki
8735eecb89 Updated whiteboard curors to be black and white. 2017-07-31 23:00:46 +01:00
Ghazi Triki
f67304442a Improve audio and lock settings title windows. 2017-07-31 18:13:10 +01:00
Ghazi Triki
39fdeabf4c Improved audio settings windows. 2017-07-31 14:53:04 +01:00
Ghazi Triki
b6f11c5604 Updated list text states colours and bottom bar items height. 2017-07-27 21:36:23 +01:00
Ghazi Triki
997fa45d2d Replace connection lost animation by a static asset. 2017-07-27 18:28:12 +01:00
Ghazi Triki
8ef1969cb0 Minor update for chat and presentation toolbar icons. 2017-07-27 16:48:18 +01:00
Ghazi Triki
63b48d9db8 Restrict using emoji from version 1.1 only 2017-07-26 15:41:41 +01:00
Ghazi Triki
a31452c17f Update glow effect colour. 2017-07-25 23:11:12 +01:00
Ghazi Triki
2939ed3a53 Update TilteWindow close button skin. 2017-07-25 15:29:14 +01:00
Ghazi Triki
dc014b1a11 Fix PopUpButtonSkin border colors. 2017-07-25 11:58:54 +01:00
Ghazi Triki
d4d737dfd2 Implement new design for quick links buttons. 2017-07-25 11:35:54 +01:00
Ghazi Triki
e8fa7b0d49 Updated main toolbar help icon style. 2017-07-25 10:54:18 +01:00
Ghazi Triki
a6d8cbdd92 Minor updates to icons. 2017-07-24 18:34:20 +01:00
Ghazi Triki
cd478ecb49 Fix borderThickness property name. 2017-07-24 14:10:14 +01:00
Ghazi Triki
fed90fdf90 Update top toolbar buttons with new colour styles with the correct states. 2017-07-24 12:58:28 +01:00
Ghazi Triki
b82e04fb7d Updated style with new colours and fixed some icons. 2017-07-21 15:03:24 +01:00
Ghazi Triki
186417fb6f Merge branch 'master-v2' into 2x-client-theme 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatControlBar.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/WebRTCDesktopPublishWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
 2017-07-18 18:38:46 +01:00
Ghazi Triki
f52352f88f Deleted legacy client themes. 2017-07-18 00:14:53 +01:00
Ghazi Triki
f6844d83ba Replace image assets with new theme icons. 2017-07-17 18:43:16 +01:00
Ghazi Triki
3e78731b11 Replace all icons and update all styles for V2Theme.css 2017-07-17 15:29:47 +01:00
Ghazi Triki
3ef64e465e Updated whiteboard icons and cursors. 2017-07-14 18:13:43 +01:00
Ghazi Triki
62630b00c9 Use new icons and style for whiteboard tool bar. 2017-07-13 13:53:30 +01:00
Ghazi Triki
1ca350c6c8 Updated data grid and icons for users item renderers. 2017-07-12 17:37:05 +01:00
Ghazi Triki
25997d34c1 Implemented new style for user video. 2017-07-11 15:58:55 +01:00
Ghazi Triki
2944cfd35a Move MuteMeButton component to phone module and updates styles for phone module buttons. 2017-07-11 10:34:49 +01:00
Ghazi Triki
fae4a1de2c Implemented new skin for PopUpButton. 2017-07-10 15:23:01 +01:00
Ghazi Triki
7b228f58d2 Added new programmatic skin for Panel based component. 2017-07-08 20:38:28 +01:00
Ghazi Triki
436094cd6e Added new skin for ComboBox component. 2017-07-07 22:53:53 +01:00
Ghazi Triki
6123a83586 Improved ButtonSkin and implemented AudioSelectionWindow new design. 2017-07-07 00:42:57 +01:00
Ghazi Triki
917f9029d8 Replace swf asset button skin by a new skin class. 2017-07-06 15:58:12 +01:00
Ghazi Triki
859b0cd33d Updated to mdi window buttons and style. 2017-07-05 18:38:44 +01:00
Ghazi Triki
97ba9e29a4 Implemented progress bar skins. 2017-07-04 16:44:39 +01:00
Ghazi Triki
fccf1920f2 Added SourceSansPro font as default font. 2017-07-04 15:51:53 +01:00
Ghazi Triki
5cb30b7bc3 Activated old button icons from legacy default theme. 2017-07-04 15:26:56 +01:00
Ghazi Triki
b4ee163e33 Added v2 styles for Alert, Button and CombBox. 2017-07-04 12:08:45 +01:00
Ghazi Triki
d5e0098a52 Added new theme named V2Theme with a brand fresh new style. 2017-07-03 18:36:53 +01:00
Ghazi Triki
b59903e714 Suppress css compile-time warnings. 2017-06-13 12:34:51 +01:00
Richard Alam
8fa960e46d Merge pull request #3989 from riadvice/add-show-webrtc-mos-feature 
Add showWebRTCMOS option to PhoneModule
 2017-06-07 10:44:38 -04:00
Ghazi Triki
cd8f09170f Add showWebRTCMOS option. 2017-06-05 13:28:24 +01:00
Ghazi Triki
aaf9b336f3 Transform the client to a Flex 4 mx application. 2017-05-29 13:58:18 +01:00
Ghazi Triki
f61308af64 Remove flex 3 compatibility mode from client build. 2017-05-29 13:53:07 +01:00
Chad Pilkey
f2bc898750 new multiuser whiteboard icon and fixes for text object 2017-05-08 13:46:47 -04:00
Richard Alam
262c7250c8 Merge branch 'master' with bbb-mconf 2017-04-17 15:57:31 +00:00
Chad Pilkey
183ac7b411 Merge pull request #3795 from riadvice/webrtc-quality 
Display WebRTC stats inside the Flex client
 2017-04-11 15:50:16 -04:00
Ghazi Triki
a40deced61 Display "Recommend using either Firefox or Chrome for better audio" when any of other browser is used. 2017-04-10 20:22:30 +01:00
Ghazi Triki
92554f8b3e Squashed commits for displaying WebRTC stats inside the Flex client. 2017-04-10 11:16:46 +01: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
Ghazi Triki
7de860d3da Remove video view border in dark mode. 2017-03-23 18:38:37 +01:00
Ghazi Triki
596f752ff1 Update MainApplicationShell and its footer style when video chat layout is selected. 2017-03-23 18:28:21 +01:00
Ghazi Triki
313de26ddb Fix "videoDockStyleNoFocusChatLayout" style class border color. 2017-03-23 14:40:03 +01:00
Ghazi Triki
a416f8cb8c "Video Chat" Layout has a dark background, controls are and title are removed in this layout. 2017-03-22 17:34:11 +01:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Chad Pilkey
443e131bde chat selection indicator is now a bg highlight instead of box 2017-03-01 12:06:13 -05:00
Ghazi Triki
9dee97c75f Add more spacing to breakout rooms actions buttons. 2017-02-01 14:36:31 +01:00
Pedro Beschorner Marin
ddd1459d4c Refactored sharednotes UNDO operation and implemented REDO 2016-10-21 19:33:30 +00:00
Pedro Beschorner Marin
1eb1aea65e More sofisticated control of sharednotes undo button 2016-10-20 19:56:57 +00:00
Pedro Beschorner Marin
43c0a1ab17 Stating implementing sharednotes undo and redo 2016-10-17 16:15:23 +00:00
Chad Pilkey
0eabf8ca69 first round of accessibility fixes for 1.1 2016-09-22 16:38:34 -04:00
Chad Pilkey
4d4754aa3e switch linux screenshare images and text to real values 2016-09-19 12:03:28 -04:00
Felipe Cecagno
503127b95c add confirmation when the moderator choose to close the session after quit 2016-09-15 14:11:22 -03:00
Felipe Cecagno
79c3c12256 Merge branch 'merge-presentation-deskshare' into mconf 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
 2016-09-14 14:49:48 -03:00
Chad Pilkey
b8c1961f68 add a fourth help image for mac screenshare 2016-08-31 12:49:37 -04:00
Fred Dixon
477ebb4986 Handle case for starting desktop sharing when using FireFox with default settings 2016-08-30 15:45:51 -04:00
Chad Pilkey
59e1ba93d7 update two Mac screenshare help images 2016-08-26 07:51:00 -07:00
Chad Pilkey
da977c55f0 new screenshare image, change screenshare help string, move ss window up 2016-08-25 07:56:28 -07:00
Fred Dixon
247da5a07a Merge pull request #3314 from capilkey/screenshare-help-images 
Minor fixes to the deskshare publish UI
 2016-08-23 17:05:30 -04:00
Chad Pilkey
d624203d02 Flash deskshare: fix for linux/mac messages, and better pause indicator 2016-08-23 12:47:03 -07:00
Fred Dixon
69512a3b95 Merge pull request #3307 from riadvice/breakout-room-ui-imporve 
Improvements for breakout rooms names and remaining time display
 2016-08-23 07:37:00 -04:00
Chad Pilkey
c760b9f9c0 improve screenshare publish UI to provide help text and images 2016-08-22 20:55:56 -07:00
Ghazi Triki
1af78226b8 Update remainingtime display in both parent romm and breakout room. 2016-08-22 22:11:42 +01:00
Ghazi Triki
b1769febaa Fix breakoutRoomTimerBox style. 2016-08-22 19:55:57 +01:00
Ghazi Triki
a16ec795c8 Show remaining time for breakout room in bold. 2016-08-22 18:48:09 +01:00
kreismann
93e0ff8ab5 Warning presenter that his screen is being shared 
To do it, we've put a customized version of VideoWithWarningsBase inside DesktopViewWindow
 2016-08-18 15:50:46 -03:00
Pedro Beschorner Marin
85e68a66ca Merge remote-tracking branch 'origin/inactivity-timeout' into merging-to-1.0 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
 2016-06-27 19:57:48 +00:00
Pedro Beschorner Marin
4c432ee5bd Merge branch 'feature-1931' into rafafp-branches-merged-1.0 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatToolbar.mxml
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-06-22 13:06:51 +00:00
Pedro Beschorner Marin
e47cd67903 Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0 
Conflicts:
	bbb-video/build.gradle
	bbb-voice/build.gradle
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/build.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	deskshare/app/build.gradle
	deskshare/build.gradle
 2016-06-20 16:11:04 +00:00
Pedro Beschorner Marin
17fc566975 Merge remote-tracking branch 'mconf/mconf' into bigbluebutton-v1.0.0 
Conflicts:
	bigbluebutton-client/locale/es_LA/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
	bigbluebutton-config/web/default.pdf
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2016-06-17 18:00:51 +00:00
Felipe Cecagno
f9cb88a1f5 Merge remote-tracking branch 'RafaFP/fix-1822' into mconf-live0.7.5 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesNameWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
 2016-06-13 16:42:51 -03:00
Felipe Cecagno
0b26840403 Merge remote-tracking branch 'RafaFP/feature-1851' into mconf-live0.7.5 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2016-06-13 11:44:04 -03:00
Richard Alam
aafc420d53 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-24 20:17:47 +00:00
Ghaz Triki
13a65a2a1e Center Alert title and message. 2016-05-04 09:58:45 +01:00
Ghaz Triki
64068cc30e Updated BreakoutRoomSettings layout and style. 2016-04-27 14:25:32 +01:00
Richard Alam
5e45bcf2d7 Merge fix to missing images for brnading. 2016-04-26 20:16:31 -04:00
Chad Pilkey
bf7d3332b9 add two branding images back to the client 2016-04-27 11:26:12 -07:00
Richard Alam
b86f32b8c1 Sync with upstream repository 
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
 2016-04-26 20:01:20 -04:00
Ghaz Triki
01335b6e8a Merge branch 'master' into mobile-client 2016-04-25 19:58:13 +01:00
Richard Alam
b9cb2298b3 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into bbb-1.1-dev-java8 2016-04-14 20:05:22 +00:00
Chad Pilkey
6784c4c36d fixed a couple of accessibility bugs in 1.0 2016-04-04 12:23:51 -07:00
Ghaz Triki
bb6d62e071 Implemented video chat for web and mobile clients. 2016-04-01 15:34:54 +01: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
Pedro Beschorner Marin
b891be2e95 Client now react to warning messages and refactored server 2016-03-04 20:45:56 +00:00
RafaFP
89ac2fd60a Improved the code to meet the peer review results. 
refs #1931
 2016-03-04 17:40:48 +00:00
RafaFP
932de9c07f Updated class and method names to better correspond to the implemented function. 
Improved the recording code.

refs #1931
 2016-03-02 16:02:30 +00:00
Felipe Cecagno
e4da408c08 Merge branch 'mconf' into bigbluebutton/bigbluebutton@master 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingServiceHelper.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
	bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
	record-and-playback/presentation/playback/presentation/0.9.0/playback.html
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-03-02 01:19:09 -03:00
Ghaz Triki
990e786340 Merge branch 'master' into breakout-rooms-porto-algre-2015 
# 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-02-28 21:34:33 +01:00
RafaFP
029aa4a6d7 Implemented a Warning PopUp Window to check that the moderator really wants to clear the chat. 
refs #1931
 2016-02-23 20:22:09 +00:00
RafaFP
65b181198c Implemented a button to clear chat history. 
New conversation joiners will not receive the history previous to the clearing.
Current conversation users will clear the local chat history and be notified that a moderator cleared the chat.

refs #1931
 2016-02-22 22:10:04 +00:00