BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,704 Commits 13 Branches 260 Tags 1.1 GiB
d6b4c7ac21
Commit Graph

642 Commits

Author SHA1 Message Date
Ghazi Triki
9a1553f95e Show presentation download button only when there is at least one downloadable presentation. 2017-08-07 14:07:47 +01:00
Richard Alam
90a98267ed - change message when user logs out and ends the meeting 2017-07-31 08:54:33 -07:00
Pedro Beschorner Marin
77603a62c8 Limiting the number of shared notes 2017-07-30 22:11:13 +00:00
perroned
d12d90b650 Screenshare loading screen 2017-07-26 20:43:08 +00:00
Richard Alam
67808fcb66 - display time remaining when meeting duration is not zero 2017-07-26 08:49:28 -07:00
Ghazi Triki
63b48d9db8 Restrict using emoji from version 1.1 only 2017-07-26 15:41:41 +01:00
Ghazi Triki
f086fb1abe Fix FileUploadWindow and make it close when clicking on the close button. 2017-07-25 15:28:52 +01:00
Ghazi Triki
d4d737dfd2 Implement new design for quick links buttons. 2017-07-25 11:35:54 +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
3e78731b11 Replace all icons and update all styles for V2Theme.css 2017-07-17 15:29:47 +01:00
Pedro Beschorner Marin
2097b611ed Merge remote-tracking branch 'prlanzarin/1.1-transcode-screenshare-merge' into bigbluebutton/bbb-2.x-mconf 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.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/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
	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/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
 2017-07-11 20:41:38 +00: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
Richard Alam
5957259b49 - combining web and voice users looks better 2017-06-22 08:00:32 -07:00
Pedro Beschorner Marin
15c6420e97 Merge tag 'v1.1.0' into 1.1-transcode 
tagging v1.1.0 release

 Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bbb-web-api/src/main/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
 2017-06-13 17:44:12 +00:00
Pedro Beschorner Marin
719ef1377a Merge remote-tracking branch 'mconf' into merging-into-bbb-1.1 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bbb-video/src/main/java/org/bigbluebutton/app/video/converter/VideoRotator.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-config/bin/bbb-conf
	record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb
	record-and-playback/core/lib/recordandplayback/generators/video.rb
	record-and-playback/core/scripts/rap-worker.rb
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
	record-and-playback/presentation/scripts/process/presentation.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2017-06-07 19:31:15 +00:00
Felipe Cecagno
13e045320f fix logic to avoid warnings regarding Java on updated Firefox 2017-05-24 14:56:32 -03:00
Ghazi Triki
fd2535236a Read configuration options for version 2 using the new Options class. 2017-05-24 12:19:25 +01:00
Pedro Beschorner Marin
09d7de7875 Included Java applet warnings for Firefox 52 2017-05-09 19:20:38 +00:00
Richard Alam
69ba485fcc Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf 2017-04-21 08:12:56 -07:00
Chad Pilkey
13e3fd3eeb fix focus chat message list key and label 2017-04-17 17:31:13 -04:00
Richard Alam
262c7250c8 Merge branch 'master' with bbb-mconf 2017-04-17 15:57:31 +00: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
Pedro Beschorner Marin
84fd8d4101 Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images! 2017-04-03 17:06:16 +00:00
Pedro Beschorner Marin
0531838277 Added inactivity messages that went missing after the merge 2017-03-28 16:53:46 +00:00
Ubuntu
5e0a5f019c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-24 19:14:21 +00:00
Chad Pilkey
4515c08654 changes to shortcut keys so they all work in IE 2017-03-22 19:53:12 -04:00
Pedro Beschorner Marin
0ab207c997 Merge remote-tracking branch 'mconf/mconf' 2017-03-21 19:47:11 +00:00
Ubuntu
529bec5eac Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-21 15:21:44 +00:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
perroned
ffea5cf785 Cleans up 2017-03-20 19:02:59 +00:00
Ubuntu
4da7d6d03f Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-17 15:55:23 +00:00
Chad Pilkey
65b89074e6 more accessibity fixes for 1.1 2017-03-08 16:15:40 -05:00
Fred Dixon
55525672f2 Update bbbResources.properties 2017-03-06 15:30:00 -05:00
Fred Dixon
c28c78a405 Minor updates for release -- bumped the API version 2017-03-06 13:57:54 -06:00
perroned
dab5adb5be Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-html5/imports/ui/components/media/container.jsx
	bigbluebutton-html5/server/main.js
 2017-03-06 19:21:40 +00:00
Chad Pilkey
9721d03274 add a warning to screenshare publish when tunneling 2017-03-03 19:17:03 -05:00
Ghazi Triki
290f1620e1 Merge branch 'master' into accessibility-improve 
# Conflicts:
#	bigbluebutton-client/locale/en_US/bbbResources.properties
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
 2017-03-01 16:56:35 +01:00
Ghazi Triki
75a3155f03 Updated deskshare button tooltip. 2017-03-01 08:38:34 +01:00
Chad Pilkey
5b72d93669 removed old chat message list custom accessibility functionality 2017-02-28 17:55:56 -05:00
perroned
92c3cdb746 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2017-02-23 19:20:37 +00:00
Ghazi Triki
2469a2f07e Change focus to breakout rooms list hotkey to CTRL+R instead of CTRL+T 2017-02-23 16:50:27 +01:00
Chad Pilkey
d053398103 made chat items selectable for screen readers 2017-02-22 15:31:41 -05:00
Ghazi Triki
a8c44fba91 Added global hotkey to open breakout rooms window. 2017-02-14 10:34:01 +01:00
Ghazi Triki
4a75a2cd1e Added now hotkey to focus on closed caption window. 2017-02-13 14:50:48 +01:00
Chad Pilkey
6722a3512e more detailed tooltip for push layout button 2017-02-09 19:03:06 -05:00
Ghazi Triki
b58c118274 Added keyboard shortcuts to breakout rooms data grid actions. 2017-02-09 20:34:25 +01:00
perroned
e1ed43d343 Adds some deskshare strings and labels 2017-02-08 21:07:23 +00:00
Richard Alam
aafc429e80 Merge pull request #3620 from riadvice/breakout-rooms-ui-imporve 
Breakout rooms UI imporve
 2017-02-06 17:39:41 -05:00
alexandre
48d5054869 Adapting some client labels 
- Creating interface messages in locales
- Some translating to brazilian portuguese
 2017-02-06 20:53:07 +00:00