BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,604 Commits 13 Branches 260 Tags 1.1 GiB
859081fb82
Commit Graph

11604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghaz Triki
15a949a235 Fixed source directories for GradleFx 2016-03-31 17:31:27 +01:00
Ghaz Triki
4905b188be Updated .gitignore by adding the Flex 4 client generated GradleFx directories. 2016-03-24 20:00:52 +01:00
Ghaz Triki
f72e4f4dc2 Compile the flex4 client using GradleFx 2016-03-24 19:58:27 +01:00
Richard Alam
cda6000a8a Merge pull request #3054 from riadvice/close-popups-at-logout 
Remove PopUps and toolbars when logged out
 2016-03-21 14:48:27 -04:00
Ghaz Triki
618c01a442 Merge branch 'master' into close-popups-at-logout 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
 2016-03-16 08:15:59 +01:00
Richard Alam
3fca40ba36 Merge pull request #3053 from riadvice/fix-shortcuts-locale-switch 
Refresh the shortcuts ArrayCollection.
 2016-03-15 13:31:00 -04:00
Richard Alam
ab8055d11a Merge pull request #3052 from riadvice/client-improve 
Minor client improvements
 2016-03-15 13:29:55 -04:00
Richard Alam
cb00c7337a Merge pull request #3049 from riadvice/fix-logout-flash-debug 
Fix the Flash debug error when client logging out
 2016-03-15 13:17:44 -04:00
Fred Dixon
c438087bc1 Merge pull request #3051 from riadvice/fix-php-api-link 
Rename README to README.md to force its parsing
 2016-03-15 12:09:14 -04:00
Ghaz Triki
d5bc96c668 Reverted back navigate to logout URL. 2016-03-11 23:04:05 +01:00
Ghaz Triki
e0273aac7d Containers created with PopUpManager and toolbars are removed from the display list when the user is logged out from the application. 2016-03-11 23:02:10 +01:00
Ghaz Triki
5608889fd0 - Extracted locales strings from views. (reverted from commit 0b32f39041) 
- Removed no more used ChromeChangeMicImage and FirefoxChangeMicImage.
 2016-03-11 22:00:14 +01:00
Ghaz Triki
d435f7dd55 Refresh the shortcuts ArrayCollection. 2016-03-11 17:48:25 +01:00
Ghaz Triki
0b32f39041 Extracted locales strings from views. 2016-03-11 17:33:30 +01:00
Ghazi Triki
875e0a59b7 Rename README to README.md to force its parcing 2016-03-10 22:03:17 +01:00
Ghaz Triki
bf88560dca Center AudioSelectionWindow images and buttons. 2016-03-10 15:47:48 +01:00
Ghaz Triki
a9150c0b24 Fix the Flash debug error when client logging out. 2016-03-10 15:31:12 +01:00
Anton Georgiev
a46d3656f9 Merge pull request #3037 from lfzawacki/correctly-unjoin-voice-for-offline-user 
html5: Correctly kick user out of voice in markUserOffline
 2016-03-07 15:50:48 -05:00
Richard Alam
a1fe8c5727 Merge pull request #3046 from antobinary/fix-emoji-bug 
html5Client:fix emoji bug caused by Chrome vs FF behav difference
 2016-03-07 15:46:03 -05:00
Anton Georgiev
e34b6ced79 fix emoji bug caused by Chrome vs FF behav difference 2016-03-07 20:40:32 +00:00
Fred Dixon
0b3f9cfa28 Merge pull request #3045 from ritzalam/akka-apps-msg-handling-on-thread 
- process converting of message from json on a different thread to p…
 2016-03-07 13:05:36 -05:00
Richard Alam
603fa151c1 Merge pull request #3038 from jfederico/master 
bbb-lti: Implemented improvements to the LTI integration
 2016-03-07 11:58:05 -05:00
Richard Alam
53de48df29 Merge pull request #3044 from kepstin/recording-poll-escape 
recording: Escape custom poll answers in gnuplot file
 2016-03-07 11:57:18 -05:00
Richard Alam
297c52061d Improve commit message. 
Try to improve commit message. Nothing has changed in the code.
 2016-03-07 16:45:04 +00:00
Richard Alam
ef2470f33b Process JSON message from Redis on another thread 
Process converting of message from json on a different thread to protect the redis sub actor from
 dying when exception occurs due to invalid message.
 2016-03-07 16:42:40 +00:00
Richard Alam
38bf45a1dd - process converting of message from json on a different thread to protect the redis sub actor from 
dying when exception occurs due to invalid message.
 2016-03-07 16:31:06 +00:00
Calvin Walton
0f9b36bc11 recording: Escape custom poll answers in gnuplot file 
Custom poll answers were previously printed into the gnuplot control
file directly, between double-quotes. As a result, if a poll answer
contains a double-quote, it could cause a syntax error in the gnuplot
script, or worse.

Gnuplot accepts standard C-style double-quoted string escapes, so I can
just use ruby's "inspect" method to generate a safetly escaped string.

Note that within the string, % still has to be escaped separately
(doubled) to avoid issues with the string formatting. As well, I have
disabled "enhanced" mode which allows using special characters for
formatting commands.

Fixes #3039
 2016-03-07 11:26:17 -05:00
Fred Dixon
6dd8902268 Merge pull request #3042 from ritzalam/set-non-null-emoji-status 
- we are seeing redis sub reconnecting because of exception on null …
 2016-03-06 14:22:07 -05:00
Tiago Daniel Jacobs
7012a28b41 Merge pull request #3040 from tdj-br/master 
Stop applying initial layout to moderators.
 2016-03-05 14:45:10 -03:00
Tiago Daniel Jacobs
e7c8f98e34 Stop applying initial layout to moderators. bigbluebutton/bigbluebutton#2710 2016-03-05 14:43:41 -03:00
jfederico
b7de6d897b bbb-lti: Implemented changes to the LTI integration 
- Fixed issue with app not responding to https requests
- Added configuration for ignoring/considering lti key/secret
- Extended logParameters to show them ordered
 2016-03-03 15:56:54 -05:00
Lucas Zawacki
6b56521fbd html5: Correctly kick user out of voice in markUserOffline 
The old code was wrongly setting obj.voiceUser when it should set obj.user.voiceUser
and caused problems when for example:

* user joins audio
* user hits F5
* user reconnects without webrtc audio enabled
* html5 client reports user still in audio and leaving/joining doesnt work anymore
 2016-03-03 17:38:26 -03:00
Calvin Walton
e343354bb4 Merge pull request #3036 from kepstin/recording-last-slide 
recording: Restore the $meeting_start/end global variables
 2016-03-03 11:33:34 -05:00
Calvin Walton
3a3d349553 recording: Restore the $meeting_start/end global variables 
These were commented out, apparently by accident, when the metadata code
was being refactored. The effect was that the $meeting_end variable was
treated as if it had a value of zero, meaning that the last slide had a
start time of some positive number and an end time of zero. As a result,
it was never shown (and didn't get any shapes either).

Fixes #3021
 2016-03-03 11:27:28 -05:00
Fred Dixon
e76bcd360f Merge pull request #3035 from ffdixon/remove-old-php-library 
Remove old php library
 2016-03-03 08:21:08 -05:00
Fred Dixon
62d46424a5 Remove old php library (new: https://github.com/bigbluebutton/bigbluebutton-api-php) 2016-03-03 08:18:28 -05:00
Anton Georgiev
d89f51f392 Merge pull request #3034 from lfzawacki/user-voice-plus-emojis 
HTML5: Small corrections to userUpdateVoice and emoji refactoring
 2016-03-02 15:01:41 -05:00
Lucas Zawacki
85a0fda657 Correct Meteor.log for unsupported json messages 2016-03-02 15:44:25 -03:00
Lucas Zawacki
72591a6e9d Refactor icons to make it easier to extend and modify 2016-03-02 12:48:29 -03:00
Lucas Zawacki
92d5aaf5d0 Remove extra calls to updateVoiceUser in user mute/unmute 
This is supossed to be called when handling messages from the redis queue
and when called here would cause errors because it had no callback function.

The correct way is not calling it here, but handling the muting/unmiting when
receiving messages (which is already done).
 2016-03-02 12:44:34 -03:00
Fred Dixon
5b8531bb5f Merge pull request #3032 from ffdixon/fix-bbb-conf-2 
Fixed on bug in matching for http/https
 2016-02-28 18:59:31 -05:00
Fred Dixon
1f7023cd06 Fixed on bug in matching for http/https 2016-02-28 18:58:25 -05:00
Fred Dixon
07bdba35e2 Merge pull request #3031 from ffdixon/add-https-bbb-conf 
Updates to bbb-conf to support HTTPS configuration
 2016-02-28 18:31:20 -05:00
Fred Dixon
539d70a993 Updates to bbb-conf to support HTTPS configuration 2016-02-28 18:30:09 -05:00
Fred Dixon
3ab8baf478 Merge pull request #3030 from ffdixon/update-demos-https 
Update API demos to work with https
 2016-02-28 14:02:36 -05:00
Fred Dixon
39c397b05a Update API demos to work with https 2016-02-28 13:59:45 -05:00
Richard Alam
6c9ab887d5 - we are seeing redis sub reconnecting because of exception on null emoji status in akka-apps. 
set the emojistatus to "none" (default) when it is null
 2016-02-26 18:30:58 -05:00
Richard Alam
ec6b9cc6a7 Merge pull request #3028 from pedrobmarin/issue-2892 
Added missing div to fix WebRTC audio for JavaScript API demo
 2016-02-26 13:38:33 -05:00
Pedro Beschorner Marin
ca5f974bde Added missing div to fix WebRTC audio for JavaScript API demo 2016-02-26 18:27:42 +00:00
Fred Dixon
639b206418 Merge pull request #3026 from ffdixon/fix-flash-player-gif 
Fix missing get_flash_player.gif error message in nginx logs
 2016-02-26 07:21:44 -05:00