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

4552 Commits

Author SHA1 Message Date
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
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
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
Felipe Cecagno
1f9ed04243 Merge branch 'mconf-live0.7.3' of github.com:pedrobmarin/bigbluebutton into mconf-live0.7.3 2015-10-19 11:25:06 -02:00
Felipe Cecagno
ec96c89105 Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.7.1-ssl 
Conflicts:
	bigbluebutton-client/resources/prod/MconfLive.html
 2015-10-15 15:22:05 -03:00
Calvin Walton
f6adcde830 Update Firefox 41 hang workaround for 41.0.2 
Cherry-picked from b4e3561 on master.
 2015-10-15 14:17:55 -04:00
Fred Dixon
e3c8520f67 Apply fix for this bug https://github.com/bigbluebutton/bigbluebutton/issues/2832 2015-10-09 16:22:30 -04:00
RafaFP
7e4946865a Fixed the buttons delay on disappearing and killed the connection for good if on flash microphone. 
refs #1800
 2015-09-21 22:22:00 +00:00
Pedro Beschorner Marin
eac7c9c4d4 Ejecting voice user after a Flash mic reconnection 2015-09-18 15:19:07 +00:00
Pedro Beschorner Marin
655ed560ed Better control for bigbluebutton reconnection 2015-09-17 18:24:30 +00:00
Pedro Beschorner Marin
6ee634d53e Fixed missing reconnected user name in users list 2015-09-16 20:11:10 +00:00
Pedro Beschorner Marin
d53b1d058e Fixed deskshare reconnection issue #1802 2015-09-16 16:03:47 +00:00
Felipe Cecagno
b17719e8cf added proxyType to best on some connections preparing the client to use rtmps 2015-09-12 19:59:32 -03:00
Felipe Cecagno
3e75ddbcee update the websocket server address if the page is loaded using https (so the socket server must be secure as well) 2015-09-12 14:13:18 -03:00
Calvin Walton
56fb7c8b06 Use protocol-relative links to load the 'get flash' button image 
This fixes a mixed content warning when loading the client over https
 2015-09-12 12:35:59 -03:00
Felipe Cecagno
8288d52d1c Merge branch '090-multinotes-rich-text' of github.com:pedrobmarin/bigbluebutton into mconf-live0.7.3 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
 2015-09-07 23:44:37 -03:00
Felipe Cecagno
ac4f58c997 Merge branch 'fix-issue-1716' of github.com:pedrobmarin/bigbluebutton into mconf-live0.7.3 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
 2015-09-07 23:26:00 -03:00
Felipe Cecagno
a7b220e207 Merge branch '090-multinotes' into mconf-live0.7.3 2015-09-07 23:19:16 -03:00
Felipe Cecagno
261ae44f10 Merge branch 'fix-1723' into mconf-live0.7.3 2015-09-03 15:29:34 -03:00
Felipe Cecagno
d5c0047611 Merge branch 'feature-1733' into mconf-live0.7.3 2015-09-03 15:23:15 -03:00
Felipe Cecagno
6dbf18c2e5 cleanup 2015-09-03 15:22:54 -03:00
Felipe Cecagno
3c4055ec01 removed extra add_circle_outline icon from previous commit (use css style instead) 2015-09-03 15:16:16 -03:00
Felipe Cecagno
c99e3fbfb4 Merge branch 'feature-1745' into mconf-live0.7.3 2015-09-03 14:24:33 -03:00
Felipe Cecagno
7063cfa833 included the "Default language" option to the list of languages 2015-09-03 14:04:29 -03:00
Felipe Cecagno
40ce5f8877 changed the logic we store locales on ResourceUtil, so we can do a better job changing the language names and ordering them 2015-09-03 12:42:16 -03:00
Felipe Cecagno
e7ed9fda45 fix connection names 2015-08-31 17:16:07 -03:00
Felipe Cecagno
c8188670da Merge branch 'mconf-live0.6.4-auto-reconnect' into mconf-live0.7.2-auto-reconnect 
Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
 2015-08-31 16:50:47 -03:00
Pedro Beschorner Marin
f12539fe81 Added pt_BR translation 2015-08-28 16:47:09 +00:00
Pedro Beschorner Marin
2b1a0274eb Merge branch 'auto-reconnect' into mconf-live0.6.4-auto-reconnect 2015-08-28 16:34:21 +00:00
Pedro Beschorner Marin
019089db2e Closing Flash phone connection if user leaves Flash audio 2015-08-28 16:05:40 +00:00
RafaFP
6545dd89c5 Implemented the feature which changes the name of the locations to Portuguese (Brazilian) when the user changes the locale to Portuguese (Brazilian). 
#ref1745
 2015-08-24 21:26:24 +00:00
RafaFP
8f636d158a Apply lock settings button tooltip fixed in en_US and pt_BR locales. 
#ref 1753
 2015-08-19 18:38:17 +00:00