Commit Graph

160 Commits

Author SHA1 Message Date
KDSBrowne
c552b3522c prevent breakout and poll pane both open 2018-11-05 17:52:06 +00:00
KDSBrowne
8378606889 move presenter and poll check to UserPolls 2018-11-02 21:43:49 +00:00
KDSBrowne
538e248058 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-11-02 21:25:40 +00:00
KDSBrowne
bba899c4a7 prevent poll closing on poll pane hide 2018-10-29 15:27:50 +00:00
Tainan Felipe
0d22580b1c Change to count 2018-10-26 16:57:37 -03:00
KDSBrowne
7f396f3590 remove container not being used 2018-10-26 16:06:11 +00:00
Tainan Felipe
32dd8c4740 migrate to session 2018-10-26 12:16:29 -03:00
Tainan Felipe
fceeca3795 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-26 11:52:54 -03:00
KDSBrowne
8f24fcfd01 make userlist-poll btn toggle menu 2018-10-26 12:37:29 +00:00
KDSBrowne
d5eae7c288 remove comment left over from merge 2018-10-26 01:47:48 +00:00
KDSBrowne
0551691684 edit css styles 2018-10-26 01:40:15 +00:00
Anton Georgiev
a5c2ddc602 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-25 17:58:00 +00:00
KDSBrowne
ec5af5b855 fix merge issues 2018-10-25 16:54:29 +00:00
KDSBrowne
3f521a6f6a Merge branch 'html5-theming' into test-merge-anton 2018-10-25 16:33:56 +00:00
KDSBrowne
47218ea351 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into test-merge-anton 2018-10-25 16:18:31 +00:00
KDSBrowne
de51ab6fd6 position polling in center screen for mobile 2018-10-25 16:07:24 +00:00
Anton Georgiev
cde6311a5d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-24 18:26:13 +00:00
Oswaldo Acauan
8696b831d3 Change SCSS variables to CSS variables missed while merging with upstream 2018-10-24 15:10:15 -02:00
KDSBrowne
9c3a21641b prevent chat / poll pane being open at the same time 2018-10-24 14:29:51 +00:00
KDSBrowne
abd5e8a224 update styling / fix bugs 2018-10-24 14:17:13 +00:00
Tainan Felipe
958bd406a6 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-23 14:53:46 -03:00
Tainan Felipe
1bc8ae0b21 add join audio only, and imporov UX 2018-10-23 14:18:09 -03:00
Oswaldo Acauan
f71d32a464 Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
WIP

wip

wip

format

wip

Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
2018-10-23 14:21:58 -02:00
Anton Georgiev
dbc5bc11a0
Merge pull request #6110 from BobakOftadeh/user-manage
User manage button
2018-10-22 10:54:18 -04:00
KDSBrowne
c8b993a3a9 remove use of router in polling 2018-10-18 14:31:17 +00:00
KDSBrowne
bae71203a5 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into poll-with-no-router 2018-10-17 20:34:05 +00:00
Bobak Oftadeh
3a0ce3c57f Altered CSS variables 2018-10-16 10:24:10 -07:00
Bobak Oftadeh
e582978662 Adjusted dropdown position 2018-10-16 08:38:39 -07:00
Anton Georgiev
0d1b085d54 improved on logic for open private chat 2018-10-15 20:03:17 +00:00
KDSBrowne
262038520b improve styling / fix bugs 2018-10-15 14:36:26 +00:00
Bobak Oftadeh
65276a5423 Altered user manage button styles 2018-10-12 14:19:30 -07:00
Anton Georgiev
717a1e2db2 recovered logout functionality including feedback 2018-10-12 21:14:28 +00:00
Anton Georgiev
4059fd5fa9 mostly recovered chat. needs UI love and handling of unread 2018-10-11 20:41:37 +00:00
Bobak Oftadeh
e5ae59908c Altered lock viewers label 2018-10-04 15:16:09 -07:00
Anton Georgiev
02905fb90d react-router removed, lots of code commented out, client loads 2018-10-03 16:14:10 +00:00
Tainan Felipe
ac09d4e69a Add user list item and panel 2018-10-02 10:48:12 -03:00
KDSBrowne
e1440de236 fix private chat not working 2018-09-27 16:27:05 +00:00
Bobak Oftadeh
f4a6947313 Moved isModerator check to the user-options container 2018-09-26 09:04:53 -07:00
Bobak Oftadeh
7ced847512 Manage user button implemented 2018-09-25 09:31:27 -07:00
Bobak Oftadeh
5c3f6202b3 Fixed locked user to have the same height as a default user 2018-09-11 13:42:36 -07:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
KDSBrowne
dfa09244c5 use JSX spread attributes 2018-08-15 15:02:48 +00:00
KDSBrowne
c0e1aeeff8 move position of clear status option in user-dropdown menu 2018-08-15 14:55:22 +00:00
KDSBrowne
6c51f2e7e9 clean up code 2018-08-13 18:47:22 +00:00
KDSBrowne
d8982843fd remove UserAction wrapper 2018-08-13 16:27:56 +00:00
KDSBrowne
524991b26d make btn functionality work for different locales 2018-08-02 14:40:48 +00:00
Anton Georgiev
44dc39eaf8
Merge branch 'master' into add-html5-group-chat-support 2018-08-01 14:24:00 -04:00
KDSBrowne
2993e44a2c remove unneeded callback refs 2018-08-01 16:04:28 +00:00
KDSBrowne
b379f8e204 change variable name 2018-08-01 15:52:22 +00:00
KDSBrowne
165f3eaa8a improve solution so new props dont need to be passed to dropdown component 2018-08-01 15:44:27 +00:00