BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,824 Commits 13 Branches 260 Tags 1.1 GiB
785436fb74
Commit Graph

10824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Cecagno
785436fb74 fix empty paragraph representation in the html shared notes format 2015-12-22 16:12:21 -02:00
Felipe Cecagno
08ebb0b79d replace font tag on formatted shared notes by the span style attribute; remove textformat tag; improve readability 2015-12-21 17:14:55 -02:00
Felipe Cecagno
af1322e08c fix wrong font size on the formatted shared notes 2015-12-21 14:09:33 -02:00
Felipe Cecagno
ad7e3999e7 include size for the download formats on the getRecordings api call 2015-12-17 13:37:02 -02:00
Felipe Cecagno
de75b79eab changed the method of pack and unpack the encrypted format, from zip to tar, and making it by an external command instead of doing it in ruby (more efficient) 2015-12-15 16:45:22 -02:00
Felipe Cecagno
f673122da2 sanitize the parameters of resizeAndMoveSlide, so MeetingActor won't throw an Exception because of NaN 2015-12-15 12:51:12 -02:00
Felipe Cecagno
2c880f7e5f fix exception handling on scala actors (print instead of die) 2015-12-15 12:51:12 -02:00
Felipe Cecagno
84ebeb2757 Merge branch 'mconf-live0.7.3' of github.com:mconf/bigbluebutton into mconf-live0.7.3 2015-12-09 23:42:45 -02:00
Felipe Cecagno
1dc6a675e4 use BigInteger to calculate the recording size 2015-12-09 23:42:22 -02:00
Felipe Cecagno
f49d758582 change attribute on bbb_webrtc_bridge due to a new version if sip.js, from iceGatheringTimeout to iceCheckingTimeout 2015-12-08 17:43:14 -02:00
Felipe Cecagno
5d1534df8c Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.7.3 
Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/lib/sip.js
 2015-12-08 17:42:43 -02:00
Felipe Cecagno
dd99398ff7 fix the notes save button emphasized property 2015-12-08 17:38:05 -02:00
Felipe Cecagno
15ad366550 move the shared notes icons to branding 2015-12-08 17:38:05 -02:00
Felipe Cecagno
97daf0e9f5 add a menu next to the save notes button so the user can save both formatted or unformatted notes; create a new class WellPositionedMenu which will automatically position a menu next to a button or any other display object; cleanup 2015-12-08 17:38:05 -02:00
Felipe Cecagno
66379edc1d fix deskshare on java 1.9 2015-12-08 17:38:05 -02:00
Felipe Cecagno
59dce70b6a add the byte order mark for UTF-8 when saving notes, so it will be displayed properly in the browsers 2015-12-08 17:38:04 -02:00
Felipe Cecagno
ee357aa7ac fixed the issue on the retrieving of the download size by bbb-web 2015-11-24 13:21:47 -02:00
Leonardo Crauss Daronco
5ffd2439bd Fix "ReferenceError: hook is not defined" when removing hook 2015-11-13 17:12:12 -02:00
Felipe Cecagno
66b96398e6 show the disabled record button for viewers; hide confirmation alert if the moderator lose its role 2015-11-13 14:33:43 -02:00
Felipe Cecagno
6e5729fc67 created toolbarVisibleByDefault and showToolbarButton attributes for shared notes window 2015-11-10 11:17:23 -02:00
Fred Dixon
6ac691e76b Merge pull request #2882 from capilkey/09-update-sipjs 
Updated SIP.js to match master
 2015-11-06 12:48:05 -05:00
Chad Pilkey
4dcc4a4c6e updated sipjs to match master 2015-11-06 08:47:41 -08:00
Pedro Beschorner Marin
15acb57b17 We need to update the registered user's list when role and waitingForAcceptance change because reconnection doesn't trigger a userLeaving msg anymore 2015-10-26 10:57:12 -02:00
Pedro Beschorner Marin
3a2d6e52b8 Bugfix-#1838: Checking for user's role missmatch between API join response and server join meeting reply 2015-10-25 23:08:28 -02:00
Fred Dixon
3cb5263e18 Merge pull request #2853 from ffdixon/fix-bbb-conf-setip 
Fixed #2835
 2015-10-23 18:01:40 -04:00
Fred Dixon
1d07c4de78 Fixed #2835 2015-10-23 17:52:53 -04:00
Felipe Cecagno
7a182e67b6 Merge branch 'feature-1734' into mconf-live0.7.3 (refs #1734) 2015-10-23 12:47:08 -02:00
Felipe Cecagno
c3c4a9c64c extracted the custom hash class to a different file, loaded by recordandplayback.rb; removed the hardcoded path to /var/bigbluebutton/published/presentation because it can change, and it's always different depending on the playback format (refs #1734) 2015-10-23 12:46:26 -02:00
Felipe Cecagno
cf121f934a forbid the viewer to try to unlock himself on the user list refs #1722 
bug introduced while we were enabling the viewer to mute/unmute himself from the users list
 2015-10-23 12:00:59 -02:00
Felipe Cecagno
f80dcc33ae fixed the issue introduced when we ordered the loading of locale swfs refs #1759, when the locale to be master locale and the preferred locale are the same 2015-10-23 10:43:26 -02:00
Felipe Cecagno
885d16e42e reverted mconf/bigbluebutton@8f636d158a refs #1746, since the tooltip identifier is used as "tooltip" instead of "toolTip" 2015-10-23 10:41:08 -02:00
Felipe Cecagno
30caf8b0fb Merge remote-tracking branch 'RafaFP/fix-1722' into mconf-live0.7.3 (refs #1722) 2015-10-23 09:50:47 -02:00
Felipe Cecagno
25920da78d Merge remote-tracking branch 'RafaFP/fix-1744' into mconf-live0.7.3 2015-10-22 13:48:56 -02:00
Felipe Cecagno
b7c8a5db91 Merge remote-tracking branch 'rafael/fix-1753' into mconf-live0.7.3 2015-10-22 13:44:15 -02:00
Felipe Cecagno
876b077021 improve the loading order for the master locale and the preferred locale (refs #1759) 2015-10-21 12:54:43 -02:00
Felipe Cecagno
693dabf140 update the talking status of the video window when the user leaves the audio 2015-10-20 11:38:34 -02:00
Felipe Cecagno
ab83c823c7 do not manage the layout of the shortcuts window 2015-10-20 10:49:04 -02:00
Felipe Cecagno
3739d6fc79 call the main connection to bbb-apps "main" instead of "bigbluebutton" 2015-10-20 10:43:20 -02:00
Felipe Cecagno
f9eaa32a12 publish recording immediately after the process phase, before processing other recordings; fix step_succeeded vs. phase_succeeded 2015-10-19 17:40:30 -02:00
Felipe Cecagno
c4ff37e292 fixed recording size inclusion when processing presentation_export 2015-10-19 17:39:26 -02:00
Felipe Cecagno
83ae244485 Merge branch 'mconf-live0.7.1-ssl' into mconf-live0.7.3 2015-10-19 11:49:36 -02:00
RafaFP
1240a7eff4 Improved the Shared Notes window to properly support mouse Context Menu Paste (was an issue, would not trigger the formatting corrections for pasted data). 
Solved a bug where pasted text would cause kerning to change and eventually cause loss of consistency.
Kerning would become a nested tag, breaking consistency when left empty.
ref #1742
 2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
de00dc2fe3 Fixed text style when keyboard input with multiple lines selected 2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
7f4f704cf1 Refresh font type, size and color when user delete or backspace a paragraph the same way Flash handles alignment fixing 2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
b36be98745 Fixed array out of bounds exception 2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
33cba3d440 Text type, color and size will work the same as alignment 2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
da292fe3ed Cleaning (some) text formatting when enter key is pressed 2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
743b5f5197 Avoid formatting empty lines when selected 2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
96a000ed99 Adding new RichTextEditor mxml 2015-10-19 11:49:13 -02:00
Felipe Cecagno
385b043146 Merge branch 'mconf-live0.7.3' of github.com:RafaFP/bigbluebutton into mconf-live0.7.3 2015-10-19 11:25:39 -02:00