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

747 Commits

Author SHA1 Message Date
Richard Alam
d4997454e8 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-10-13 14:21:40 -07:00
Ghazi Triki
f72d165fa9 Make most of the popup windows closable using keayboard ESCAPE button. 2017-10-13 18:14:50 -03:00
Ghazi Triki
7449f1555e Fix toolbar top paddingTop style. 2017-10-12 20:14:14 -03:00
Ghazi Triki
770947c065 Show a message when accessing webcam from HTTP using chrome >= 60 or opera >= 47 2017-10-12 18:30:45 -03:00
Richard Alam
86a6881d93 Merge branch 'client-pdf-export' of https://github.com/riadvice/bigbluebutton into synch-with-2.0.x-release 2017-10-12 11:55:52 -07:00
Richard Alam
53f1225c32 Merge branch 'v2.0.x-release' into synch-with-2.0.x-release 2017-10-12 11:32:54 -07:00
Ghazi Triki
99e55b000a Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into client-pdf-export 
# Conflicts:
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
 2017-10-12 15:21:22 -03:00
Ghazi Triki
2c7d910d83 Display native locale name in LanguageSelector menu. 2017-10-12 13:27:55 -03:00
Ghazi Triki
0353fa7985 Handle IO errors when saving files to desktop. 2017-10-11 17:10:51 -03:00
Ghazi Triki
cf4d438c64 Improved user experience in FileExportWindow. 2017-10-11 16:56:23 -03:00
Richard Alam
f0cbfcaf1d Merge branch 'upgrade-to-red5-oct-10-2017' into upgrade-master-to-latest-red5 2017-10-11 05:31:51 -07:00
Ghazi Triki
d5c9268287 Implement slide and document export to PDF format with annotation. 2017-10-11 09:24:24 -03:00
Ghazi Triki
3dfdccb3f9 Update breakout room timer. 2017-10-09 15:45:19 -03:00
Ghazi Triki
23bb6bd34e Show hint for presenters in PollResultsModal. 2017-10-05 21:18:57 +01:00
Ghazi Triki
ae5e448a97 Add hint label above poll button. 2017-10-05 20:11:14 +01:00
Anton Georgiev
d521b19623 Merge branch 'implement-multi-chat' of github.com:ritzalam/bigbluebutton into pods_vol3 2017-10-03 11:13:48 -04:00
Anton Georgiev
6d4fa587c8 work on add and remove presentation pods 2017-09-25 14:58:11 -04:00
Ghazi Triki
e3fd1b4019 Updated file upload hint message. 2017-09-25 19:38:57 +01:00
Ghazi Triki
d57b3f42d9 Revert to the initial tunelling error for desktop sharing. 2017-09-25 19:16:13 +01:00
Ghazi Triki
507d8662ee Check screen share tunelling and update error message. 2017-09-25 19:08:28 +01:00
Ghazi Triki
57a40cdf52 Add attribution to quotes. 2017-09-22 18:54:32 +01:00
Ghazi Triki
fa24b10a34 Updated office document error message to be helpful for users. 2017-09-22 18:05:58 +01:00
Ghazi Triki
9b997392f0 Added new logoutTImer feature. 2017-09-21 20:12:59 +01:00
Ghazi Triki
b934a3bffa Added a new layout named "Presentation + Users" 2017-09-19 19:36:16 +01:00
Ghazi Triki
97c06e2e5c Update loading text. 2017-09-19 17:32:05 +01:00
Ghazi Triki
31815b5ee0 Improved loading screen by adding quotes. 2017-09-19 15:19:56 +01:00
Ghazi Triki
31fe04180a Add missing locale for retry presnetation upload. 2017-09-12 11:18:13 +01:00
Richard Alam
eaffc9b2b9 Merge branch '2.0-accessibility-firstpass' of https://github.com/capilkey/bigbluebutton into capilkey-2.0-accessibility-firstpass 2017-09-11 07:57:57 -07:00
Chad Pilkey
b346eb6479 SharedNotesNameWindow accessible close 2017-09-07 17:48:13 -04:00
Chad Pilkey
c68b8eba73 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into 2.0-accessibility-firstpass 2017-09-07 15:44:35 -04:00
Ghazi Triki
6a6d2f3e38 Improved shared notes UI. 2017-09-07 15:37:27 +01:00
Chad Pilkey
00ddba6de9 accessible close for TitleWindows 2017-09-06 19:31:50 -04:00
Anton Georgiev
8634bf8c75 Merge pull request #4361 from antobinary/master 
Fix typo
 2017-09-05 09:21:19 -04:00
Anton Georgiev
20cc744889 fix typo 2017-09-05 09:19:22 -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
d0a597059c Included shared note characters remaining tooltip 2017-08-31 17:28:54 +00:00
Pedro Beschorner Marin
0dc3cef38e Changed shared note message length warning 2017-08-31 17:28:11 +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
Pedro Beschorner Marin
35d054fcb6 Avoid to persist patches bigger than the message size limiter 2017-08-30 18:49:09 +00:00
Richard Alam
6b45fca4a3 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-08-29 12:37:18 -07:00
Ghazi Triki
9112eff046 Move breakout room timer to the top blue ribbon. 2017-08-29 18:50:14 +01:00
Anton Georgiev
273659a2ac Merge pull request #4315 from pedrobmarin/notes-typists 
Show users that are typing in shared notes...
 2017-08-29 13:23:38 -04:00
Ghazi Triki
46fde19356 Change join breakout room alert by a new JoinBreakoutRoomWindow component. 2017-08-29 17:53:19 +01:00
Chad Pilkey
fad6959866 Merge pull request #4324 from capilkey/relax-pencil-smoothing 
Relax pencil smoothing
 2017-08-29 10:27:49 -04:00
Chad Pilkey
207fa6b62c add a tooltip for the multiuser button 2017-08-29 10:23:59 -04:00
Ghazi Triki
02da94e000 Added prominent blue ribbon to display breakout room. 2017-08-29 13:52:54 +01:00
Pedro Beschorner Marin
eff0c66dc8 Added users typing notification in shared notes 2017-08-25 18:54:38 +00:00
Ghazi Triki
6211af3b83 Update chrome and firefox webcam and microhpone permissions helper. 2017-08-25 15:49:47 +01:00
Pedro Beschorner Marin
f3d832b029 Adjusted shared note naming to match the new default note name with it's id 2017-08-24 14:00:13 +00:00
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
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