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

1227 Commits

Author SHA1 Message Date
JaeeunCho
3355ad5d82 HTML5 - did lint code and chaged it 2017-03-02 13:42:39 -08:00
JaeeunCho
a67ef17930 HTML5 - changed code for session 2017-03-02 12:33:49 -08:00
JaeeunCho
a485873bf2 Merge remote-tracking branch 'upstream/master' into close 2017-03-02 12:32:29 -08:00
Oleksandr Zhurbenko
7b3bc48be4 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into icons-update 2017-03-02 10:11:59 -08:00
Anton Georgiev
e67b2a733e Merge pull request #3686 from oswaldoacauan/fix-reply-messages-remove 
[HTML5] Fix presentations/shapes reply messages
 2017-03-02 11:44:26 -05:00
Anton Georgiev
c92baed843 Merge pull request #3685 from OZhurbenko/whiteboard-restructuring 
HTML5 Whiteboard Restructuring
 2017-03-02 11:37:18 -05:00
Oswaldo Acauan
5ef65300b6 Fix user not being able to revalidate 2017-03-02 16:23:53 +00:00
Oswaldo Acauan
5b407d40f4 Remove debug line 2017-03-02 16:08:49 +00:00
Oswaldo Acauan
715b11fe46 Fix emojiStatus undefined logger variable 2017-03-02 16:07:45 +00:00
Oleksandr Zhurbenko
80666bd688 Updated icons in the html5 client 2017-03-01 17:03:02 -08:00
Oleksandr Zhurbenko
7e54305850 Fixed warnings in the polling component 2017-03-01 14:55:44 -08:00
JaeeunCho
fa7d46af73 HTML5 - added session array for close private chat 2017-03-01 13:27:05 -08:00
gcampes
8d2a51a00a Remove console log 2017-03-01 17:29:18 -03:00
gcampes
91da3e0262 Fix font size not showing in settings modal 2017-03-01 14:37:55 -03:00
gcampes
4918cf9160 fix bug with focus 2017-03-01 09:22:11 -03:00
JaeeunCho
775dd27309 HTML5 - added array for close private chat 2017-02-28 14:55:00 -08:00
JaeeunCho
07f45f695a HTML5 - close private chat 2017-02-28 14:40:16 -08:00
perroned
59435c6020 Cleaning 2017-02-27 19:59:54 +00:00
perroned
05d32bdbd3 Removes html5 video player controls 2017-02-27 18:18:54 +00:00
perroned
f93b16434d Handle issue with undefined variable 2017-02-27 18:16:16 +00:00
gcampes
439e7a97f2 fix font size on modal cancel 2017-02-24 17:38:16 -03:00
gcampes
8e2bb6a799 revert unwanted changes 2017-02-24 17:35:41 -03:00
gcampes
420918abe8 merge conflicts 2017-02-24 17:28:42 -03:00
gcampes
ef6bc76ea3 remove old settings folder 2017-02-24 17:20:22 -03:00
gcampes
3c02848478 hide moderator settings, implement default settings 2017-02-24 17:19:53 -03:00
KDSBrowne
1de05d1f23 remove event listeners 2017-02-24 10:54:52 -08:00
Oswaldo Acauan
19f119fcf6 Fix presentations not being removed while non existent in the reply message 2017-02-24 13:57:10 +00:00
Oswaldo Acauan
cc0999013f Fix shapes not being removed while non existent in the reply message 2017-02-24 13:10:55 +00:00
Oswaldo Acauan
f3f4f8ddfe Fix bugs on the voiceUpdate handlers 2017-02-23 20:35:36 +00:00
Oswaldo Acauan
5e9a7d8e39 Fix bug when removing users 2017-02-23 20:26:34 +00: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
Oswaldo Acauan
b6e80815bd Fix a bunch of bugs introduced after the refactor 2017-02-23 20:16:10 +00:00
perroned
92c3cdb746 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2017-02-23 19:20:37 +00:00
perroned
2f0b726ede Missing comma 2017-02-23 19:05:53 +00:00
perroned
8916f6e0e5 Fixes deskshare restart - html5 2017-02-23 19:00:20 +00:00
Oswaldo Acauan
d07bca00c9 Refactor handlers inside /phone to the /user folder 2017-02-23 18:52:50 +00:00
Oswaldo Acauan
99cfdb2062 Refactor handlers inside /phone to the /user folder 2017-02-23 18:52:44 +00: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
Oswaldo Acauan
24aa98b623 Refactor of validate_auth_token and clearUsers 2017-02-23 18:15:13 +00:00
Oswaldo Acauan
fbe34b2ed3 Refactor of validate_auth_token and clearUsers 2017-02-23 18:15:08 +00:00
Oleksandr Zhurbenko
10c8b86a0d Renamed whiteboard to presentation 2017-02-23 10:14:35 -08:00
Oswaldo Acauan
0f0ebdcf4a Refactor user_joined handler 2017-02-23 18:05:18 +00:00
Oswaldo Acauan
74f123cdc9 Refactor of get_users_reply handler 2017-02-23 17:59:56 +00: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
6b020d7e3a WIP. Refactor of get_users_reply handler 2017-02-23 17:46:03 +00:00
Oswaldo Acauan
a609c1feab WIP. Refactor of get 2017-02-23 17:45:51 +00:00
perroned
2d04f057cc Cleans up html5 screenshare 2017-02-22 20:31:09 +00:00
Oswaldo Acauan
5cfb18ea32 Refactor handler for emojiStatus 2017-02-22 20:22:12 +00:00
Oswaldo Acauan
8abdd10393 Refactor handler for emojiStatus 2017-02-22 18:59:47 +00:00
Oswaldo Acauan
b6bb8cc08d Refactor user api handlers 2017-02-22 17:55:39 +00:00
Oswaldo Acauan
37538b2817 Refactor user api handlers 2017-02-22 17:49:44 +00:00
perroned
8106742d45 Restructuring deskshare api 2017-02-22 16:22:51 +00:00
Oswaldo Acauan
1f9f47ce16 Fix assignPresenter method 2017-02-22 13:42:42 +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
Oswaldo Acauan
c8038b2068 Merge mute/unmute methods to a single toggle method 2017-02-22 12:20:30 +00:00
Oswaldo Acauan
8511e72f06 Refactor muteUser method 2017-02-22 12:10:27 +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
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
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
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
KDSBrowne
b0dfa33723 switch label if Esc key used to exit fullscreen 2017-02-14 11:57:37 -08: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
KDSBrowne
cbfaf16ac1 add formatted message to local file 2017-02-14 07:11:27 -08:00
Anton Georgiev
8bce68e137 use localized Public Chat label 2017-02-13 13:32:00 -05:00
KDSBrowne
f71f62d19a modified previous code structure 2017-02-13 08:21:53 -08: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
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
perroned
1116cc0d1e Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
 2017-02-02 15:27:08 +00: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
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
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
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
f517939809 fix handling of recording message 2017-01-09 18:58:33 +00:00
Anton Georgiev
47c2fef149 Merge branch 'keyboard-nav' of github.com:mmarangoni/bigbluebutton into merge-3530 2017-01-09 18:42:02 +00:00
KDSBrowne
04b948c281 remove unneeded comment 2017-01-09 08:40:16 -08:00
KDSBrowne
2b6400379b move joinListenOnly from component to container 2017-01-09 08:35:25 -08:00
Oleksandr Zhurbenko
8a1a6511ce Moved inline styles to the styles.scss where it was applicable 2016-12-23 13:27:49 -08:00
Oleksandr Zhurbenko
bedcb559cc Added auto-scrolling for the closed-captions 2016-12-23 11:29:03 -08:00
Oleksandr Zhurbenko
40b8462c52 Minor fixes 2016-12-23 10:49:17 -08:00
KDSBrowne
4a120488cb impliment passing joinListenOnly down as prop 2016-12-23 07:18:44 -08:00
KDSBrowne
ebdefcf1bd fix improper indentation 2016-12-23 07:06:45 -08:00
Oleksandr Zhurbenko
500ff0b397 Changed the default message when there is no active locales 2016-12-23 00:44:15 -08:00
Oleksandr Zhurbenko
848aaa83f5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning-ui 2016-12-23 00:31:22 -08:00
Oleksandr Zhurbenko
8f0d552f4f Finished closed-captions 2016-12-23 00:26:22 -08:00
Oleksandr Zhurbenko
e9ce459c9c Corrected identation 2016-12-22 17:48:19 -08:00
Oleksandr Zhurbenko
e92e694793 Corrected identation 2016-12-22 17:47:18 -08:00
Oleksandr Zhurbenko
bb1a8b09b8 Display closed-captions box based on the value from the Session storage 2016-12-22 16:44:31 -08:00
JaeeunCho
48fe95e360 HTML5 Client - removed soundForUnreadeMessages() from nav-bar 2016-12-22 15:37:17 -08:00
JaeeunCho
e92e75564a HTML5 Client - changed sound for unreadMessages function from nav-bar to app 2016-12-22 15:34:20 -08:00
KDSBrowne
def71823c5 replace css pixel values with em 2016-12-22 13:33:30 -08:00
KDSBrowne
acf204ae37 remove top margin from test audio button 2016-12-22 13:13:33 -08:00
KDSBrowne
e4390de53a position enter session button 2016-12-22 13:08:34 -08:00
KDSBrowne
4dd23e12b7 clean up css and style source dropdown 2016-12-22 13:01:56 -08:00
KDSBrowne
de49563043 improve join audio modal menu 2016-12-22 11:32:26 -08:00
KDSBrowne
ba554eef2b remove listen only modal menu 2016-12-22 09:47:12 -08:00
JaeeunCho
0a4248d144 HTML5 Client sound - added sound for unreadMessages 2016-12-22 08:17:22 -08:00
Lajellu
11e5809340 HTML5 - Remove unncessary background-color CSS 2016-12-21 13:13:00 -08:00
Lajellu
ec49a0a343 HTML5 - Fix Recording Indicator Logic 
Original:
The indicator is always visible.
If the meeting is currently being recorded,
Then indicator turns red

Changed to:
If the meeting is currently being recorded
Then the indicator is displayed and red
 2016-12-21 11:13:08 -08:00
Anton Georgiev
20eea9cb06 Merge pull request #3531 from JaeeunCho/muteIcon 
HTML5 Client userlist - added muted/unmuted button for the current user
 2016-12-21 13:04:45 -05:00
Lajellu
b99d0a2407 HTML5 - Emoji - fix merge conflicts 2016-12-21 09:14:46 -08:00
Lajellu
a7afa00b0f HTML5 - Emojis - Remove the extra icons added in by the previous merge 2016-12-21 09:01:33 -08:00
Anton Georgiev
d408bb1522 Merge pull request #3514 from KDSBrowne/New-Settings-Update 
New settings update - Application Menu
 2016-12-21 12:01:26 -05:00
KDSBrowne
9dfc0791a8 remove clearing storage 2016-12-21 09:00:14 -08:00
Lajellu
9a77ace223 Merge remote-tracking branch 'upstream/master' into completeEmojiIcons 2016-12-21 09:00:12 -08:00
Anton Georgiev
9ba6a2c5ae Merge pull request #3529 from Lajellu/hideUnusableSlideCtrls 
HTML5 - comment out unimplemented presenter slide control UI
 2016-12-21 11:43:43 -05:00
KDSBrowne
9c4f3e5c50 import as LocalStorage and clear specific values 2016-12-21 08:31:16 -08:00
Anton Georgiev
69f3571101 Merge pull request #3524 from KDSBrowne/UI-Update-Changes01 
UI Changes Update
 2016-12-21 11:10:27 -05:00
Oleksandr Zhurbenko
875023eb03 Styled the closed-captions box 2016-12-20 15:54:39 -08:00
JaeeunCho
a8a8791699 HTML5 Client userlist - added muted/unmuted button for the current user 2016-12-20 15:39:11 -08:00
Matthew Marangoni
10c4bd2f50 Close button added to all join audio menus 2016-12-20 13:30:23 -08:00
Lajellu
8389d2b2e3 HTML5 - comment out Join Video to fix DOM positioning 
The reason there was so much space between `Join Audio` and `Status` was that `Join Video` was in between. Join Video was removed
to fix this positioning.

Leave Audio and Join Video icons are being hidden, which still holds the space for that component in the DOM, but does not show
it.
`Join Audio` should not be commented out because the icon is displayed at certain times.
`Join Video` can be commented out for now for UI purposes and put back when it's implemented.
 2016-12-20 12:27:16 -08:00
Matthew Marangoni
ba19b1443a Update new audio and mute icons 2016-12-20 11:45:48 -08:00
Matthew Marangoni
9e33ccdedc remove old console logs 2016-12-20 11:18:45 -08:00
Matthew Marangoni
428d9f6297 Update tab and escape keyboard navigation 2016-12-20 11:12:27 -08:00
Oleksandr Zhurbenko
596f985bc2 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning-ui 2016-12-20 10:50:01 -08:00
Lajellu
95903abe7c HTML5 - comment out unimplemented presenter slide control UI 2016-12-20 10:33:14 -08:00
Lajellu
b3f1d9f804 HTML5 - Add the three emojis: applause, thumbs up, thumbs down and fixes some master lint issues 2016-12-20 10:06:01 -08:00
Lajellu
98db4c8eec HTML5 - fixes merge conflicts bw master and this branch 2016-12-20 09:18:24 -08:00
KDSBrowne
72d53f54ac remove unused import 2016-12-19 14:19:06 -08:00
KDSBrowne
d79fabaeb6 add callback to cancel button 2016-12-19 14:01:52 -08:00
KDSBrowne
73db970152 add suggestions and store settings until logout 2016-12-19 13:45:09 -08:00
Anton Georgiev
0c6197c539 Merge pull request #3506 from oswaldoacauan/audio-stream-volume 
[HTML5] Mic Volume and Device Selector
 2016-12-19 14:13:07 -05:00
Oswaldo Acauan
8ebb41de3a Change default constraints for the audio-stream-volume component 2016-12-19 17:15:48 +00:00
Oswaldo Acauan
37942569fb Prevent blank device selector comobos 2016-12-19 17:11:43 +00:00
Oswaldo Acauan
d1c4116aee Add missing semicolon 2016-12-19 11:35:33 +00:00
Oswaldo Acauan
66478d0c55 Fix merge conflicts 2016-12-19 11:34:41 +00:00
KDSBrowne
533eb29d58 cleaned up 2016-12-18 17:55:32 -08:00
KDSBrowne
e730d7241f removed unused line 2016-12-18 17:13:37 -08:00
KDSBrowne
90e63b0b54 moved this.setState 2016-12-18 17:00:42 -08:00
KDSBrowne
06ef0d09fb moved initialization to constructor 2016-12-16 09:01:40 -08:00
KDSBrowne
83ba4d3d12 removed unused import 2016-12-16 08:58:38 -08:00
KDSBrowne
a6c4713e1a removed unused import 2016-12-16 08:56:17 -08:00
Anton Georgiev
0ea28a8ecd Merge pull request #3516 from KDSBrowne/Hide-VideoButton-Temp 
Hide Cam button Temporarily
 2016-12-16 10:42:15 -05:00
KDSBrowne
80ede2cd87 removed empty function in chat component 2016-12-16 06:42:07 -08:00
KDSBrowne
8795cbac6a removed duplicate Participants heading 2016-12-15 12:03:54 -08:00
KDSBrowne
f7710913f0 update button icon to white 2016-12-15 11:34:01 -08:00
KDSBrowne
811e5c97c2 added basic tool tip for testing 2016-12-15 10:29:19 -08:00
KDSBrowne
959208f86e align chevron vertically with text to right 2016-12-15 09:29:17 -08:00
KDSBrowne
4a4df3512a removed bold font style 2016-12-15 08:28:45 -08:00
KDSBrowne
5d328560a1 added suggestion 2016-12-15 08:15:04 -08:00
KDSBrowne
632ffbb752 removed css for button 2016-12-15 08:10:31 -08:00
KDSBrowne
b6d3a759fb removed chat X icon 2016-12-15 08:05:05 -08:00
Anton Georgiev
2df9f6e10b Merge pull request #3479 from JaeeunCho/scroll_v1 
HTML5-clent scroll on chat
 2016-12-15 10:31:32 -05:00
KDSBrowne
a4fc8440ea cleaned up 2016-12-14 16:02:08 -08:00
KDSBrowne
d2d0720889 undo a previous css change 2016-12-14 15:46:24 -08:00
KDSBrowne
c932ef7637 added close button to private chat 2016-12-14 13:21:39 -08:00
KDSBrowne
ae70ce1116 temporarily hide the Cam button 2016-12-14 11:55:35 -08:00
KDSBrowne
c29bbf870f removed unused line 2016-12-14 09:43:07 -08:00
KDSBrowne
0ddde5200d removed unused line 2016-12-14 09:39:58 -08:00
KDSBrowne
83091a969d changed behaviour of fontSizeName bug 2016-12-14 08:42:25 -08:00
KDSBrowne
4bdfb54b4e fixed lint issues 2016-12-14 07:57:54 -08:00
KDSBrowne
adcb46cb41 cleaned up code 2016-12-14 07:50:35 -08:00
KDSBrowne
6512b7be8a fixed bug, removed console logs 2016-12-14 07:40:13 -08:00
Anton Georgiev
1a6062d329 Merge pull request #3497 from mmarangoni/html5-stun-audio 
Action bar & join audio improvements
 2016-12-14 10:01:52 -05:00
KDSBrowne
eb7f58e2bb fixed issues, ready to set up save 2016-12-13 20:04:26 -08:00
KDSBrowne
38b9227f04 improved application settings - incomplete 2016-12-13 19:40:32 -08:00
Matthew Marangoni
0daa2798d5 updated with master/fixed merge conflicts 2016-12-09 12:39:48 -08:00
Matthew Marangoni
7e68432c29 Merge remote-tracking branch 'upstream/master' into html5-stun-audio 2016-12-09 12:30:33 -08:00
Anton Georgiev
e154873612 add missing char: 2016-12-09 14:51:49 +00:00
Anton Georgiev
358dc2f1fd change version to client build 2016-12-09 14:49:50 +00:00
Oswaldo Acauan
cb28149e4f Add audio device selector and mic volume checker 2016-12-08 16:17:17 -02:00
Oswaldo Acauan
5622296b69 Add audio device selector and mic volume checker 2016-12-08 16:17:08 -02:00
Matthew Marangoni
76f5de8722 mute button container and component improvements 2016-12-08 10:11:49 -08:00
Anton Georgiev
cf0238cba3 cleaning up 2016-12-08 16:20:47 +00:00
Anton Georgiev
b102e85840 remove ref to clientBuildInfo 2016-12-08 16:04:28 +00:00
Anton Georgiev
8608c6b716 comply with feedback - about component 2016-12-08 15:59:52 +00:00
Anton Georgiev
fe30dde5dd fix conflict 2016-12-08 15:58:58 +00:00
Oswaldo Acauan
836e100461 Merge branch 'master' into audio-stream-volume 
* master:
  Update Meteor and all packages to the lastest releases
  fix import for Logger
  Fix user-list icons margin and render
  Fix chat placeholder and user left messages on private chats
  Update bigbluebutton-release
  Fix jumbo circle buttons
  Revert modal overlay to be a solid white
  Fix [aria-hidden] elements being hidden
  Fix navbar and actions-bar padding so titles are aligned
  moved all logic out of UI component
  cleaned up
  removed component name duplication
  cleaned up code
  gen_webvtt: Parse entire events file, instead of iterparse
  cleaned up css, still needs fixing
  broken down into components - need to fix css
  bbb-web: Fix bug that was breaking getRecordings in test-install
  record-and-playback: Fixed issue with text gathered from slids used on preview
 2016-12-08 11:11:26 -02:00
Oswaldo Acauan
012416fe07 Add audio stream volume component 2016-12-08 10:09:29 -02:00
Anton Georgiev
b56ee1e553 add client information in About 2016-12-07 21:14:14 +00:00
Anton Georgiev
b7c47d900a reduce logging of cursor 2016-12-07 20:50:51 +00:00
Anton Georgiev
98bfae960b fix import for Logger 2016-12-07 16:12:46 +00:00
Anton Georgiev
aaecd871b6 Merge pull request #3491 from KDSBrowne/Audio-Components-Breakdown 
Added audio-setting components
 2016-12-07 10:34:49 -05:00
Oswaldo Acauan
c497c995fd Fix user-list icons margin and render 2016-12-07 11:53:19 -02:00
Oswaldo Acauan
48da206411 Fix chat placeholder and user left messages on private chats 2016-12-07 11:48:29 -02:00
Oswaldo Acauan
dfbb35e365 Fix jumbo circle buttons 2016-12-07 10:02:21 -02:00
Oswaldo Acauan
7796334dfd Revert modal overlay to be a solid white 2016-12-07 09:56:20 -02:00
Matthew Marangoni
6f300b4832 isolated mute button, reduced button movement on actions bar, improved join listen only 2016-12-06 13:15:23 -08:00
Oswaldo Acauan
e2aaf1690d Fix navbar and actions-bar padding so titles are aligned 2016-12-06 17:17:09 -02:00
KDSBrowne
2c79b353c4 moved all logic out of UI component 2016-12-06 11:15:00 -08:00
Oswaldo Acauan
d3ac2f4061 Improve chat design based on feedback 2016-12-06 15:30:56 -02:00
Oswaldo Acauan
3155b9a7c5 Improve chat design based on feedback 2016-12-06 15:07:22 -02:00
Oswaldo Acauan
6fdc7d12a1 Refactor the user-list styles to use global variables for margins and paddings 2016-12-06 14:39:48 -02:00
Oswaldo Acauan
182516c764 Fix user-list unread counter height 2016-12-06 11:48:30 -02:00
Oswaldo Acauan
3309a1ad95 Improve navbar button hover and focus style 2016-12-06 11:39:48 -02:00
Oswaldo Acauan
f5f859bd55 Fix wrong padding on circular buttons 2016-12-06 11:11:47 -02:00
Oswaldo Acauan
3c21fc533d Update circular buttons padding so they are a circle again ^^ 2016-12-06 11:03:00 -02:00
Oswaldo Acauan
dcea1bacd1 Update font-size of icons on circular buttons 2016-12-06 10:53:32 -02:00
Oswaldo Acauan
1821a2af0b Remove buttons box-shadow 2016-12-06 10:52:51 -02:00
Oswaldo Acauan
d60303782a Fix label font-weight on circular buttons 2016-12-06 10:51:45 -02:00
Oswaldo Acauan
644ae8eccf Update navbar/actions-bar paddings 2016-12-06 10:50:32 -02:00
Oswaldo Acauan
706f8bb9a9 Update danger color 2016-12-06 10:37:22 -02:00
KDSBrowne
2605ca6311 cleaned up 2016-12-05 17:37:46 -08:00
Oswaldo Acauan
2693fb4392 Add missing padding on modal styles 2016-12-05 19:15:12 -02:00
Oswaldo Acauan
7971541282 Update emoji icons to reflect the names on the font release v7 2016-12-05 18:49:34 -02:00
Oswaldo Acauan
09f97377a8 Remove extra div from actions-bar 2016-12-05 18:41:24 -02:00
Oswaldo Acauan
4c55ea5732 Match actions-bar and navbar paddings 2016-12-05 18:36:57 -02:00
Oswaldo Acauan
48a2ecdb15 Improve overall components sizing of the navbar 2016-12-05 18:17:31 -02:00
Oswaldo Acauan
a1cd283ab6 Refactor the navbar title separator to use CSS instead of text 2016-12-05 18:09:03 -02:00
Oswaldo Acauan
60b49971d8 Refactor the recording indicator to use CSS instead of SVG 2016-12-05 18:00:09 -02:00
Oswaldo Acauan
b627f93435 Fix presentation title spacing 2016-12-05 17:26:08 -02:00
Oswaldo Acauan
1a5e309335 Remove unnecessary padding on navbar buttons 2016-12-05 17:16:52 -02:00
Oswaldo Acauan
306fcc9c56 Remove duplicated padding on the navbar 2016-12-05 16:58:40 -02:00
Oswaldo Acauan
cda0d56afd Change the unread messages notification on the toggle button 2016-12-05 16:54:20 -02:00
Oswaldo Acauan
3da2f1c80d Add padding to the media container 2016-12-05 16:21:35 -02:00
KDSBrowne
d220c17bba removed component name duplication 2016-12-05 09:07:25 -08:00
KDSBrowne
87ccc5ff84 cleaned up code 2016-12-05 08:21:55 -08:00
JaeeunCho
b57742df79 HTML5-clent scroll on chat - added notification button 2016-12-02 11:47:44 -08:00
JaeeunCho
d673d477e2 Merge remote-tracking branch 'upstream/master' into scroll_v1 2016-12-02 11:30:22 -08:00
perroned
0a12d2f6ce Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-html5/imports/startup/server/EventQueue.js
 2016-12-01 19:19:58 +00:00
Anton Georgiev
cfcd41c5bb Merge pull request #3487 from KDSBrowne/New-Logger-Levels 
New logger levels
 2016-12-01 14:03:04 -05:00
KDSBrowne
24643f01dd using config file for logger level 2016-12-01 08:15:57 -08:00
KDSBrowne
ae45f86e7d cleaned up css, still needs fixing 2016-12-01 07:32:22 -08:00
KDSBrowne
b766b713a0 broken down into components - need to fix css 2016-11-30 19:37:52 -08:00
KDSBrowne
9187a020d6 Added Antons changes 2016-11-30 08:30:52 -08:00
KDSBrowne
043c3f71cd added logger config and set level 2016-11-30 08:29:13 -08:00
gcampes
f4bc748e56 adds const for time remaining in notifications bar 2016-11-29 14:57:13 -02:00
gcampes
eba3e21e92 Changes handlers for breakouts 2016-11-29 14:52:15 -02:00
gcampes
5089c18ef3 imports underscore, removes prefix not needed in variables 2016-11-29 13:49:08 -02:00
gcampes
903ba22713 Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5 
* upstream/master:
  Removed carriage returns from bigbluebutton.properties
  make function export default
  fix Meteor.Error
  removed duplication
  fixed lint issue
  added suggestions
  removed console logs
  fixed lint issues
  added moderator condition
  Shows main setting options based on role
 2016-11-29 08:25:59 -02:00
gcampes
470b6e08c1 Change breakout code 2016-11-28 17:48:02 -02:00
Anton Georgiev
e1f63c0aec make function export default 2016-11-28 19:36:58 +00:00
Anton Georgiev
7f9228ac02 fix Meteor.Error 2016-11-28 19:36:06 +00:00
Anton Georgiev
929ac08acb Merge branch 'OpenSettings-Menu-Options' of github.com:KDSBrowne/bigbluebutton into kert-pres-2 2016-11-28 19:17:15 +00:00
KDSBrowne
0fc3883397 removed duplication 2016-11-25 08:07:41 -08:00
gcampes
b3c9d60182 Redo some breakouts code 2016-11-25 14:06:36 -02:00
KDSBrowne
b52d06fd85 fixed lint issue 2016-11-25 05:11:50 -08:00
KDSBrowne
59ded8461e added suggestions 2016-11-24 20:00:46 -08:00
gcampes
f75c73b4e6 Polish breakout rooms code 2016-11-24 17:22:04 -02:00
KDSBrowne
4078337569 removed console logs 2016-11-23 18:12:36 -08:00
KDSBrowne
d580f01efd fixed lint issues 2016-11-23 18:01:51 -08:00
KDSBrowne
525279ecb0 added moderator condition 2016-11-23 17:55:14 -08:00
KDSBrowne
f5d82b8d38 Shows main setting options based on role 2016-11-23 12:01:09 -08:00
gcampes
7001ec59fc Adds correct handling for breakouts update 2016-11-23 14:18:36 -02:00
gcampes
1ba90598f6 Fix timer for breakouts 2016-11-23 14:13:41 -02:00
gcampes
655f8dd6d6 Fix merge conflicts 2016-11-23 13:33:51 -02:00
gcampes
0aa6022c89 Changes breakout code to handle the new message format 2016-11-23 13:32:04 -02:00
Oswaldo Acauan
19a81e1d90 Add visual indicator when someone is talking 2016-11-22 18:26:01 +00:00
Anton Georgiev
fdb4decaf7 cleanup 2016-11-22 16:16:13 +00:00
Anton Georgiev
5635f94789 refactor updateVoiceUser.js 2016-11-22 16:15:42 +00:00
gcampes
e14c9159df Fix breakout closing issues 2016-11-22 13:46:08 -02:00
Anton Georgiev
462d72afa0 handle talking event in html5 2016-11-22 15:06:54 +00:00
JaeeunCho
c7e43f2b77 HTML5-clent scroll on chat - changed to display messages automatically 2016-11-21 15:02:12 -08:00
Anton Georgiev
8442a4bda0 cleanup 2016-11-21 21:10:20 +00:00
Anton Georgiev
d3ec5c187a play audio file to test speakers/audio output 2016-11-21 21:06:19 +00:00
Anton Georgiev
924eaa17c3 Merge pull request #3445 from KDSBrowne/Lock-Settings-Availability 
Lock settings available to Presenter/Moderator
 2016-11-21 14:07:11 -05:00
Anton Georgiev
ba7e69333c Merge pull request #3475 from oswaldoacauan/refactor-api-shapes 
[HTML5] Refactor API Shapes (whiteboard)
 2016-11-21 13:38:03 -05:00
Oswaldo Acauan
bf99bb50d4 Clear shapes after clearing an presentation 2016-11-21 16:04:42 +00:00
KDSBrowne
2e3407e128 clean up - more readable 2016-11-21 06:32:12 -08:00
gcampes
bdb6780f7a Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5 
* upstream/master:
  removed unecessary import statements
  adjusted to meet component/container structure conventions and simplify code
  Remove wrong commited files
  Refactor API Cursor's
  Fix bug related to presentation handlers
  linting fixes & updated based on feedback
  HTML5-clent messages on chat - changed icon for logged out users
  fixed an error with exit audio
  Added mute/unmute/join listen only/leave audio features to join audio modal
  HTML5-client messages for logged out user on chat
  HTML5-clent messages on chat
 2016-11-21 10:53:55 -02:00
KDSBrowne
4dd268e25a added new suggestions 2016-11-18 21:28:01 -08:00
Anton Georgiev
c98813e7b3 Merge pull request #3460 from mmarangoni/html5-stun-audio 
Mute, Unmute, Leave Audio
 2016-11-18 17:03:13 -05:00
Matthew Marangoni
c9221c94f3 removed unecessary import statements 2016-11-18 13:35:02 -08:00
Matthew Marangoni
aa65afffa4 adjusted to meet component/container structure conventions and simplify code 2016-11-18 13:24:59 -08:00
Oswaldo Acauan
4fe83bf79d Refactor Shapes API 2016-11-18 17:59:11 +00:00
Oswaldo Acauan
b0e784ec60 Merge remote-tracking branch 'upstream/master' into refactor-api-shapes 
* upstream/master:
  Remove wrong commited files
  Refactor API Cursor's
 2016-11-18 17:35:53 +00:00
Oswaldo Acauan
529ff51a72 Refactor Shapes API 2016-11-18 17:35:28 +00:00
gcampes
9f478416c5 Fix html changing the breakout room url for flash 2016-11-18 15:14:00 -02:00
Oswaldo Acauan
e932bb88fd Remove wrong commited files 2016-11-18 12:28:55 +00:00
Oswaldo Acauan
b4f9d88fac Refactor API Cursor's 2016-11-18 12:26:14 +00:00
Anton Georgiev
e644576063 Merge pull request #3435 from JaeeunCho/messages_v1 
HTML5-client : fixed messages from the logged out users on public-chat
 2016-11-17 16:03:51 -05:00
KDSBrowne
bdcc8b9bd6 added new suggestions, need to fix console warning 2016-11-17 12:10:05 -08:00
Oswaldo Acauan
15f59f9781 Fix bug related to presentation handlers 2016-11-17 15:54:24 +00:00
Gabriel Carvalho de Campes
7cdf04dd66 update clear for meetings, adds breakouts 2016-11-17 13:20:40 -02:00
Gabriel Carvalho de Campes
f9cc5d5873 remove debug code 2016-11-16 15:46:30 -02:00
Gabriel Carvalho de Campes
85013eac1f Fix issues from merge 2016-11-16 15:44:05 -02:00
Gabriel Carvalho de Campes
dad3c1a4c7 Merge conflicts 2016-11-16 13:35:39 -02:00
KDSBrowne
6f1680318c update 2016-11-16 07:15:17 -08:00
Matthew Marangoni
0abcc06bfc linting fixes & updated based on feedback 2016-11-15 13:00:28 -08:00
Anton Georgiev
f0a18f6210 improve dropdown slide switch to pass a number, not string so server checks pass 2016-11-15 16:30:13 +00:00
KDSBrowne
3359ec499a clean up 2016-11-15 08:22:05 -08:00
Anton Georgiev
9b3b28129f fix slide switching (typo) 2016-11-15 16:19:33 +00:00
Anton Georgiev
1cff965131 Merge branch 'Action-Options-Availability' of github.com:KDSBrowne/bigbluebutton into merge-pr-kert-1 2016-11-15 16:09:47 +00:00
KDSBrowne
cba6e75735 cleaning up 2016-11-14 18:48:56 -08:00
Anton Georgiev
0598591fc7 remove reference to undef 2016-11-14 22:24:24 +00:00
JaeeunCho
909862e44c HTML5-clent messages on chat - changed icon for logged out users 2016-11-14 14:18:25 -08:00
Anton Georgiev
3a141dcadd resolve browser warning 2016-11-14 21:41:25 +00:00
Anton Georgiev
8a377e0a18 adjust name of resource + function 2016-11-14 21:40:50 +00:00
Anton Georgiev
74cf17e812 Merge branch 'refactor-poll-api' of github.com:Gcampes/bigbluebutton into merge-osw-pr-1 2016-11-14 21:31:21 +00:00
JaeeunCho
3e04e716f5 Merge remote-tracking branch 'upstream/master' into messages_v1 2016-11-14 12:37:16 -08:00
Gabriel Carvalho de Campes
caabead5e0 Removes unused code 2016-11-14 16:25:23 -02:00
Gabriel Carvalho de Campes
694e300d55 Polish breakout code 2016-11-14 16:23:04 -02:00
Gabriel Carvalho de Campes
214357adc6 Fix conflicts 2016-11-14 14:54:04 -02:00
Gabriel Carvalho de Campes
4b489df410 update html en locale for breakout rooms 2016-11-14 14:42:09 -02:00
Gabriel Carvalho de Campes
eb3705321f polish breakout room code html5 2016-11-14 14:12:54 -02:00
Gabriel Carvalho de Campes
3f53620416 Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5 
* upstream/master: (22 commits)
  - create only one netConnection to bbb-apps. Not re-create one when reconnecting.
  - log client out when user is ejected from meeting.
  - reset connectAttemptTimeout as we don't want to fail connection on reconnects.
  - fix rtmpt
  - add more logging to track issues
  Update Gemfile.lock for 1.1-dev
  - log locale version
  - remove user join log
  improve logs for webrtc events
  - improve client side logging.
  add EN string to ClientStatusEvent
  Updated restart of libreoffice for systemd
  - add log to indicate successful connection to bbb-apss
  bbb-web: Escaped strings used in freemarker template for thumbnails
  record-and-playback: Removed preview extension (thumbnails) from recordings when only has default presentation
  Fix import in stunturn reply handler
  Fix handleStunTurnReply function name
  Clean up before PR
  Rever wrong changes on chat handler parameters
  Revert wrong changes on chat handler name
  ...
 2016-11-14 10:00:42 -02:00
Gabriel Carvalho de Campes
39dffd68b4 Update breakout rooms in html5 2016-11-14 09:57:10 -02:00
Matthew Marangoni
807f434d72 fixed an error with exit audio 2016-11-11 14:11:00 -08:00
Matthew Marangoni
482fc97388 Added mute/unmute/join listen only/leave audio features to join audio modal 2016-11-11 13:09:34 -08:00
Oswaldo Acauan
1df46bb201 Refactor of Presentations API 2016-11-11 19:02:46 +00:00
Oswaldo Acauan
2cf4bd3f5a Merge conflicts 2016-11-10 15:13:02 +00:00
KDSBrowne
2296a122f5 Actions button only available to Presentor 2016-11-07 10:19:00 -08:00