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

1010 Commits

Author SHA1 Message Date
Fred Dixon
ecde0a5351 Update bbbResources.properties 
Modified wording of enabling download of presentation
 2017-08-22 18:32:22 -04:00
Richard Alam
61326d82c4 - set default window name for new shared notes 2017-08-22 11:11:57 -07:00
Richard Alam
557a9ea1ca Merge branch '2.0-shared-notes-fixes' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-2.0-shared-notes-fixes 2017-08-21 13:09:43 -07:00
Richard Alam
f32ede3a5b - move public chat save, copy, and clean into chat options box for accessibility 2017-08-21 11:42:57 -07:00
Pedro Beschorner Marin
06d937958f Setting maximum size to shared notes and pastes 2017-08-21 18:23:33 +00:00
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
c733f4eafc Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2.x-dev-mconf 2017-04-27 14:52:47 -07:00
Richard Alam
94e587b52f - update locales 2017-04-27 14:55:57 +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
Richard Alam
5f6f4d1cd1 - remove ru locale and add to .gitignore 
- download only tanslated locale strings (tx pull -a --mode=onlytranslated)
 2017-04-18 20:49:20 +00: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
Ubuntu
aed4596a05 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-29 15:06:59 +00:00
Pedro Beschorner Marin
0531838277 Added inactivity messages that went missing after the merge 2017-03-28 16:53:46 +00:00
Richard Alam
2eb332b618 Merge pull request #3757 from ritzalam/update-locales-mar-24-2017 
update locales
 2017-03-24 16:02:20 -04:00
Richard Alam
cda3668f90 - update locales 2017-03-24 19:59:22 +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
7d16df00f2 - update locales 2017-02-08 15:52:40 +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
Pedro Beschorner Marin
8dfd4c9413 Added occitan to language selector 2017-02-06 16:17:23 +00:00
Ghazi Triki
e01d718215 Added tooltip to breakout rooms timer. 2017-02-01 13:57:42 +01:00
Ghazi Triki
7ffaeca52f Fix breakout room timer locale. 2017-02-01 10:55:08 +01:00
Ghazi Triki
cc19bec9d7 Display only timer for breakout rooms then when it ends display "closing" message. 2017-02-01 09:21:29 +01:00
Ghazi Triki
dfbf8c8c0a Avoid converting some pptx files with certain properties and inform the user. 2017-01-30 19:50:10 +01:00
Chad Pilkey
cab1bebeac fix typo in closed caption locale string 2017-01-24 12:35:56 -05:00
Chad Pilkey
e5d06f9f23 add custom poll option text to locales 2017-01-19 14:58:17 -05:00
Richard Alam
90af5151c1 - fix locale causing build to fail 2017-01-09 16:52:55 +00:00
Richard Alam
73eae41999 - updating locales 2017-01-09 15:49:28 +00:00
Felipe Cecagno
454f8d0284 update strings for the record button tooltip 2016-11-20 19:23:13 -02:00
Felipe Cecagno
7d0d27f020 Merge branch 'wont-record-metadata' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-20 15:54:38 -02:00
Felipe Cecagno
1014aa77fa changed possible values for inactivity_deadline to (1 minute; 6 hours), and inactivity_timeleft to (30 seconds; 30 minutes); changed client strings related to inactivity 2016-11-20 15:50:42 -02:00
Felipe Cecagno
e13aba9184 Merge branch 'status-icons' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-19 23:07:43 -02:00
Felipe Cecagno
7661289345 add pt_BR strings for the undo in the deskshare 2016-11-14 17:40:27 -02:00
Richard Alam
c6684ca2f6 - updating latest locales except for zh_TW as it's failing to compile. 2016-11-04 15:47:31 +00:00
Pedro Beschorner Marin
5ad77eda18 Client reading meeting metadata for wont record message 2016-11-01 19:44:56 +00:00
Pedro Beschorner Marin
af7ba7caac Added applause status and fixed icons dimensions and colors 2016-10-24 19:20:01 +00:00
Pedro Beschorner Marin
43c0a1ab17 Stating implementing sharednotes undo and redo 2016-10-17 16:15:23 +00:00
Chad Pilkey
fef5acace6 remove old deskshare module and out-dated Java checks 2016-10-12 18:13:02 -04: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
225a25d63c improve locales in the dialog to clean the public chat 2016-09-15 14:11:51 -03: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
Ghazi Triki
87421753d5 Invite participants to existing breakout rooms. 2016-09-07 17:50:20 +01:00
Ghazi Triki
1822c0a9de User in not redirected automatically to the logoutURL. 2016-09-04 12:21:54 +01: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
69f43b5726 Merge remote-tracking branch 'upstream/master' into screenshare-error-notifications 2016-08-25 14:03:47 -07:00
Chad Pilkey
5dbedbb06f add screenshare error messages to tell user when something goes wrong 2016-08-25 14:03:35 -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
c2c05a6410 Change breakout room remaning time format. 2016-08-22 18:56:25 +01:00
Ghazi Triki
f8a62b154b Locale strings update for breakout rooms settings. 2016-08-22 18:41:45 +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
Richard Alam
86062ddd4d Merge pull request #3295 from capilkey/cc-message-check 
More closed captioning improvements
 2016-08-18 12:52:44 -04:00
Chad Pilkey
602ce706c2 change cc language select from combobox to list 2016-08-18 09:42:58 -07:00
Richard Alam
76e7e6d568 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into start-pause-stop-screen-sharing-with-webrtc 2016-08-17 18:44:49 +00:00
Anton Georgiev
e839d2610b breakout rooms:change record to checkbox + boolean 2016-08-11 19:54:10 +00:00
Richard Alam
6e177ef74f Start, pause, stop screen sharing. 2016-08-10 20:48:55 +00:00
Richard Alam
0138d98f22 - don't exit when pausing screen sharing. 2016-08-10 19:18:49 +00:00
Richard Alam
2148812e14 Merge pull request #3259 from capilkey/cc-combined-messages 
Make the CC updates smarter
 2016-08-05 10:01:23 -04:00
Chad Pilkey
45ff003941 enforce a maximum paste length in CC window 2016-08-04 11:52:55 -07:00
kreismann
caa935034c Changing desktop sharing buttons 
Moving share buttons (full screen and region) back to publish window, while keeping the close button inside control bar.
 2016-07-26 17:38:46 -03:00
Ghazi Triki
2638e6c9c1 Merge branch 'master' into breakout-rooms-recording 
# Conflicts:
#	akka-bbb-apps/src/main/resources/application.conf
 2016-07-26 17:27:50 +01:00
Ghazi Triki
7d2cef9b9f Added recording options for breakout rooms. 2016-07-25 22:31:04 +01:00
Chad Pilkey
00549743ef add a language prompt to closed caption dropdown 2016-07-21 15:48:19 -07:00
Fred Dixon
f9080afe95 Merge pull request #3226 from capilkey/closed-captioning-fixes 
Closed captioning upgrades
 2016-07-18 15:26:25 -06:00
Chad Pilkey
8b1b3b6fee add caption tabindex and localized strings 2016-07-18 14:17:44 -07:00
Chad Pilkey
027d803770 move caption window to its own layout 2016-07-18 14:17:44 -07:00
Richard Alam
c5984219c3 Add help on how to use new screenshare 
Provide a way for users to learn how to use the new screen share as
 the steps to launch it differs depending on OS and browser.
 2016-07-14 19:20:25 +00: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
Felipe Cecagno
3b483943e6 Merge branch 'v1.0.x-release' of github.com:alexandrekreis/bigbluebutton into merge-presentation-deskshare 2016-06-26 19:58:35 -03:00
kreismann
98fda650ad Informing user to click on share screen buttons 
Also, a little adjust in the video placement inside desktop publish view
 2016-06-23 17:14:06 -03:00
Pedro Beschorner Marin
78313fda46 Merge remote-tracking branch 'rafael/feature-1944' into rafafp-branches-merged-1.0 2016-06-22 14:23:59 +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
9500542944 Cleanup 2016-06-21 21:06:55 +00:00
kreismann
5d2b2b08cb Presentation window now has a tab for desktop sharing. 
Still missing some interface adjustments: place the DS video correctly inside Presentation Window, review button order inside control bar, tabs naming, etc.
 2016-06-21 16:38:46 -03:00
Pedro Beschorner Marin
cbef362744 Merge remote-tracking branch 'rafael/fix-1825-with-feature-1827' into rafafp-branches-merged-1.0 2016-06-21 15:38:25 +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
fa18948ce6 add proper tooltip to the presentation download button when it's disabled 2016-06-13 12:07:03 -03:00
RafaFP
d23fcbdf43 updatdated the solution for custom layout naming and saving to reflect the comments: 
- replaced unnecessary popup windows with simplified alerts
- improved the logic used to compare pre-defined layout names
 2016-06-10 22:44:21 +00: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
Richard Alam
58c239bc43 Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.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/RecorderActor.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/WhiteboardApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	record-and-playback/core/scripts/bigbluebutton.yml
 2016-05-16 11:35:36 -04:00
Richard Alam
b0646794ff Merge branch 'merge-v1.0.0-to-master' of https://github.com/ritzalam/bigbluebutton into ritzalam-merge-v1.0.0-to-master 2016-05-20 15:15:39 +00:00
Richard Alam
babedcc6a7 Merge branch 'add-emojis' of https://github.com/delftswa2016/bigbluebutton into delftswa2016-add-emojis 2016-05-20 15:06:42 +00:00
Richard Alam
b2a4a150c4 - add Occitan locale 2016-05-12 15:19:13 +00:00
Richard Alam
5719ab2973 - fix offending locale that breaks build 2016-05-11 17:55:01 +00:00
Richard Alam
1e203d2617 Merge branch 'v1.0.x-release' of github.com:bigbluebutton/bigbluebutton into v1.0.x-release 2016-05-11 17:35:45 +00:00
Richard Alam
a3838ec143 Update locales 
Update locales as of May 11, 2016.
 2016-05-11 17:35:04 +00:00
Chad Pilkey
ce1adcffc8 fix shortcut key inconsistencies 2016-05-05 16:15:09 -07:00
Ghaz Triki
9aebb92204 Update layout for breakout rooms settings popup. 2016-05-04 09:59:20 +01:00
Richard Alam
b86f32b8c1 Sync with upstream repository 
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
 2016-04-26 20:01:20 -04:00
Chad Pilkey
fe53999164 Third round of 1.0 accessibility bug fixes 2016-04-19 09:17:14 -07: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
Richard Alam
b0d6cf51ef Updating locales 
Update locales as of Apr 6, 2016
 2016-04-06 18:59:41 +00:00
Richard Alam
6b6f1622dc Merge pull request #3073 from perroned/edge-as-chrome 
Fixes #3068 - Detecting Microsoft Edge as Google Chrome
 2016-04-05 14:04:37 -04:00
Chad Pilkey
6784c4c36d fixed a couple of accessibility bugs in 1.0 2016-04-04 12:23:51 -07:00
perroned
6bce9350cb Adds Edge browser warning to en_US locale 2016-04-02 19:31:34 -05:00
RafaFP
6a93432709 implemented a button to give moderators the option to end the meeting when they logout 
refs #1944
 2016-03-29 20:55:23 +00: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
Ghaz Triki
6a559b05ec Merge branch 'master' into breakout-rooms-porto-algre-2015 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2016-03-16 14:27:41 +01:00