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

12724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Beschorner Marin
5e27b3e6fd Merge pull request #1 from RafaFP/fix-closeSharedNotes 
now when a user is kicked by moderator the sharedNotes windows will b…
 2016-06-27 09:55:30 -03:00
Felipe Cecagno
5d3c2a347c fix desktop viewing inside the presentation area 2016-06-27 00:31:04 -03:00
Felipe Cecagno
11cead1985 adjust presentation area to avoid scroll bars 2016-06-26 22:51:55 -03: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
RafaFP
8830f0a1d6 now when a user is kicked by moderator the sharedNotes windows will be closed too 2016-06-24 21:13:25 +00:00
Pedro Beschorner Marin
6c5ef1f012 Refactored the way moderator's waiting for acceptance status is checked before creating the guest window 2016-06-24 20:46:05 +00:00
Felipe Cecagno
775d8a7d3b download presentations configurable by an attribute in the config.xml 2016-06-24 12:31:14 -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
0a802d63db This fixes issue #328. Empty polling button when changing presenter 2016-06-23 17:54:49 +00:00
kreismann
a931d517ad Adjusting control bar buttons and presentation tab 
- Poll button comes first.
- The presentation tab name is the presentation file name.
- If the file name has more than 20 characters, the presentation tab size is truncated.
 2016-06-23 13:22:50 -03:00
Pedro Beschorner Marin
4373a59a05 Reverting some line ending changes made in while merging 2016-06-23 12:48:02 +00:00
Pedro Beschorner Marin
c2b69e885c Merge remote-tracking branch 'rafael/fix-1670' into rafafp-branches-merged-1.0 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/components/SharedNotesRichTextEditor.mxml
 2016-06-22 14:34:24 +00: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
915d04cb5e Merge branch 'feature-1826' into rafafp-branches-merged-1.0 2016-06-22 14:22:25 +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
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