Commit Graph

141 Commits

Author SHA1 Message Date
KDSBrowne
538e248058 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-11-02 21:25:40 +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
935eb1289d Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-10-25 18:39:26 +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
Anton Georgiev
cde6311a5d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-24 18:26: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
Anton Georgiev
0d1b085d54 improved on logic for open private chat 2018-10-15 20:03:17 +00:00
KDSBrowne
9b42940d63 move polling options for viewer 2018-10-12 15:05:53 +00:00
Anton Georgiev
4059fd5fa9 mostly recovered chat. needs UI love and handling of unread 2018-10-11 20:41:37 +00:00
Anton Georgiev
497db01167 added meteor/session; userList without router 2018-10-05 19:23:16 +00:00
Anton Georgiev
02905fb90d react-router removed, lots of code commented out, client loads 2018-10-03 16:14:10 +00:00
Anton Georgiev
0c8eafc2c8 Merge branch 'remove-react-router' of github.com:antobinary/bigbluebutton into remove-react-router 2018-10-02 14:47:25 +00:00
Tainan Felipe
ac09d4e69a Add user list item and panel 2018-10-02 10:48:12 -03:00
Bobak Oftadeh
7ced847512 Manage user button implemented 2018-09-25 09:31:27 -07:00
KDSBrowne
3430321a68 Merge remote-tracking branch 'upstream/master' into start-poll-01 2018-09-23 23:08:24 +00:00
Anton Georgiev
92732a96e6 WIP removing react-router 2018-09-21 15:43:10 +00:00
Anton Georgiev
fd02b04a2d
Merge pull request #6025 from BobakOftadeh/chat-width-increased-window
Extended the Width of the Chat Area
2018-09-19 13:05:06 -04:00
Bobak Oftadeh
121e47982f Changed chat-width from pixel to precent. 2018-09-19 08:21:14 -07:00
KDSBrowne
226adbe254 make poll menu render 2018-09-14 17:50:18 +00:00
Bobak Oftadeh
cacc5e1920 Extended the width of the chat area 2018-08-29 12:57:36 -07:00
KDSBrowne
fecbee16b5 change folder / component names & localized strings 2018-08-09 17:02:18 +00:00
Maxim Khlobystov
aa8c656d7d Defaulting to desktop when browser detection package fails. 2018-08-01 11:10:21 -04:00
KDSBrowne
b497ac87af improve line readability / fix audio-modal title not being displayed 2018-06-18 17:01:45 +00:00
KDSBrowne
4fa9e745b2 Merge remote-tracking branch 'upstream/v2.0.x-release' into xx.add.Edge-support-html5 2018-06-13 16:30:14 +00:00
James Jung
c9cb37cf52 seperate settings of resizable tags' enable attribute of userList and chat 2018-06-08 15:37:43 -04:00
James Jung
bc6b1bb092 Fix comments for userList and chat width 2018-06-08 15:00:13 -04:00
James Jung
01d703e9f1 Fix indentations 2018-06-08 14:53:15 -04:00
KDSBrowne
b8e9f325e2 Merge branch '01.rework-edge-support' into xx.add.Edge-support-html5 2018-06-07 21:36:55 +00:00
KDSBrowne
41ecfd72ec adds and impliments react-render-in-browser package 2018-06-07 20:00:29 +00:00
KDSBrowne
addcb86b12 add browser/os class to <body> / center indicator icons in edge 2018-06-07 17:51:00 +00:00
James Jung
97deeb67bd Fix indentations 2018-06-07 12:20:41 -04:00
James Jung
46e0d333ea Adjust variable initializations' places according to other merged updates 2018-06-06 12:12:43 -04:00
James Jung
95cc33d713 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into adj-partList-chatModule-width 2018-06-06 11:53:27 -04:00
James Jung
c676d582d3 Make chat module resizable operation more reasonable 2018-06-05 15:08:49 -04:00
Oswaldo Acauan
fb04db7b54 Fix current width calc 2018-06-04 16:43:54 -03:00
Oswaldo Acauan
a5d173a1f2 Remove redirect on resize and update userlist compact based on its width 2018-06-04 16:11:11 -03:00
Oswaldo Acauan
7bf922c87b Disable resizing of userlist and chat for mobile 2018-06-04 15:56:09 -03:00
Oswaldo Acauan
6922ab1c70 Disable resizing of userlist and chat for mobile 2018-06-04 15:44:23 -03:00
James Jung
f0c3746884 Seperate the logic for calculating the default width of the userList to outside of the Resizable tag 2018-05-28 12:27:40 -04:00
James Jung
19dbdeaf5f Fix spelling mistake 2018-05-25 13:10:13 -04:00
James Jung
0eb5366e9c Initializing some variables for the default size of the user-list to make the logic inside it more readable 2018-05-24 15:02:47 -04:00