mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions 1

Remove all concept of 'key conflict' from the app

Browse source
This commit is contained in:
Scott Nonnenberg 2017-06-08 18:08:41 -07:00
parent 51080141cd
commit ee0b0f5ffb
15 changed files with 28 additions and 400 deletions
Download patch file Download diff file Expand all files Collapse all files

34
background.html
View file

@ -280,12 +280,6 @@
</script>
<script type='text/x-tmpl-mustache' id='message-detail'>
<div class='container'>
{{ #hasConflict }}
<div class='hasConflict clearfix'>
<div class='conflicts'>
</div>
</div>
{{ /hasConflict }}
<div class='message-container'></div>
<div class='info'>
<table>
@ -315,13 +309,8 @@
<script type='text/x-tmpl-mustache' id='group-member-list'>
<div class='container'></div>
</script>
<script type='text/x-tmpl-mustache' id='key_verification_panel'>
<script type='text/x-tmpl-mustache' id='key-verification'>
<div class='container'>
{{> key_verification }}
<p> {{> link_to_support }} </p>
</div>
</script>
<script type='text/x-tmpl-mustache' id='key_verification'>
{{ ^has_their_key }}
<div class='placeholder'>{{ their_key_unknown }}</div>
{{ /has_their_key }}
@ -332,6 +321,8 @@
{{ #chunks }} <span>{{ . }}</span> {{ /chunks }}
</div>
{{ /has_their_key }}
<p> {{> link_to_support }} </p>
</div>
</script>
<!-- index -->
<script type='text/x-tmpl-mustache' id='group_info_input'>
@ -400,24 +391,6 @@
{{ learnMore }}
</a>
</script>
<script type='text/x-tmpl-mustache' id='key-conflict-dialogue'>
<h3 class='header'>{{ newIdentity }}</h3>
<div class='content clearfix'>
<div class='clearfix'>
{{> avatar }}
<span class='name'>{{ name }}</span>
<button class='resolve'>{{ resolve }}</button>
<a href='#' class='hideKeys hide'> {{ hideKeys }} </a>
<a href='#' class='showKeys'> {{ showKeys }} </a>
</div>
<div class='keys hide'>
<p>
{{ message }}
{{> link_to_support }}
</p>
</div>
</div>
</script>
<script type='text/x-tmpl-mustache' id='debug-log'>
<div class='content'>
<div>
@ -656,7 +629,6 @@
<script type='text/javascript' src='js/views/contact_list_view.js'></script>
<script type='text/javascript' src='js/views/new_group_update_view.js'></script>
<script type='text/javascript' src='js/views/attachment_view.js'></script>
<script type='text/javascript' src='js/views/key_conflict_dialogue_view.js'></script>
<script type='text/javascript' src='js/views/error_view.js'></script>
<script type='text/javascript' src='js/views/timestamp_view.js'></script>
<script type='text/javascript' src='js/views/message_view.js'></script>