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

97 Commits

Author SHA1 Message Date
KDSBrowne
eb3ac219e9 fix merge conflicts 2017-03-24 07:25:25 -07:00
KDSBrowne
4b2928f2fb remove span element 2017-03-23 12:13:09 -07:00
JaeeunCho
fd08d99b6f HTML5 - removed unused imports, fixed variable names 2017-03-23 12:02:40 -07:00
KDSBrowne
d6bdbeb448 add aria-label for unread messages 2017-03-23 11:26:44 -07:00
KDSBrowne
2d876550db merge with master 2017-03-23 07:16:47 -07:00
JaeeunCho
75dbfc23b6 HTML5 - changed underscore to lodash 2017-03-21 14:52:10 -07:00
JaeeunCho
b81957da43 HTML5 - fixed conflict 2017-03-21 13:29:46 -07:00
JaeeunCho
eb176e77ac HTML5 - changed session and variables name 2017-03-17 08:27:37 -07:00
JaeeunCho
cb56e0771d HTML5 - changed variable name 2017-03-16 15:39:34 -07:00
Oswaldo Acauan
f020964c50 Fix merge conflicts 2017-03-16 20:25:14 +00:00
Oswaldo Acauan
22bb1adab2 Refactor of the chat notification for unread messages 2017-03-16 19:57:45 +00:00
Anton Georgiev
85a445b919 add isBreakoutRoom on render 2017-03-15 15:03:56 -04:00
Anton Georgiev
70ad071d5b pass flag as a property 2017-03-15 14:03:58 -04:00
Anton Georgiev
29de597e10 evaluate in container, pass boolean flag to component 2017-03-15 13:43:03 -04:00
Anton Georgiev
9315b79b6c apply recommendations from pr comments 2017-03-15 12:21:26 -04:00
KDSBrowne
c510921509 remove DropdownListSeparator 2017-03-15 08:36:42 -07:00
Anton Georgiev
ae7aa7b3df don't allow kick user in breakout rooms 2017-03-14 16:57:22 -04:00
Oswaldo Acauan
be7f36e00c Refactor the i18n server code 2017-03-09 19:50:21 +00:00
JaeeunCho
3fb3d614fa HTML5 - changed comment and moved into block 2017-03-06 09:25:35 -08:00
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
Oleksandr Zhurbenko
80666bd688 Updated icons in the html5 client 2017-03-01 17:03:02 -08:00
JaeeunCho
fa7d46af73 HTML5 - added session array for close private chat 2017-03-01 13:27:05 -08: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
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
Anton Georgiev
3581023b91 hide option to reset status if there is no status (emojis) 2017-02-16 10:53:54 -05:00
Anton Georgiev
9110468782 add defaultMessage for Public Chat 2017-02-14 13:12:01 -05:00
Anton Georgiev
8bce68e137 use localized Public Chat label 2017-02-13 13:32:00 -05:00
Anton Georgiev
3857d932b6 don't show promote option for presenter user' 2017-02-01 14:44:05 -05:00
Anton Georgiev
1ad5cc1959 reorganize user actions 2017-02-01 14:32:06 -05:00
Anton Georgiev
0dbb8d62ca allow for mute/unmute by moderator 2017-02-01 14:14:32 -05:00
Anton Georgiev
43922300e8 fix setPresenter and kick user 2017-02-01 11:47:39 -05: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
Matthew Marangoni
e42e4c759a fixed userlist and chat scrolling in Firefox 2017-01-27 14:13:25 -08: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
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
9a77ace223 Merge remote-tracking branch 'upstream/master' into completeEmojiIcons 2016-12-21 09:00:12 -08:00
JaeeunCho
a8a8791699 HTML5 Client userlist - added muted/unmuted button for the current user 2016-12-20 15:39:11 -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
KDSBrowne
8795cbac6a removed duplicate Participants heading 2016-12-15 12:03:54 -08:00
Oswaldo Acauan
c497c995fd Fix user-list icons margin and render 2016-12-07 11:53:19 -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