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

1756 Commits

Author SHA1 Message Date
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
Oswaldo Acauan
552dcd0300 Remove wrong selector when upserting captions 2017-02-17 16:05:35 +00: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
Anton Georgiev
a8df05f3e6 drop voice in main room when joining breakout room 2017-02-15 13:36:30 -05:00
Anton Georgiev
f5f1bf8bf1 Merge pull request #3659 from antobinary/localization 
HTML5: Localization of labels in audio and chat areas
 2017-02-14 15:53:49 -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
Oswaldo Acauan
1975503966 Remove console logs 2017-02-14 16:12:03 +00:00
Oswaldo Acauan
ffdcb5258b Fix ´get_all_meetings_request´ being published multiple times 2017-02-14 16:09:42 +00:00
Oswaldo Acauan
59eb04418d Clean captions when handling the history reply 2017-02-14 16:05:49 +00: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
Oswaldo Acauan
edae8ea1be Fix clear captions calls 2017-02-10 12:25:31 +00:00
Oswaldo Acauan
30d67897ef WIP - Refactor users api 2017-02-10 12:24:14 +00:00
Anton Georgiev
b92cd2badd pull html5 strings from transifex 2017-02-09 17:21:56 -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
Oswaldo Acauan
11c5085521 Prevent empty chunk when handling captions history 2017-02-09 11:27:13 +00: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
Oswaldo Acauan
6a0978e4ad Fix bug in CC handlers 2017-02-08 16:46:14 +00:00
Oswaldo Acauan
0c1f191db5 Rename handler for caption history 2017-02-08 16:02:39 +00:00
Oswaldo Acauan
f4b6763e34 Push a empty chunck when the length is zero 2017-02-08 16:00:55 +00:00
Oswaldo Acauan
bfd2a27f6b Prevent unnecessary update in captions 2017-02-08 15:58:54 +00: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
Oswaldo Acauan
c1d0797d92 Merge remote-tracking branch 'upstream/master' into refactor-api-users 
* upstream/master: (47 commits)
  Added ExitApplicationEvent.as
  HTML 5 - changed css for divider
  No more display the LoggedOutWindow.mxml if the user has explicitly clicked on yes to confirm the logout action.
  Link "enableEmojiStatus" enabled/disabled to the emoji button.
  initialize html5StunTurn properly - complication from PR 3628
  fix bug preventing stun/turn call
  fix lint issues
  rework userPermissions to allow mixture of role/status based actions
  Handle exception when sending message to client
  HTML5 - changed divider of record button
  Change the emoji menu icon to the happy face.
  don't show promote option for presenter user'
  remove glow prop and use className to change style
  reorganize user actions
  clean up
  improve userPermissions by rearranging logic
  allow for mute/unmute by moderator
  rename css class
  Display breakout rooms user names in row tooltip.
  fix setPresenter and kick user
  ...
 2017-02-07 15:29:42 +00:00
Oswaldo Acauan
28ba2fb4b0 WIP - Refactor users api 2017-02-07 15:29:27 +00:00
KDSBrowne
47636857f4 discard notification if connection is successful 2017-02-07 07:16:04 -08:00
Oswaldo Acauan
fda22b0653 Refactor methods/events for user leaving iteractions 2017-02-07 13:08:06 +00:00
Oswaldo Acauan
886edff059 Add missing configuration file 2017-02-06 19:14:48 +00: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
Oswaldo Acauan
32ba6ad724 Refactor method listenOnlyRequestToggle 2017-02-06 16:27:09 +00:00
Oswaldo Acauan
9c2b42e99a Refactor publishers and method kickUser to the new pattern 2017-02-06 15:56:09 +00: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
Anton Georgiev
f72ae316c7 rework userPermissions to allow mixture of role/status based actions 2017-02-02 11:41:48 -05: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
48a4b180fb improve userPermissions by rearranging logic 2017-02-01 14:18:27 -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
2844e79096 Add config for the size of CC chunks 2017-02-01 15:37:31 +00: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
Oswaldo Acauan
87994d48bd Merge branch 'refactor-api-captions' of https://github.com/oswaldoacauan/bigbluebutton into refactor-api-captions 
* 'refactor-api-captions' of https://github.com/oswaldoacauan/bigbluebutton:
  Fixed closed-captions view box placement
  recover redirect to html5 client on android device
  fix typo in closed caption locale string
  add German to html5 client (from Transifex)
  HTML5 - changed a variable name
  HTML5 - added a variable to check currentUser is moderator or the user is currently logged in
  HTML5 - clear status on userlist
 2017-02-01 15:28:22 +00:00
Oswaldo Acauan
fbc7adf670 Fix issue related to CC when handling ofr the first time 2017-02-01 15:28:12 +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
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
Oswaldo Acauan
977caf628d Merge pull request #1 from OZhurbenko/master 
Fixed closed-captions view box placement
 2017-01-25 08:06:14 -02: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
Anton Georgiev
043d55091d Merge pull request #3589 from antobinary/html5-localization 
add German to html5 client (from Transifex)
 2017-01-24 11:12:58 -05:00
Oswaldo Acauan
b17f748b49 Merge remote-tracking branch 'upstream/master' into refactor-api-captions 
* upstream/master: (26 commits)
  remove screenshare webrtc options from config.xml because they aren't fully implemented
  log line was displaying null values
  fix incorrect screenshare stream uri on reconnect
  HTML5 - changed arrow color of presentation
  HTML5 - moved the openChats() to outside of container
  improve detection of duplicates + cleanup
  allow view for 2+ webcams per user. improve duplicate detection
  add custom poll option text to locales
  HTML5 - added openChat() in createContainer()
  HTML5 - did lint code
  make meetingname field required
  add parameter to join as moderator
  HTML5 - changed componentDidUpdate() and added params
  addition to pr 3564
  HTML5 - added checking prevProps is undefined
  HTML5 - added playing sound automatically when the user gets new messages
  add a pre-filled meetingname field in html5 demo page
  Restoring annotations when swapping presentation with video
  fix for the case where last voice user was kicked
  Use formatted messages for button labels
  ...
 2017-01-24 15:25:42 +00:00
Anton Georgiev
e7926f5be4 add German to html5 client (from Transifex) 2017-01-23 16:19:53 -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
Oswaldo Acauan
b4679bc601 Refactor Captions API 2017-01-18 12:53:33 +00: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