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

12586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Cecagno
9e38f9a279 Merge branch 'merge-presentation-deskshare' into mconf 2016-09-14 15:57:09 -03:00
Felipe Cecagno
bde1597cf4 disable deskshare buttons after clicking it once 2016-09-14 15:20:10 -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
Pedro Beschorner Marin
20d21ea313 Unregistering Java client deskshare stream 
Conflicts:
	deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/red5/DeskshareApplication.scala
	deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/stream/StreamManager.scala
 2016-09-14 14:01:01 -03:00
kreismann
b961e197c5 Not showing annotation canvas while sharing desktop in recording 
1. We create a deskshare.xml with start and stop timestamps of each deskshare event
2. We read it in playback e use its information to hide the annotation canvas and cursor accordingly
 2016-09-09 18:31:27 -03:00
kreismann
ff966fe2d5 Not loading annotation history when changing tabs 
Loading history generates duplicate annotations, causing an inconsistency on the undo functionality
(Also, a little cleanup)
 2016-09-09 17:12:26 -03:00
Felipe Cecagno
7c53a22bae Merge pull request #341 from pedrobmarin/fix-conf-mate-ulr 
Fixed API Mate URL
 2016-09-09 16:45:48 -03:00
Pedro Beschorner Marin
bd82a036a3 Fixed API Mate URL 2016-09-09 19:28:24 +00:00
kreismann
19cf643bd3 Prevent scrolling on slides tab 2016-09-08 16:56:58 -03:00
Felipe Cecagno
57047b5964 fix bigbluebutton cron job 2016-09-05 12:50:41 -03:00
Felipe Cecagno
4aa2a732e2 Merge branch 'mconf-live0.7.5' of github.com:mconf/bigbluebutton into mconf 
Conflicts:
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
 2016-09-01 18:00:43 -03:00
Felipe Cecagno
c2a2b7c87a enable mconf-decrypter to fetch the recordings even if mconf-live is using a self-signed certificate 2016-09-01 17:56:55 -03:00
Felipe Cecagno
d5d28e7dc0 Merge pull request #338 from pedrobmarin/fix-bbb-voice-dependency 
Fixed one broken lib in bbb-voice
 2016-09-01 14:13:00 -03:00
Felipe Cecagno
a7978abd03 Merge pull request #337 from pedrobmarin/adapting-freeswitch-1.6.x 
Adjusting configurations to fit FreeSWITCH 1.6.X changes
 2016-09-01 14:12:48 -03:00
Felipe Cecagno
8daaf5d599 Merge pull request #333 from pedrobmarin/fix-video-reconnection 
Fix video reconnection
 2016-09-01 14:11:09 -03:00
Felipe Cecagno
c5917f6a92 update presentation_export playback to be responsive as the playback format 2016-09-01 14:07:33 -03:00
Felipe Cecagno
83d6f37f06 Merge pull request #332 from pedrobmarin/mconf-responsive-playback 
Responsive playback
 2016-09-01 13:49:58 -03:00
Felipe Cecagno
2a68455142 Merge pull request #331 from pedrobmarin/window-dragging-resizing 
Window dragging resizing
 2016-09-01 12:34:07 -03:00
Felipe Cecagno
66ad08e616 Merge branch 'mconf' of github.com:mconf/bigbluebutton into mconf 2016-09-01 12:24:15 -03:00
Felipe Cecagno
b14ad98084 Merge pull request #330 from pedrobmarin/mconf 
Chat time from server
 2016-09-01 12:25:18 -03:00
Pedro Beschorner Marin
00c565d17a Fixed one broken lib in bbb-voice 2016-09-01 13:25:45 +00:00
Pedro Beschorner Marin
66e318cd91 Adjusting configurations to fit FreeSWITCH 1.6.X changes 2016-08-31 19:35:07 +00:00
Felipe Cecagno
d884264852 update Gemfile and Gemfile.lock, will start to deploy Gemfile.lock and execute ruby using bundler 2016-08-18 16:23:33 -03:00
Felipe Cecagno
714aba46ef set to debug some of the new log messages on mconf-decrypter 2016-08-18 16:22:40 -03: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
Leonardo Crauss Daronco
d860d166df Make mconf-decrypter work with HTTPS and redirects 
It now works with HTTPS URLs and will follow one redirect. The redirect is
useful for when the server being requested redirects HTTP to HTTPS.
 2016-08-16 13:09:19 -03:00
Felipe Cecagno
db88be79b2 cleanup 2016-08-15 13:25:04 -03:00
Felipe Cecagno
b84aeb62ca Merge branch 'merge-presentation-deskshare' of github.com:alexandrekreis/bigbluebutton into merge-presentation-deskshare 2016-08-12 13:39:27 -03:00
kreismann
fcc047fd71 Fixing some interface bugs 
- Resetting actual size button when DesktopViewWindow is closed;
- Hiding publish window tab and "close publish" button when user is not the presenter anymore;
 2016-08-10 18:47:16 -03:00
kreismann
3255344b3f Zoom factor on whiteboard must be in percentage 2016-08-10 14:38:58 -03:00
kreismann
94a7a7d26c Resizing only the active tab 
Both tabs (DesktopView and SlideView) share the whiteboard canvas, so we need to resize only the active tab to prevent whiteboard canvas being resized based on a unused tab.
 2016-08-08 16:32:02 -03:00
Felipe Cecagno
81bff6f929 cleanup DesktopPublishWindow 2016-08-05 17:14:47 -03:00
kreismann
a471d084df Correctly updating ControlBar buttons on polls 2016-08-05 17:08:56 -03:00
Felipe Cecagno
ee55554090 fix zoom of shapes in the deskshare; resize properly the whiteboard overlay canvas on the deskshare 2016-08-04 21:32:44 -03:00
kreismann
f3420e77b3 Desktop sharing video is shown only in ViewWindow 
- Presenters also see their previews in ViewWindow.
- Video preview removed from PublishWindow
- Adding whiteboard annotation overlay to ViewWindow
- PresentationWindow refactored

Pendent issues and bugs:
I. If the user is the presenter, his desktop video must contain a warning like "You are sharing your desktop"
II. Annotations still appear dislocated in certain ocasions;
III. We must correct annotations made in "Actual size" mode;
IV. Further testings
 2016-08-02 15:34:07 -03:00
Felipe Cecagno
f44c25f3f6 do not use hardcoded http to load resources in the playback 2016-08-01 23:53:49 -03: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
kreismann
17255f63e4 Removing some event listeners from deskshare views 
Sometimes a closed view was still listening to important events. Now we make sure that only active deskshare views react to these events.
 2016-07-25 14:47:31 -03:00
Pedro Beschorner Marin
e0af0524b2 Merge remote-tracking branch 'fix-video-reconnection' into mconf 2016-07-22 16:05:07 +00:00
kreismann
323dae6b61 Resizing annotations only when we change the display mode in DesktopViewWindow 2016-07-20 17:43:44 -03:00
kreismann
825b39df1b Updating coordinates and resizing new annotations. 
Resolving the issues from previous commit.
 2016-07-18 18:05:19 -03:00
kreismann
5a4b57bc43 Resizing annotations in DesktopViewWindow when displaying video in actual size. 
Still missing two issues:
- Update not only children's Width and Height, but also children's X and Y;
- Before add a new DisplayObject in addRawChild( ), we must resize it and update coordinates X,Y IF we are displaying video in actual size.
 2016-07-15 18:13:01 -03:00
kreismann
1197d1a3ad Added whiteboard functionality to the deskshare tab. 
Some pending issues:

- Notes made in DeskstopPublishWindow appear a little dislocated in DesktopViewWindow.

- Independence between SlideView and Deskshare notes. Deskshare and SlideView tabs share current slide notes. Perhaps make Deskshare Window be treated as a new page of the current presentation or as a new presentation.
 2016-07-13 17:39:55 -03:00
Pedro Beschorner Marin
abebee010f Merge branch 'daronco/responsive-playback' into mconf 
Conflicts:
	record-and-playback/presentation/playback/presentation/0.9.0/logo.png
	record-and-playback/presentation/playback/presentation/0.9.0/playback.html
 2016-07-12 16:26:47 +00:00
Pedro Beschorner Marin
fac305f8f6 Merge commit '427a288dfe61cfdb28cc1c20a11a36c84f3a33d9' from daronco/responsive-playback into bigbluebutton/v1.0.x-release 
Conflicts:
	record-and-playback/presentation/playback/presentation/0.9.0/playback.html
 2016-07-12 14:21:04 +00:00
Pedro Beschorner Marin
2533a3f553 Sharednotes window dragging and resizing control 2016-07-11 21:35:41 +00:00
Pedro Beschorner Marin
d0fe350172 Merge branch 'avoid-shift-dragging' into mconf 2016-07-11 20:03:21 +00:00
Pedro Beschorner Marin
b64c1e26c5 Merge remote-tracking branch 'origin/fix-chat-selection' into avoid-shift-dragging 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml
 2016-07-11 19:50:29 +00:00
Felipe Cecagno
4f96eaab01 Merge branch 'mconf' of github.com:mconf/bigbluebutton into mconf 2016-07-07 22:50:19 -03:00
Pedro Beschorner Marin
83e78f2bfa Cleanup 2016-07-06 15:59:13 +00:00