mirror of
https://github.com/zulip/zulip.git
synced 2025-11-18 12:54:58 +00:00
Eliminate transitional email forwarding flags
(imported from commit cc9305e554a381de5a36b7c353bbf53b71b2d43c)
This commit is contained in:
committed by
Zev Benjamin
parent
c5f8ffc767
commit
9df7ee454d
@@ -8,7 +8,6 @@ exports.summarize_read_while_narrowed = true;
|
||||
exports.twenty_four_hour_time = _.contains([],
|
||||
page_params.email);
|
||||
exports.dropbox_integration = page_params.staging || _.contains(['dropbox.com'], page_params.domain);
|
||||
exports.email_forwarding = true;
|
||||
|
||||
exports.mandatory_topics = _.contains([
|
||||
'customer7.invalid'
|
||||
|
||||
@@ -224,8 +224,7 @@ function add_email_hint(row) {
|
||||
function add_sub_to_table(sub) {
|
||||
$('#create_stream_row').after(templates.render(
|
||||
'subscription',
|
||||
_.extend(sub, {'show_email_token': feature_flags.email_forwarding,
|
||||
'allow_rename': page_params.show_admin})));
|
||||
_.extend(sub, {'allow_rename': page_params.show_admin})));
|
||||
settings_for_sub(sub).collapse('show');
|
||||
add_email_hint(sub);
|
||||
}
|
||||
@@ -427,9 +426,6 @@ exports.setup_page = function () {
|
||||
sub = create_sub(stream, {subscribed: false});
|
||||
}
|
||||
sub = _.extend(sub, {'allow_rename': page_params.show_admin});
|
||||
if (feature_flags.email_forwarding) {
|
||||
sub = _.extend(sub, {'show_email_token': feature_flags.email_forwarding});
|
||||
}
|
||||
sub_rows.push(sub);
|
||||
});
|
||||
|
||||
|
||||
@@ -44,12 +44,12 @@
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
{{#if_and show_email_token subscribed}}
|
||||
{{#if subscribed}}
|
||||
<div>
|
||||
<p><b>Email address</b>: <span class="email-address">{{email_address}}
|
||||
<i class="icon-vector-question-sign" id="email-address-hint-{{id}}"></i></span></p>
|
||||
</div>
|
||||
{{/if_and}}
|
||||
{{/if}}
|
||||
|
||||
{{#if allow_rename}}
|
||||
<div class="rename-stream">
|
||||
|
||||
Reference in New Issue
Block a user