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

71 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
7b3bc48be4 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into icons-update 2017-03-02 10:11:59 -08:00
Oleksandr Zhurbenko
80666bd688 Updated icons in the html5 client 2017-03-01 17:03:02 -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
Anton Georgiev
f4516180e2 localize Join/Leave Audio labels 2017-02-14 11:28:21 -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
KDSBrowne
6c372ed68b fix lint issues 2017-02-02 08:46:49 -08:00
KDSBrowne
c6ab4c2687 remove glow prop and use className to change style 2017-02-01 11:40:00 -08:00
KDSBrowne
1ab0b05e37 rename css class 2017-02-01 10:03:50 -08:00
KDSBrowne
d6370a8808 add box shadow to button and remove label glow 2017-02-01 08:16:02 -08:00
KDSBrowne
cc3fb848c6 change mute button style if user is talking 2017-01-27 08:57:14 -08:00
KDSBrowne
7ce0c175b9 fix inverted mute status icon 2017-01-27 06:41:22 -08: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
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
Lajellu
a7afa00b0f HTML5 - Emojis - Remove the extra icons added in by the previous merge 2016-12-21 09:01:33 -08:00
Lajellu
9a77ace223 Merge remote-tracking branch 'upstream/master' into completeEmojiIcons 2016-12-21 09:00:12 -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
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
5d328560a1 added suggestion 2016-12-15 08:15:04 -08:00
KDSBrowne
a4fc8440ea cleaned up 2016-12-14 16:02:08 -08:00
KDSBrowne
ae70ce1116 temporarily hide the Cam button 2016-12-14 11:55:35 -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
Matthew Marangoni
76f5de8722 mute button container and component improvements 2016-12-08 10:11:49 -08: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
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
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
KDSBrowne
d220c17bba removed component name duplication 2016-12-05 09:07:25 -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
Matthew Marangoni
0abcc06bfc linting fixes & updated based on feedback 2016-11-15 13:00:28 -08:00
KDSBrowne
cba6e75735 cleaning up 2016-11-14 18:48:56 -08: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
KDSBrowne
2296a122f5 Actions button only available to Presentor 2016-11-07 10:19:00 -08:00
Matthew Marangoni
7fb492894e Added exiting audio 2016-10-25 14:16:40 -07:00
Matthew Marangoni
0d3f231ac1 Merge remote-tracking branch 'upstream/master' into html5-stun-audio 2016-10-24 09:08:13 -07:00
JaeeunCho
6d1823f2c7 HTML5 - fixed linebreak with lint 2016-10-17 14:29:00 -07:00
Anton Georgiev
11f0c2da03 Merge pull request #3401 from KDSBrowne/Localization-update 
Localization update #1
 2016-10-13 10:44:13 -04:00
Matthew Marangoni
918ae83fc8 Added initial Join Audio modal 2016-10-11 12:04:50 -07:00
Lajellu
1f114eb908 Merge remote-tracking branch 'origin/EmojiReworked' into EmojiReworked 2016-10-06 13:44:03 -07:00
Lajellu
63c9f94b54 HTML5 - changes status names, and user list sorting logic to match flash client 2016-10-06 13:42:37 -07:00
KDSBrowne
b811f01ad1 Fixed lint issues 2016-10-03 08:10:20 -07:00