Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

merge into: Briq:build_system2
Branches Tags
Briq:auto_join_3.3
Briq:auto_join
Briq:build_system2
Briq:master
...
pull from: Briq:auto_join
Branches Tags
Briq:auto_join_3.3
Briq:auto_join
Briq:build_system2
Briq:master

9 Commits
build_syst ... auto_join

Author SHA1 Message Date
Pietro Brenna d878a809d1 Merge branch 'build_system2' into auto_join
Briq/multiparty-meeting/pipeline/head This commit looks good Details
2020-05-14 18:47:48 +02:00
Pietro Brenna 59ba0499cd Tolgo cookie consent 2020-05-13 14:43:59 +02:00
Pietro Brenna 8f87b1a3c1 Tasto leave chiude finestra 2020-05-13 14:43:59 +02:00
Pietro Brenna e03ab517e0 Fix temporaneo (bisognerebbe lavorare in App.js!) 2020-05-13 14:43:59 +02:00
Mert ÇELEN bb02cee8ff Create main.yml 2020-05-13 14:43:59 +02:00
Mészáros Mihály 700f48b15c Fix: bump version number 2020-05-13 14:43:59 +02:00
Mészáros Mihály 9f8bc7896c clarify more that ip change is mandatory 
Move to documentation IP range
 2020-05-13 14:43:59 +02:00
Mészáros Mihály aeea4c76bf Add turkish translation 2020-05-13 14:43:59 +02:00
Ali Orhun Akkirman f8d0a45dcc Create turkish language file 2020-05-13 14:43:59 +02:00
4 changed files with 21 additions and 37 deletions
Show Stats Expand all files Collapse all files

2
app/src/components/ChooseRoom.js
View File

@ -240,7 +240,7 @@ const ChooseRoom = ({
</Button>
</DialogActions>
{ !isElectron() &&
{ !isElectron() && false &&
<CookieConsent buttonText={intl.formatMessage({
id : 'room.consentUnderstand',
defaultMessage : 'I understand'

4
app/src/components/Controls/TopBar.js
View File

@ -47,7 +47,7 @@ const styles = (theme) =>
},
divider :
{
marginLeft : theme.spacing(3),
marginLeft : theme.spacing(3)
},
show :
{
@ -345,7 +345,7 @@ const TopBar = (props) =>
className={classes.actionButton}
variant='contained'
color='secondary'
onClick={() => roomClient.close()}
onClick={() => { roomClient.close(); window.close(); }}
>
<FormattedMessage
id='label.leave'

26
app/src/components/JoinDialog.js
View File

@ -177,27 +177,11 @@ const JoinDialog = ({
{
const intl = useIntl();
const handleKeyDown = (event) =>
{
const { key } = event;
roomClient.join({ roomId, joinVideo: true });
switch (key)
{
case 'Enter':
case 'Escape':
{
if (displayName === '')
changeDisplayName('Guest');
if (room.inLobby)
roomClient.changeDisplayName(displayName);
break;
}
default:
break;
}
};
return (<div />);
return (
/* return (
<div className={classes.root}>
<Dialog
open
@ -335,7 +319,7 @@ const JoinDialog = ({
</DialogContent>
}
{ !isElectron() &&
{ !isElectron() && false &&
<CookieConsent buttonText={intl.formatMessage({
id : 'room.consentUnderstand',
defaultMessage : 'I understand'
@ -348,7 +332,7 @@ const JoinDialog = ({
}
</Dialog>
</div>
);
);*/
};
JoinDialog.propTypes =

8
app/src/components/Room.js
View File

@ -153,17 +153,17 @@ class Room extends React.PureComponent
return (
<div className={classes.root}>
{ !isElectron() &&
{ !isElectron() && false &&
<CookieConsent
buttonText={
<FormattedMessage
id = 'room.consentUnderstand'
defaultMessage = 'I understand'
id='room.consentUnderstand'
defaultMessage='I understand'
/>
}
>
<FormattedMessage
id = 'room.cookieConsent'
id='room.cookieConsent'
defaultMessage='This website uses cookies to enhance the user experience'
/>
</CookieConsent>