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

11735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghaz Triki
dca3fd6552 Align in center the darg and drop text hint in BreakoutRoomSettings 2016-04-27 15:36:32 +01:00
Ghaz Triki
ae338736b9 Center the box containing time limit in BreakoutRoomSettings.mxml 2016-04-27 15:34:24 +01:00
Ghaz Triki
1586e4dc8c Better layout for BreakoutRoomSettings.mxml 2016-04-27 15:28:17 +01:00
Ghaz Triki
d64f32dbaf Added custom label function for breakout room datagrid name column. 2016-04-27 14:34:44 +01:00
Ghaz Triki
64068cc30e Updated BreakoutRoomSettings layout and style. 2016-04-27 14:25:32 +01:00
Ghaz Triki
5f727f36d2 Make the main application as the parent of Alert to be centered. 2016-04-26 20:40:29 +01:00
Ghaz Triki
53ec4e3ae1 Better join breakout room popup centring with custom window size caluclation. 2016-04-26 19:40:36 +01:00
Ghaz Triki
d114c96142 Center breakout room join request popup. 2016-04-26 17:48:09 +01:00
Ghaz Triki
e024a68d42 Only the moderator can see the breakout rooms list. 2016-04-26 17:35:37 +01:00
Ghaz Triki
83a39bdc1c Make NameItemRenderer use the displayName property instead of name for the label. 2016-03-17 21:27:33 +01:00
Ghaz Triki
e129e4483a Refresh users ArrayCollection when updating breakout rooms users. 2016-03-17 21:09:27 +01:00
Ghaz Triki
5077b31415 Updates iteration through users for setting and usnetting breakout room number. 2016-03-17 17:47:21 +01:00
Ghaz Triki
fdde9f285a Show breakout room number before the user name. 2016-03-17 17:20:09 +01:00
Ghaz Triki
8edeb609db Send externalUserId instead of the internal user id to the main room. 2016-03-17 17:07:37 +01:00
Ghaz Triki
af07b8508b Make the breakout room user id composer from its original user id and the breakout room number. 2016-03-17 15:01:17 +01:00
Ghaz Triki
07d3028d10 Fetch all breakout rooms users and decorate BreakoutRoom class to display their the number of a breakout room users. 2016-03-16 19:12:10 +01:00
Ghaz Triki
6a559b05ec Merge branch 'master' into breakout-rooms-porto-algre-2015 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2016-03-16 14:27:41 +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
Ghaz Triki
bf97322f67 Updated breakout room meeting name. 2016-03-15 18:12:03 +01: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
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
Ghaz Triki
41e198f7b1 By accepting to join breakout room the user leaves the conference audio. 2016-03-11 15:51:16 +01:00
Ghaz Triki
9e33fd3024 No mute all expect the me is triggered when creating a breakout room. 2016-03-11 15:51:10 +01:00
Ghaz Triki
97b9fc70e2 Breakout rooms action column is not visible for viewers. 2016-03-11 15:47:23 +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