Commit Graph

11568 Commits

Author SHA1 Message Date
gcampes
f3a739d8c4 Move react folder from views 2016-04-06 09:49:21 -03:00
gcampes
1f34ff8f7b Adds new react folder structure 2016-04-06 09:49:05 -03:00
Oswaldo Acauan
5932cfa2de Changed boilerplate stuff to icon component 2016-04-06 09:48:51 -03:00
gcampes
272ce793f5 Change user object that goes into the components. feat. oswaldoacauan 2016-04-06 09:48:48 -03:00
gcampes
4896cc51e1 adds icon and tooltip react component 2016-04-06 09:48:47 -03:00
gcampes
85e5f341d8 Added dummy user-list react-components 2016-04-06 09:48:41 -03:00
gcampes
3b171164d3 Added comment 2016-04-06 09:48:39 -03:00
Oswaldo Acauan
6d4a0c32a5 Refactor 2016-04-06 09:48:39 -03:00
gcampes
a1823b1235 testing remote branching 2016-04-06 09:48:37 -03:00
gcampes
a948575a6e Started the user list as a react component 2016-04-06 09:48:37 -03:00
Richard Alam
6b6f1622dc Merge pull request #3073 from perroned/edge-as-chrome
Fixes #3068 - Detecting Microsoft Edge as Google Chrome
2016-04-05 14:04:37 -04:00
Richard Alam
d1c0a22a4a Merge pull request #3074 from capilkey/1.0-access-bugfix2
Fixed some accessibility bugs in 1.0
2016-04-05 14:03:37 -04:00
Chad Pilkey
6784c4c36d fixed a couple of accessibility bugs in 1.0 2016-04-04 12:23:51 -07:00
perroned
eb5eb45669 Moves deskshare browser checks into central location 2016-04-02 19:59:58 -05:00
perroned
5ab6e5b960 Checks for Edge browser on deskshare publish window 2016-04-02 19:45:27 -05:00
perroned
088d3eb4cd Linker checks for Edge browser 2016-04-02 19:32:29 -05:00
perroned
6bce9350cb Adds Edge browser warning to en_US locale 2016-04-02 19:31:34 -05: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