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

12746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Cecagno
abad8289d1 do not generate start and stop webcam events for h263 streams (needed to play video on iOS) 2017-04-16 17:13:35 -03:00
Pedro Beschorner Marin
8c170f9d09 Merge pull request #396 from pedrobmarin/playback-fixes 
Playback fixes
 2017-04-12 10:09:31 -03:00
Pedro Beschorner Marin
7d6717e198 Merge pull request #393 from pedrobmarin/mconf-fullscreen-video 
Mconf fullscreen video
 2017-04-12 10:09:15 -03:00
Pedro Beschorner Marin
e55c352815 Merge remote-tracking branch 'mconf/mconf' into pedrobmarin/mconf-fullscreen-video 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
 2017-04-12 13:04:21 +00:00
Pedro Beschorner Marin
c45e14e185 Alexandre's fit-to-width height scaling fix 2017-04-11 20:50:53 +00:00
Pedro Beschorner Marin
086ea510c4 Avoid keeping unwanted annotations when seeking over the playback. This fixes a major bug but loses some of the smoothness that I could't avoid 2017-04-11 20:47:30 +00:00
alexandrekreis
596bad43e1 Merge pull request #395 from pedrobmarin/reconnection-timeout-1.0 
Reconnection timeout 1.0
 2017-04-10 17:04:20 -03:00
Pedro Beschorner Marin
4beed571fa Also keep reconnecting voice users that are in listen only 2017-04-10 15:15:39 +00:00
Felipe Cecagno
0253fd5a38 improve readability; fix indentation 2017-04-07 22:16:36 -03:00
Felipe Cecagno
287395454a Merge remote-tracking branch 'alexandre/mconf' into mconf 2017-04-07 22:11:38 -03:00
Pedro Beschorner Marin
86841167e1 Merge remote-tracking branch 'pedrobmarin/reconnection-timeout' into mconf/mconf 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConference.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCalls.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2017-04-07 21:00:30 +00:00
alexandre
2dd61df1c6 Handling fit-to-width events in recording playback 
The playback had no handling for this type of event. The aspect ratio used to calculate the max-width of the slide div has to be the vbox aspect ratio.
 2017-04-07 17:09:54 -03:00
Pedro Beschorner Marin
53097e73ba Merge remote-tracking branch 'pedrobmarin-mconftec/webcam-fullscreen' into mconf/mconf 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/GraphicsWrapper.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
 2017-04-06 19:35:58 +00:00
Pedro Beschorner Marin
ab3a6fec27 Merge pull request #392 from pedrobmarin/whiteboard-NPE-fix 
Fixed NPE thrown when presenter leaves room and whiteboard toolbar ha…
 2017-04-06 10:00:08 -03:00
Pedro Beschorner Marin
5a73d4a500 Fixed NPE thrown when presenter leaves room and whiteboard toolbar has focus 2017-04-06 12:57:12 +00:00
Felipe Cecagno
6b8c72ae52 Merge branch 'mconf' of github.com:mconf/bigbluebutton into mconf 2017-04-05 16:00:36 -03:00
Pedro Beschorner Marin
bd6028a3a9 Merge pull request #389 from pedrobmarin/mconf 
Added minimum width to name grid in user's window
 2017-04-05 16:00:25 -03:00
Felipe Cecagno
2b9dcc37de process recordings in chronological order 2017-04-01 20:00:37 -03:00
Felipe Cecagno
91b119bb37 Merge branch 'issue-381' of github.com:pedrobmarin/bigbluebutton into mconf 2017-04-01 19:43:37 -03:00
Pedro Beschorner Marin
cb0e66d9cd Added minimum width to name grid in user's window 2017-03-31 20:29:43 +00:00
alexandrekreis
c2fb4e69d0 Merge pull request #388 from pedrobmarin/fs-pid-path 
Removed old FreeSWITCH paths that we added in the beggining of versio…
 2017-03-31 12:16:00 -03:00
Pedro Beschorner Marin
aa8e5045f7 Removed old FreeSWITCH paths that we added in the beggining of version 1.6 testing 2017-03-31 13:57:22 +00:00
Pedro Beschorner Marin
61a27c1335 Avoid sending zoom events while typing in slide's textbox 2017-03-30 14:37:32 +00:00
Pedro Beschorner Marin
01f8dbc522 Merge pull request #375 from alexandrekreis/mconf 
Handling presentation tab change through keyboard shortcuts
 2017-03-24 16:58:50 -03:00
Felipe Cecagno
91f4fd8478 disallow crawlers 2017-03-12 21:46:18 -03:00
Felipe Cecagno
21170265e2 implement the ability to add artificial remote ICE candidates to the SDP, so we can better handle servers behind NAT (and other situations); extend the /api/stun call in order to retrieve the list of remote ICE candidates from a XML file 2017-03-12 21:45:08 -03:00
alexandre
297021ec84 Disabling presentation keyboard shortcuts and context menu items when sharing desktop 
Also, a little refactoring
 2017-03-08 15:09:41 -03:00
Pedro Beschorner Marin
140dc1bed7 Merge pull request #377 from pedrobmarin/updated-presentation-export 
Updated presentation export
 2017-02-24 17:55:37 -03:00
Pedro Beschorner Marin
d7a0493da4 Updated presentation_export 2017-02-24 20:03:47 +00:00
Felipe Cecagno
c8a91bc6d4 avoid breaking if there's no deskshare.xml in the published presentation recording 
Conflicts:
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
 2017-02-24 19:54:40 +00:00
Pedro Beschorner Marin
c44bcaffee Merge pull request #376 from pedrobmarin/deskshare-recording-refactoring 
Refactored deskshare video recording
 2017-02-24 16:17:12 -03:00
Pedro Beschorner Marin
490ecd2157 Reverting some modifications made in presentation publish script for deskshare video 2017-02-24 13:46:32 +00:00
Pedro Beschorner Marin
3e43602b33 Changed deskshare start/stop matching method 2017-02-23 20:17:16 +00:00
Pedro Beschorner Marin
6787915e0e Refactored deskshare video recording 2017-02-23 18:21:10 +00:00
alexandre
03b365961c Handling presentation tab change through keyboard shortcuts 
There were 2 issues:
- Flash was letting invisible tabs be accessed through keyboard shortcuts. We have to disable the invisible tabs as well.
- TabNavigator does not update the selectedIndex when the tab change is made through a keyboard shortcut. We have to get the correct index using TabBar and mouse event informations.
 2017-02-23 11:43:30 -03:00
Felipe Cecagno
d9fa4c9f09 Merge pull request #374 from alexandrekreis/mconf 
Removing timeline attribute for deskshare video
 2017-02-17 00:32:24 -02:00
alexandre
ccd4bc4268 Removing timeline attribute for deskshare video 
We don't need it. This causes duplicate chat messages in recording playback.
 2017-02-16 17:24:33 -02:00
Pedro Beschorner Marin
f6ee9b281f Merge pull request #373 from pedrobmarin/adjust-playback-to-old-recordings 
Adjusting playback to work with old recordings
 2017-02-15 11:16:04 -02:00
Pedro Beschorner Marin
7a4cd67fc3 Adjusting playback to work with old recordings 2017-02-14 13:52:44 +00:00
Pedro Beschorner Marin
929f7beda5 Merge pull request #372 from pedrobmarin/minor-translations-fix 
Adapting some client labels
 2017-02-07 09:58:59 -02: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
8bacfa0b71 Merge pull request #371 from pedrobmarin/mconf-minor-fixes 
Mconf minor fixes
 2017-02-06 15:09:10 -02:00
Pedro Beschorner Marin
9fe76ce2d8 Avoid record warning if record button is disabled 2017-02-06 16:29:09 +00:00
Pedro Beschorner Marin
8dfd4c9413 Added occitan to language selector 2017-02-06 16:17:23 +00:00
Pedro Beschorner Marin
4ba063f90a Merge pull request #369 from pedrobmarin/fixed-some-playback-issues 
Fixed some playback issues
 2017-02-01 17:17:31 -02:00
alexandre
dfa5a305cc Handling deskshare when closing meeting or stop recording 
Closing the room or stopping recording with an active deskshare was producing an incorrect recording
 2017-02-01 16:38:39 +00:00
Pedro Beschorner Marin
efb9082b9d Hiding deskshare cursor 2017-02-01 14:15:55 +00:00
Pedro Beschorner Marin
b91535741b Refactored canvas handling 2017-01-31 14:06:38 +00:00
Pedro Beschorner Marin
0647cdf3b1 Fixed NPE and did some cursor drawing refactoring at playback 2017-01-31 13:45:43 +00:00
Felipe Cecagno
2180987813 if language selector is hidden, doesn't include it in the layout 2017-01-30 16:53:42 -02:00