KDSBrowne
|
e6398ea56f
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager
|
2018-11-22 14:46:24 +00:00 |
|
Anton Georgiev
|
2e7a2aeda0
|
Merge pull request #6282 from BobakOftadeh/userlist-scroll-fix
Fixed user list scroll
|
2018-11-22 12:31:49 -02:00 |
|
Bobak Oftadeh
|
98d8136367
|
Fixed user-list scroll
|
2018-11-22 13:48:06 +00:00 |
|
Bobak Oftadeh
|
70b533ba2e
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-21 12:25:53 +00:00 |
|
Bobak Oftadeh
|
e6e40d8c84
|
removed ALLOW_MODERATOR_TO_UNMUTE_AUDIO check
|
2018-11-20 16:15:02 +00:00 |
|
KDSBrowne
|
149b4f091a
|
move render functions from app to panel-manager
|
2018-11-20 15:28:00 +00:00 |
|
Bobak Oftadeh
|
282fd4055d
|
removed option to unmute other users
|
2018-11-20 13:12:43 +00:00 |
|
KDSBrowne
|
99e15b20ba
|
add panel manager component
|
2018-11-19 23:29:48 +00:00 |
|
Bobak Oftadeh
|
4649fe7c76
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-16 13:32:29 -08:00 |
|
Bobak Oftadeh
|
95564a6acd
|
cleaned up code for user-options
|
2018-11-16 13:08:53 -08:00 |
|
Bobak Oftadeh
|
91592a5d80
|
cleaned up code for moderator menu
|
2018-11-12 09:40:18 -08:00 |
|
bobakoftadeh
|
c33723ac14
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-12 09:15:55 -08:00 |
|
bobakoftadeh
|
04421e631b
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-mange-b
|
2018-11-12 08:40:47 -08:00 |
|
bobakoftadeh
|
856459e989
|
Merge branch 'user-manage-b' of https://github.com/BobakOftadeh/bigbluebutton into user-manage-C
|
2018-11-06 13:47:38 -08:00 |
|
Bobak Oftadeh
|
edc941da9e
|
Implementation of lock-view modal menu
|
2018-11-06 13:39:07 -08:00 |
|
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 |
|
Bobak Oftadeh
|
a97a1ece37
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b
|
2018-11-02 09:17:07 -07:00 |
|
Anton Georgiev
|
357f341a3e
|
Merge branch 'master' into breakout-room-html5
|
2018-11-02 09:26:09 -04:00 |
|
Joao Siebel
|
97a0a2a13b
|
configurable shortcuts available. close #6169
|
2018-10-31 15:51:56 -03:00 |
|
Bobak Oftadeh
|
6bde6b06f5
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b
|
2018-10-29 14:39:25 -07:00 |
|
Bobak Oftadeh
|
b3a496bfc0
|
Improved user-manage menu styles and implementation
|
2018-10-29 14:36:10 -07:00 |
|
KDSBrowne
|
bba899c4a7
|
prevent poll closing on poll pane hide
|
2018-10-29 15:27:50 +00:00 |
|
Tainan Felipe
|
0e1f805c30
|
remove log
|
2018-10-26 17:26:24 -03: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
|
9adf429b32
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01
|
2018-10-26 13:23:32 +00:00 |
|
KDSBrowne
|
8f24fcfd01
|
make userlist-poll btn toggle menu
|
2018-10-26 12:37:29 +00:00 |
|
Anton Georgiev
|
05da6ff047
|
toggle PublicChat
|
2018-10-26 12:36:51 +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 |
|
Bobak Oftadeh
|
262bd32bc6
|
Cleaned up user-options component and container
|
2018-10-24 11:34:11 -07: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 |
|