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

12610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pedro Beschorner Marin
796a29157e Removed time from welcome message 2016-07-06 15:53:42 +00:00
Pedro Beschorner Marin
81e1678b0a Merge remote-tracking branch 'RafaFP/fix-1915' into mconf 2016-07-06 13:44:12 +00:00
Felipe Cecagno
10ab1ef74d Merge pull request #329 from pedrobmarin/mconf 
Avoid opening the guest window for a promoted user when the guest list is empty
 2016-07-01 12:50:51 -03:00
Pedro Beschorner Marin
22830cf23a Avoid opening the guest window for a promoted user when the guest list is empty 2016-07-01 15:22:27 +00:00
Pedro Beschorner Marin
487b39c00e Avoid closing client's videoconf module window when reconnecting 2016-06-30 18:19:46 +00:00
Felipe Cecagno
c1c309a650 rename function from clearPublicChatMessage to clearPublicChatMessages 2016-06-30 14:39:30 -03:00
Felipe Cecagno
b62f94e165 Merge pull request #326 from pedrobmarin/merging-to-1.0 
Merging to 1.0
 2016-06-30 12:45:47 -03:00
Pedro Beschorner Marin
85e68a66ca Merge remote-tracking branch 'origin/inactivity-timeout' into merging-to-1.0 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
 2016-06-27 19:57:48 +00:00
Pedro Beschorner Marin
c40684b13d Update guest window when changing participant role 2016-06-27 18:44:19 +00:00
Felipe Cecagno
90c1c84771 fix video positioning on the presenter preview deskshare 2016-06-27 13:38:46 -03:00
Pedro Beschorner Marin
415393ca30 Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
 2016-06-27 13:10:58 +00:00
Pedro Beschorner Marin
3fd65405e2 Merge branch 'merging-to-1.0' of https://github.com/pedrobmarin/bigbluebutton into merging-to-1.0 2016-06-27 12:50:47 +00:00
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