Commit Graph

651 Commits

Author SHA1 Message Date
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
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
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