BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,983 Commits 13 Branches 260 Tags 1.1 GiB
65aac2d500
Commit Graph

217 Commits

Author SHA1 Message Date
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