BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,758 Commits 13 Branches 260 Tags 1.1 GiB
56c545155d
Commit Graph

12758 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
e12af55dc8 Merge remote-tracking branch 'rafael/fix-1969' into rafafp-branches-merged-1.0 2016-06-21 14:14:00 +00:00
Pedro Beschorner Marin
7aed9ac32a Merge remote-tracking branch 'origin/akka-logging-actors-exceptions' into merging-to-1.0 2016-06-20 17:09:16 +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
RafaFP
f8af8852e6 Revert "removing unnecessary parameter from LayoutEvent" 
We actually need that parameter

This reverts commit 9ee0317d94.
 2016-06-14 20:48:23 +00:00
Felipe Cecagno
2a424e7549 update dependencies not available anymore on Blindside Networks Google Code repository 2016-06-14 11:22:16 -03:00
kreismann
1001ea5a53 Cleaning onCallModifying 
This function is responsible for building the 200 OK to answer the REINVITE coming from Freeswitch. In our cause, we just need to use bbb-voice local sdp to answer it. To a later and permanent change, however, it's recommended to investigate the SdpTools.java. My guess is that sdpMediaProduct function is comparing the media codecs in a wrong way.
 2016-06-13 17:25:56 -03:00
kreismann
17828c35f7 bbb-voice now responds OK with local SDP 
bbb-voice was responding the Freeswitch REINVITE with 200 OK containing remote SDP and with no media description.
 2016-06-13 17:24:42 -03:00
kreismann
8e952c224d Getting bbb-voice ip to make SIP Header 
The 'From' field must contain bbb-voice IP. We were getting Freeswitch IP instead (that is ok ONLY when bbb-voice and Freeswitch share the same machine with same IP Address).
 2016-06-13 17:22:11 -03: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
fa18948ce6 add proper tooltip to the presentation download button when it's disabled 2016-06-13 12:07:03 -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
Felipe Cecagno
f0fd4de8f4 Merge remote-tracking branch 'RafaFP/fix-1852' into mconf-live0.7.5 2016-06-12 22:35:53 -03:00
Felipe Cecagno
89eb28393e include extra recording events to bbb-webhooks (fix #257) 2016-06-12 22:32:11 -03:00
RafaFP
9ee0317d94 removing unnecessary parameter from LayoutEvent 2016-06-10 23:08:39 +00: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
Felipe Cecagno
eed8a390c7 Merge branch 'issue-257' into mconf-live0.7.5 
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
 2016-06-10 17:51:27 -03:00
Felipe Cecagno
78fb35833d refactor the way bbb-web publishes on redis the events of publish, unpublish and delete of recordings 2016-06-10 17:48:09 -03:00
Felipe Cecagno
43082d04ec remove limit of 32 characters for layout names and the restriction of only letters and numbers; define fixed with for layouts combobox 2016-06-06 17:55:48 -03:00
Felipe Cecagno
e2168fdc2b Merge remote-tracking branch 'RafaFP/feature-1826' into mconf-live0.7.4 2016-06-06 16:57:57 -03:00
Felipe Cecagno
23492e76ca define toolbar color and alphas through config.xml 2016-06-03 13:52:14 -03:00
RafaFP
a6d84e142c fix sharednotes scrolling back to user's cursor when receiving patches. #319 2016-06-02 19:34:03 +00:00
Fred Dixon
ad746beb5d Merge pull request #3137 from ffdixon/v1.0.x-release 
Added blank pages to defaut.pdf for whiteboard
 2016-05-14 09:50:55 -04:00
Fred Dixon
6964f69acd Added blank pages to defaut.pdf for whiteboard 2016-05-14 09:49:50 -04:00
Fred Dixon
fdafa590fa Merge pull request #3136 from ffdixon/v1.0.x-release 
Move from 1.0-RC to 1.0
 2016-05-14 09:47:37 -04:00
Fred Dixon
2a5469f269 Move from 1.0-RC to 1.0 2016-05-14 09:45:26 -04:00
Richard Alam
c1fbc94320 Merge pull request #3134 from ritzalam/update-locales-may-11-2016 
Update locales may 11 2016
 2016-05-12 11:28:23 -04: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
Richard Alam
40ae49ab7e Merge pull request #3120 from capilkey/1.0-client-fixed 
1.0 client fixes
 2016-05-06 10:29:17 -04:00
Chad Pilkey
ce1adcffc8 fix shortcut key inconsistencies 2016-05-05 16:15:09 -07:00
Chad Pilkey
c9486b6c5e fix issue #3088 2016-05-05 16:14:01 -07:00
Chad Pilkey
dc5bacc578 fix issue #3106 2016-05-03 10:09:30 -07:00
Leonardo Crauss Daronco
427a288dfe Fix clicks on the thumbnails in the playback page 
Wasn't binding to events in the proper order, causing cliks in a thumbnail
not to behave properly.
 2016-04-29 16:11:48 -04:00
Leonardo Crauss Daronco
0d5bda9d73 Improve playback buttons and update colors in the playback page 
Bigger and more well spaced buttons, specially in small screens.
Also updated the colors to match the latest design definitions.
 2016-04-29 15:59:45 -04:00
Leonardo Crauss Daronco
af27a69ef8 Fix playback of recordings not loading on firefox mobile 
The event "loadeddata" is only triggered on firefox mobile once the
video/audio is played, so it requires the user to click on the play button
for it to be triggered.
The playback page was waiting for the event to be triggered before
removing the "loading" page, and that would never happen on firefox mobile.

Now we don't wait anymore for the video to be loaded, we just wait for
the slides and the initial setup.
 2016-04-28 18:55:09 -04:00
Leonardo Crauss Daronco
6094c8ceee Stack recording playback components when in portrait mode 2016-04-28 14:35:47 -04:00
Leonardo Crauss Daronco
2b20824b99 Small fix/protection in the js of the playback page 2016-04-28 10:36:39 -04:00
Leonardo Crauss Daronco
f35c010864 Fix the slide size on video/presentation swap in a paused playback 
Resize the slides after swapping presentation and video, so that it fits
the new region properly.
 2016-04-27 16:20:31 -04:00
Leonardo Crauss Daronco
488734abc1 Add protections to the js and improve the swap in the playback page 
When swapping video and presentation now the presentation is updated
properly, before it would not show any slide until there was a slide
change.

Also added a few protections to prevent js code from breaking.
 2016-04-27 15:53:39 -04:00
Leonardo Crauss Daronco
b55a7c4ad5 Show BigBlueButton's logo in the playback page as bg when loaded 2016-04-27 11:13:36 -04:00
Leonardo Crauss Daronco
1a3b5381d4 Fix pan and zoom in the responsive playback page 
When pan/zoom was done, the image would zoom and move inside the svg, that
occupied a larger area than the viewbox we wanted to show.

Had to control the size of the container that has the svg via javascript,
to make it exactly the size we want to display the presentations and with
this crop all parts of the presentation that lie outside the container.
 2016-04-27 10:46:29 -04:00
Leonardo Crauss Daronco
a3afed36fe Better visual for copyright and chat in the playback page 
Small changes in text formatting and positioning.
 2016-04-26 19:04:27 -04:00
Leonardo Crauss Daronco
2778768521 Fix cursor position in the playback page when the sidebar is open 
The cursor was being moved to the right more than it should when the
sidebar was opened.
 2016-04-26 17:58:54 -04:00
Leonardo Crauss Daronco
7fb5b134db Fix recording playback layout when there's no video 2016-04-26 17:53:11 -04:00
Leonardo Crauss Daronco
eb1940d4e3 Set the meeting name as title in the recording playback page 2016-04-26 17:14:41 -04:00