BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,360 Commits 13 Branches 260 Tags 1.1 GiB
4296bac515
Commit Graph

675 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
56989c54ac Added Cursor functionality 2017-02-23 15:27:48 -08:00
Oleksandr Zhurbenko
03791aa7f1 Added publishCursorUpdate method to the cursor api 2017-02-23 15:26:59 -08:00
Oleksandr Zhurbenko
fe01f81e27 changed slide-controls to presentation-toolbar 
.. and removed duplicate strings from the locales
 2017-02-23 12:20:21 -08:00
Oleksandr Zhurbenko
48c3c5252e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into whiteboard-restructuring 2017-02-23 10:26:03 -08:00
Oleksandr Zhurbenko
119beae88b Restructured whiteboard code 2017-02-23 10:20:45 -08:00
Oleksandr Zhurbenko
09090eda13 Removed an unnecessary import from the cursor service 2017-02-23 10:20:29 -08:00
Oleksandr Zhurbenko
8f74e984ac Restructured the whiteboard code 2017-02-23 10:19:59 -08:00
Oleksandr Zhurbenko
649b0a2738 Fixed presentation imports 2017-02-23 10:15:25 -08:00
Oleksandr Zhurbenko
10c8b86a0d Renamed whiteboard to presentation 2017-02-23 10:14:35 -08:00
Oswaldo Acauan
8bd65c1a43 Merge remote-tracking branch 'upstream/master' into refactor-api-users 
* upstream/master: (47 commits)
  Updated with correct version
  Check for initial values in application.conf
  remove defaultMessage
  Remove wrong selector when upserting captions
  Localize other labels through the application
  localize labels for AudioSettings component
  localize label for AudioTest component
  hide option to reset status if there is no status (emojis)
  drop voice in main room when joining breakout room
  add defaultMessage for Public Chat
  localize Join/Leave Audio labels
  Remove console logs
  Fix ´get_all_meetings_request´ being published multiple times
  Clean captions when handling the history reply
  Fix presentation slide coordinates
  - when we get invalid coordinate for presentation slide, change coordinate so it falls within bounds
  use localized Public Chat label
  finish locals for the audio modal
  Returning number of users that participated in each meeting in getRecordings call
  add comment for condition
  ...
 2017-02-23 17:46:30 +00:00
Oswaldo Acauan
f16926c94d Refactor emojiStatus method 2017-02-22 13:11:47 +00:00
Oswaldo Acauan
09481987ce Refactor assignPresenter method 2017-02-22 12:56:32 +00:00
gcampes
f941eaea3d solve closed captions settings issue, continue settings implementation 2017-02-21 17:29:36 -03:00
Anton Georgiev
327ea70ce3 Merge pull request #3669 from antobinary/locals-2 
HTML5: Localize more client side strings
 2017-02-17 13:48:12 -05:00
Anton Georgiev
e7345ed7a2 remove defaultMessage 2017-02-17 13:44:17 -05:00
Anton Georgiev
1577fbd35a Merge pull request #3591 from oswaldoacauan/refactor-api-captions 
[HTML5] Refactor API Closed Captions
 2017-02-17 13:21:20 -05:00
Anton Georgiev
f4ea3445d7 Localize other labels through the application 2017-02-16 17:14:10 -05:00
Anton Georgiev
216f494346 localize labels for AudioSettings component 2017-02-16 15:57:57 -05:00
Anton Georgiev
b1f0282c52 localize label for AudioTest component 2017-02-16 14:47:12 -05:00
Anton Georgiev
c6a15d6f7f Merge pull request #3664 from antobinary/drop-voice-in-main 
HTML5: Drop voice in main room when joining breakout room
 2017-02-16 14:04:28 -05:00
Anton Georgiev
3581023b91 hide option to reset status if there is no status (emojis) 2017-02-16 10:53:54 -05:00
gcampes
3243ff32cf Changes to settings modal 2017-02-15 16:49:40 -02:00
Anton Georgiev
a8df05f3e6 drop voice in main room when joining breakout room 2017-02-15 13:36:30 -05:00
Anton Georgiev
9110468782 add defaultMessage for Public Chat 2017-02-14 13:12:01 -05:00
Anton Georgiev
f4516180e2 localize Join/Leave Audio labels 2017-02-14 11:28:21 -05:00
Anton Georgiev
8bce68e137 use localized Public Chat label 2017-02-13 13:32:00 -05:00
Anton Georgiev
3362f76604 finish locals for the audio modal 2017-02-10 15:26:52 -05:00
Anton Georgiev
ac140be59a Merge pull request #3653 from KDSBrowne/Chat-Scroll 
HTML5 - Chat scroll fix
 2017-02-10 13:51:53 -05:00
KDSBrowne
7df8502349 add comment for condition 2017-02-10 10:02:39 -08:00
KDSBrowne
f6c8b2e174 make condition less confusing 2017-02-10 09:59:00 -08:00
KDSBrowne
c80d11e1c3 remove console logs 2017-02-10 08:40:54 -08:00
KDSBrowne
a3ca561c6b fix condition for shouldScrollBottom 2017-02-10 08:39:31 -08:00
Anton Georgiev
f2a2fcd8d7 Merge pull request #3643 from antobinary/close-tab-br 
html5: Close breakout room browser tab when breakout room ends
 2017-02-10 10:52:06 -05:00
Anton Georgiev
a6bd998684 Merge pull request #3648 from mmarangoni/chatbox-fix 
Chat List Scrollbar Fix
 2017-02-10 10:43:42 -05:00
Anton Georgiev
ad80d31b9a instead of detecting user remove, track breakout end => close tab 2017-02-09 16:28:41 -05:00
KDSBrowne
d7e4dae341 Fix chat auto scroll 2017-02-09 08:04:18 -08:00
Anton Georgiev
577809b5a3 close breakout room tab when expired 2017-02-08 14:56:29 -05:00
Matthew Marangoni
b175d260ca fixed scrollbar spacing in chat 2017-02-08 11:05:58 -08:00
Anton Georgiev
2863377ba7 Merge pull request #3637 from KDSBrowne/Audio-Err-Notification-Update1 
HTML5 - Audio Notification Update1
 2017-02-07 16:20:25 -05:00
KDSBrowne
47636857f4 discard notification if connection is successful 2017-02-07 07:16:04 -08:00
JaeeunCho
50b0790dfb HTML 5 - changed css for divider 2017-02-06 09:44:38 -08:00
JaeeunCho
ed5afbbb90 Merge remote-tracking branch 'upstream/master' into record 2017-02-06 08:55:38 -08:00
Anton Georgiev
7ad046d8be Merge pull request #3607 from KDSBrowne/Audio-Err-Notification 
Audio Error notification
 2017-02-02 15:37:05 -05:00
Anton Georgiev
d1176678d9 Merge pull request #3609 from KDSBrowne/Audio-Modal-Reduction 
Add Transaprent Base for Audio Modal only
 2017-02-02 12:07:54 -05:00
Anton Georgiev
10b0cfe893 Merge pull request #3611 from KDSBrowne/MuteButton-Voice-Inidicator 
Mute button glow indicator
 2017-02-02 12:06:49 -05:00
KDSBrowne
6c372ed68b fix lint issues 2017-02-02 08:46:49 -08:00
JaeeunCho
94db42d7b1 HTML5 - changed divider of record button 2017-02-02 07:36:49 -08:00
JaeeunCho
04c5fe1862 Merge remote-tracking branch 'upstream/master' into record 2017-02-02 07:04:31 -08:00
Anton Georgiev
3857d932b6 don't show promote option for presenter user' 2017-02-01 14:44:05 -05:00
KDSBrowne
c6ab4c2687 remove glow prop and use className to change style 2017-02-01 11:40:00 -08:00
Anton Georgiev
1ad5cc1959 reorganize user actions 2017-02-01 14:32:06 -05:00
Anton Georgiev
fc27dc9a5c clean up 2017-02-01 14:27:25 -05:00
Anton Georgiev
0dbb8d62ca allow for mute/unmute by moderator 2017-02-01 14:14:32 -05:00
KDSBrowne
1ab0b05e37 rename css class 2017-02-01 10:03:50 -08:00
Anton Georgiev
43922300e8 fix setPresenter and kick user 2017-02-01 11:47:39 -05:00
KDSBrowne
d6370a8808 add box shadow to button and remove label glow 2017-02-01 08:16:02 -08:00
Oswaldo Acauan
b1348fbfb8 Merge remote-tracking branch 'upstream/master' into refactor-api-captions 
* upstream/master:
  bbb-conf --check warns you if you have SSL configured by still have FreeSWITCH listening on port 5066
  Cleanup formatting of port for nginx in bbb-conf --check
  fixed userlist and chat scrolling in Firefox
  Escaping Java's properties file instructions
  In recording playback, chat links open in a new tab
  cleanup
  limit sound on unread chat via Settings and Config
 2017-02-01 15:28:45 +00:00
Anton Georgiev
b069eed00d Merge pull request #3613 from mmarangoni/chatbox-fix 
Fixed userlist and chat scrolling in Firefox
 2017-01-31 12:29:05 -05:00
KDSBrowne
f8bfc3ea15 remove duplication for setting color 2017-01-31 08:13:01 -08:00
KDSBrowne
868c615d6a add getUserMedia failure message 2017-01-31 08:06:12 -08:00
KDSBrowne
3f367a782a add formatted message 2017-01-30 07:42:58 -08:00
JaeeunCho
6689527505 HTML5 - changed property for checking recording status 2017-01-30 06:55:20 -08:00
JaeeunCho
1ab7cb7c48 Merge remote-tracking branch 'upstream/master' into record 2017-01-30 06:31:35 -08:00
Matthew Marangoni
e42e4c759a fixed userlist and chat scrolling in Firefox 2017-01-27 14:13:25 -08:00
KDSBrowne
4c6e5a3225 extend overlay class and change background 2017-01-27 11:20:31 -08:00
KDSBrowne
cc3fb848c6 change mute button style if user is talking 2017-01-27 08:57:14 -08:00
gcampes
ce703d3b20 First changes to settings 2017-01-27 13:41:11 -02:00
KDSBrowne
25cff03cb6 rename overlayClassName 2017-01-27 07:35:09 -08:00
KDSBrowne
7ce0c175b9 fix inverted mute status icon 2017-01-27 06:41:22 -08:00
KDSBrowne
813a9a5958 remove duplication in base render 2017-01-27 06:32:54 -08:00
KDSBrowne
5adfec6b5a remove duplicate component 2017-01-26 13:00:24 -08:00
KDSBrowne
9a72a8fa31 add transaprent base for audio modal 2017-01-26 12:19:09 -08:00
KDSBrowne
49e0ee642a remove unneeded state variable 2017-01-26 08:45:47 -08:00
KDSBrowne
dbddb304cf change render condition and move event to switch 2017-01-26 08:25:28 -08:00
KDSBrowne
61de5fe393 add user notification for audio failure 2017-01-25 11:52:17 -08:00
Oleksandr Zhurbenko
86c2cced74 Fixed closed-captions view box placement 2017-01-24 22:40:39 -08:00
JaeeunCho
99d685d818 HTML5 - changed divider of recorded icon 2017-01-24 15:06:57 -08:00
Anton Georgiev
64db5ef257 cleanup 2017-01-24 17:34:58 -05:00
Anton Georgiev
1b950f5e78 limit sound on unread chat via Settings and Config 2017-01-24 17:32:25 -05:00
JaeeunCho
c732e5774b HTML5 - changed a variable name 2017-01-20 13:47:16 -08:00
JaeeunCho
0243b907e8 HTML5 - added a variable to check currentUser is moderator or the user is currently logged in 2017-01-20 13:38:40 -08:00
JaeeunCho
82eb561dc0 HTML5 - clear status on userlist 2017-01-20 12:13:14 -08:00
JaeeunCho
e6cfcb9ff8 Merge remote-tracking branch 'upstream/master' into slides 2017-01-20 11:16:57 -08:00
JaeeunCho
20399830be HTML5 - changed arrow color of presentation 2017-01-20 10:49:16 -08:00
JaeeunCho
1ae6738cf0 HTML5 - moved the openChats() to outside of container 2017-01-20 09:50:03 -08:00
JaeeunCho
8312cee1a0 HTML5 - added openChat() in createContainer() 2017-01-17 14:09:32 -08:00
JaeeunCho
5cb5b98562 HTML5 - did lint code 2017-01-16 13:24:21 -08:00
JaeeunCho
5e2fa0fc09 HTML5 - changed componentDidUpdate() and added params 2017-01-16 10:03:02 -08:00
JaeeunCho
81a033c2fd HTML5 - added checking prevProps is undefined 2017-01-16 07:56:21 -08:00
JaeeunCho
cdea93ad80 HTML5 - added playing sound automatically when the user gets new messages 2017-01-13 15:57:29 -08:00
JaeeunCho
8ef2959ee6 HTML5 - changed file because of conflict 2017-01-13 15:04:22 -08:00
Anton Georgiev
ab12796266 Merge pull request #3554 from KDSBrowne/Audio-Choice-Onload 
Show audio modal on client load
 2017-01-13 14:26:02 -05:00
KDSBrowne
5d3b8b9b6b Use formatted messages for button labels 2017-01-11 10:00:31 -08:00
KDSBrowne
39d44cecd2 Change CSS to make audio modal buttons visible 2017-01-11 08:50:07 -08:00
KDSBrowne
fc87ca118c Rename label for join audio button 2017-01-11 08:19:05 -08:00
KDSBrowne
08e6a32e2b Show audio modal on client load 2017-01-10 15:14:23 -08:00
Anton Georgiev
0b739ad43c Merge pull request #3534 from KDSBrowne/Audio-Join-UI-Revision 
JoinAudio Modal UI Update
 2017-01-10 11:16:56 -05:00
Anton Georgiev
370e78dd3b Merge pull request #3535 from OZhurbenko/closed-captioning-ui 
Closed Captions
 2017-01-10 11:12:23 -05:00
KDSBrowne
ef9c98b0ec fix merge conflict 2017-01-09 11:41:59 -08:00
Anton Georgiev
47c2fef149 Merge branch 'keyboard-nav' of github.com:mmarangoni/bigbluebutton into merge-3530 2017-01-09 18:42:02 +00:00