Bug 1452018 - Remove remaining Firefox OS and Marketplace references

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index f419955dc0f30b0f076a93f12b991aacff054f7d..ca00a8aecc07607b2a025f2d47711f8e2ba693eb 100644 (file)
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -110,7 +110,6 @@ use Time::HiRes qw(gettimeofday tv_interval);
 
 # BMO - product aliases for searching
 use constant PRODUCT_ALIASES => {
-    'Boot2Gecko' => 'Firefox OS',
 };
 
 # When doing searches, NULL datetimes are treated as this date.

diff --git a/Bugzilla/UserAgent.pm b/Bugzilla/UserAgent.pm
index bd31a2a13d892eab2e33006cb68b8b38167adacc..e3f941d6dc322596bd5a20046bb3a0bd7b04dbcf 100644 (file)
--- a/Bugzilla/UserAgent.pm
+++ b/Bugzilla/UserAgent.pm
@@ -151,8 +151,6 @@ use constant OS_MAP => (
     qr/\(.*Mac OS 8[^.].*\)/ => ["Mac System 8.0"],
     qr/\(.*Mac OS 8.*\)/ => ["Mac System 8.6"],
     qr/\(.*Darwin.*\)/ => [("Mac OS X 10.0", "Mac OS X")],
-    # Firefox OS
-    qr/\(Mobile;.*Gecko.*Firefox/ => ["Gonk (Firefox OS)"],
     # Silly
     qr/\(.*Mac.*PowerPC.*\)/ => ["Mac System 9.x"],
     qr/\(.*Mac.*PPC.*\)/ => ["Mac System 9.x"],

diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index 8a447c9583bbad1b8ef41463fff423176523eb31..2f92b5c409eec57e6881804d58f0359331ea130f 100644 (file)
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -1438,7 +1438,6 @@ sub install_update_db {
                 "L20n"                          => 'l20n-security',
                 "Legal"                         => 'legal',
                 "Marketing"                     => 'marketing-private',
-                "Marketplace"                   => 'client-services-security',
                 "Mozilla Communities"           => 'mozilla-communities-security',
                 "Mozilla Corporation"           => 'mozilla-employee-confidential',
                 "Mozilla Developer Network"     => 'websites-security',

diff --git a/extensions/BMO/bin/bug_1141452.pl b/extensions/BMO/bin/bug_1141452.pl
deleted file mode 100755 (executable)
index 8695938..0000000
--- a/extensions/BMO/bin/bug_1141452.pl
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/perl
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-use strict;
-use warnings;
-use 5.10.1;
-
-use lib qw(. lib local/lib/perl5);
-
-BEGIN {
-    use Bugzilla;
-    Bugzilla->extensions;
-}
-
-use Bugzilla::Constants qw( USAGE_MODE_CMDLINE );
-use Bugzilla::Extension::TrackingFlags::Flag;
-use Bugzilla::User;
-
-Bugzilla->usage_mode(USAGE_MODE_CMDLINE);
-my $dbh = Bugzilla->dbh;
-
-my $blocking_b2g = Bugzilla::Extension::TrackingFlags::Flag->check({ name => 'cf_blocking_b2g' });
-my $tracking_b2g = Bugzilla::Extension::TrackingFlags::Flag->check({ name => 'cf_tracking_b2g' });
-
-die "tracking-b2g does not have a 'backlog' value\n"
-    unless grep { $_->value eq 'backlog' } @{ $tracking_b2g->values };
-
-print "Searching for bugs..\n";
-my $flags = $dbh->selectall_arrayref(<<EOF, { Slice => {} }, $blocking_b2g->flag_id, $tracking_b2g->flag_id);
-    SELECT
-        bugs.bug_id,
-        blocking_b2g.id id,
-        tracking_b2g.value value
-    FROM
-        bugs
-        INNER JOIN tracking_flags_bugs blocking_b2g
-            ON blocking_b2g.bug_id = bugs.bug_id AND blocking_b2g.tracking_flag_id = ?
-        LEFT JOIN tracking_flags_bugs tracking_b2g
-            ON tracking_b2g.bug_id = bugs.bug_id AND tracking_b2g.tracking_flag_id = ?
-    WHERE
-        blocking_b2g.value = 'backlog'
-EOF
-die "No suitable bugs found\n" unless @$flags;
-printf "About to fix %s bugs\n", scalar(@$flags);
-print "Press <Ctrl-C> to stop or <Enter> to continue...\n";
-getc();
-
-my $nobody = Bugzilla::User->check({ name => 'nobody@mozilla.org' });
-my $when   = $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
-
-$dbh->bz_start_transaction();
-foreach my $flag (@$flags) {
-    if (!$flag->{value}) {
-        print $flag->{bug_id}, ": changing blocking_b2g:backlog -> tracking_b2g:backlog\n";
-        # no tracking_b2g value, change blocking_b2g:backlog -> tracking_b2g:backlog
-        $dbh->do(
-            "UPDATE tracking_flags_bugs SET tracking_flag_id = ? WHERE id = ?",
-            undef,
-            $tracking_b2g->flag_id, $flag->{id},
-        );
-        $dbh->do(
-            "UPDATE bugs SET delta_ts = ?, lastdiffed = ? WHERE bug_id = ?",
-            undef,
-            $when, $when, $flag->{bug_id},
-        );
-        $dbh->do(
-            "INSERT INTO bugs_activity(bug_id, who, bug_when, fieldid, removed, added) VALUES (?, ?, ?, ?, ?, ?)",
-            undef,
-            $flag->{bug_id}, $nobody->id, $when, $blocking_b2g->id, 'backlog', '---',
-        );
-        $dbh->do(
-            "INSERT INTO bugs_activity(bug_id, who, bug_when, fieldid, removed, added) VALUES (?, ?, ?, ?, ?, ?)",
-            undef,
-            $flag->{bug_id}, $nobody->id, $when, $tracking_b2g->id, '---', 'backlog',
-        );
-    }
-    elsif ($flag->{value}) {
-        print $flag->{bug_id}, ": deleting blocking_b2g:backlog\n";
-        # tracking_b2g already has a value, just delete blocking_b2g:backlog
-        $dbh->do(
-            "DELETE FROM tracking_flags_bugs WHERE id = ?",
-            undef,
-            $flag->{id},
-        );
-        $dbh->do(
-            "UPDATE bugs SET delta_ts = ?, lastdiffed = ? WHERE bug_id = ?",
-            undef,
-            $when, $when, $flag->{bug_id},
-        );
-        $dbh->do(
-            "INSERT INTO bugs_activity(bug_id, who, bug_when, fieldid, removed, added) VALUES (?, ?, ?, ?, ?, ?)",
-            undef,
-            $flag->{bug_id}, $nobody->id, $when, $blocking_b2g->id, 'backlog', '---',
-        );
-    }
-}
-$dbh->bz_commit_transaction();
-
-print "Done.\n";

diff --git a/extensions/BMO/lib/Data.pm b/extensions/BMO/lib/Data.pm
index 349f880931c80c57d6dbf91ec3f12f80f9cad51b..bb11abd1c859d74f71225758fde54d9b51c7303e 100644 (file)
--- a/extensions/BMO/lib/Data.pm
+++ b/extensions/BMO/lib/Data.pm
@@ -105,7 +105,6 @@ tie(%$cf_visible_in_products, "Tie::IxHash",
         "Add-on SDK"                  => [],
         "addons.mozilla.org"          => [],
         "Android Background Services" => [],
-        "B2GDroid"                    => [],
         "Calendar"                    => [],
         "Composer"                    => [],
         "Core"                        => [],
@@ -196,7 +195,6 @@ tie(%$cf_visible_in_products, "Tie::IxHash",
 # Who to CC on particular bugmails when certain groups are added or removed.
 our %group_change_notification = (
   'addons-security'           => ['amo-editors@mozilla.org'],
-  'b2g-core-security'         => ['security@mozilla.org'],
   'bugzilla-security'         => ['security@bugzilla.org'],
   'client-services-security'  => ['amo-admins@mozilla.org', 'web-security@mozilla.org'],
   'cloud-services-security'   => ['web-security@mozilla.org'],

diff --git a/extensions/BMO/template/en/default/bug/create/comment-comm-newsletter.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-comm-newsletter.txt.tmpl
index e1dca92420a335980afab4ef60839430b6177184..9367847303b795586453fcd3a8753b66033f833f 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/comment-comm-newsletter.txt.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/comment-comm-newsletter.txt.tmpl
@@ -39,8 +39,6 @@ Marketing: [% IF cgi.param('area_marketing') %] Yes [% ELSE %] No [% END %]
 Engagement: [% IF cgi.param('area_engagement') %] Yes [% ELSE %] No [% END %]
 Firefox Desktop: [% IF cgi.param('area_firefox_desktop') %] Yes [% ELSE %] No [% END %]
 Firefox for Android: [% IF cgi.param('area_firefox_android') %] Yes [% ELSE %] No [% END %]
-FirefoxOS: [% IF cgi.param('area_firefox_os') %] Yes [% ELSE %] No [% END %]
-Marketplace: [% IF cgi.param('area_marketplace') %] Yes [% ELSE %] No [% END %]
 User Research/User Centered Design: [% IF cgi.param('area_user_research') %] Yes [% ELSE %] No [% END %]
 Security: [% IF cgi.param('area_security') %] Yes [% ELSE %] No [% END %]
 Support: [% IF cgi.param('area_support') %] Yes [% ELSE %] No [% END %]

diff --git a/extensions/BMO/template/en/default/bug/create/create-comm-newsletter.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-comm-newsletter.html.tmpl
index a51f8d74107b14cd2aed438c685bb55d7d9e620c..b980ff9fc5734c97d461408b40c6218270252404 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-comm-newsletter.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-comm-newsletter.html.tmpl
@@ -178,7 +178,7 @@ function toggleAreaOther() {
   </label>
   <div class="field_desc">
     What product or functional area does this opportunity relate to? Click
-    multiple areas if they apply (ie both Marketplace and UX)
+    multiple areas if they apply (ie both Security and UX)
   </div>
   <input type="checkbox" name="area_coding" id="area_coding" value="Coding">Coding<br>
   <input type="checkbox" name="area_community_building"
@@ -199,10 +199,6 @@ function toggleAreaOther() {
          id="area_firefox_desktop" value="Firefox Desktop">Firefox Desktop<br>
   <input type="checkbox" name="area_firefox_android"
          id="area_firefox_android" value="Firefox for Android">Firefox for Android<br>
-  <input type="checkbox" name="area_firefox_os"
-         id="area_firefox_os" value="Firefox OS">Firefox OS<br>
-  <input type="checkbox" name="area_marketplace"
-         id="area_marketplace" value="Marketplace">Marketplace<br>
   <input type="checkbox" name="area_user_research"
          id="area_user_research" value="User Research">User Research<br>
   <input type="checkbox" name="area_security"

diff --git a/extensions/BMO/template/en/default/bug/create/create-costume.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-costume.html.tmpl
index 82632873237a81d85e03d4da5cf1e43d2f3081d8..1cb0cf32d3cc9d6c080b58393458952f89fb782d 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-costume.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-costume.html.tmpl
@@ -225,7 +225,7 @@ YAHOO.util.Event.onDOMReady(function() {
   </div>
   <div class="field_input">
     <textarea name="event_type" id="event_type" rows="5" cols="50"
-              placeholder="Examples: Firefox OS in store launch event, Mozilla
+              placeholder="Examples: Firefox Quantum launch event, Mozilla
                            [%~ %] company event, Conference, Press Conference,
                            [%~ %] Hack-a-thon."></textarea>
   </div>
@@ -236,7 +236,6 @@ YAHOO.util.Event.onDOMReady(function() {
   <div class="field_input">
     <select name="goal" id="goal">
       <option></option>
-      <option>Firefox OS</option>
       <option>Firefox Browser</option>
       <option>Services</option>
       <option>Org Support</option>

diff --git a/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl
index a83f1fe67d0869806b6207147fec56c0e7131ca9..a619715002675955682acb8aefa5740143e95caf 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl
@@ -222,7 +222,6 @@ function toggleTypeOther(element) {
   <select id="goal" name="goal"
           onchange="toggleGoalOther();">
     <option value="">Please select..</option>
-    <option value="Firefox OS">Firefox OS</option>
     <option value="Firefox Browser">Firefox Browser</option>
     <option value="Million Mozillians">Million Mozillians</option>
     <option value="Services">Services</option>

diff --git a/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl
index 473fd84786b59e6bd275c4479b5ae1733f56eead..c95d5fee994523d237b921ec1726aeedc48b0b07 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl
@@ -170,7 +170,7 @@
   </th>
   <td>
     <i>
-      Which Initiative or Overall goal this purchase is for. i.e. B2G, Data Center, Network, etc.</i><br>
+      Which Initiative or Overall goal this purchase is for. i.e. Data Center, Network, etc.</i><br>
     <textarea id="business_obj" name="business_obj" rows="5" cols="40"></textarea>
   </td>
 <tr>

diff --git a/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl
index 4a36c0949040f2c3df6076e2aad43e4f49388124..7c7a01680caac0ada112b0903b3fb27995d54eeb 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl
@@ -164,7 +164,6 @@ $(document).ready(function() {
       <select required id="product_line" name="product_line">
         <option value="">Select..</option>
         <option value="Firefox">Firefox</option>
-        <option value="Firefox OS">Firefox OS</option>
         <option value="Firefox for Android">Firefox for Android</option>
         <option value="Content Services">Content Services</option>
         <option value="Cloud Services">Cloud Services</option>
@@ -174,7 +173,6 @@ $(document).ready(function() {
         <option value="Office of the CTO">Office of The CTO</option>
         <option value="Platform">Platform</option>
         <option value="Product Management">Product Management</option>
-        <option value="Marketplace">Marketplace</option>
         <option value="Other">Other</option>
       </select>
     </div>

diff --git a/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl
index 31c5f98f014c92031f24424c641f90b5d161a1f3..37a7c3ab9d48512861ce20a6c51d90cb605a5663 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl
@@ -105,7 +105,6 @@ function validateAndSubmit() {
   <td>
     <select name="op_sys" id="op_sys">
       <option value="">Please select...</option>
-      <option value="Gonk (Firefox OS)">Firefox OS</option>
       <option value="Android">Firefox for Android</option>
     </select>
   </td>

diff --git a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
index d108feaa4c8d84a6d289949f87d3767da7c58769..a723d6af3698186db30a3b44479d61dae4d92736 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
@@ -460,10 +460,8 @@ function validate_form() {
     <option value=""></option>
     <option>Firefox Desktop</option>
     <option>Firefox for Android</option>
-    <option>Marketplace</option>
     <option>Developer Tools</option>
     <option>Cloud</option>
-    <option>Firefox OS</option>
     <option>Corporate / Business Support</option>
     <option>Other:</option>
   </select>
@@ -503,7 +501,6 @@ function validate_form() {
   <label for="company_goal" class="required">Company Goal</label>
   <select name="company_goal" id="company_goal">
     <option value=""></option>
-    <option>Scale Firefox OS</option>
     <option>Add Services to our Product Lines</option>
     <option>Get Firefox on a Growth Trajectory</option>
     <option>Invest in Sustainability</option>

diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
index 4222323aeabe5f16b74d558e3b2306bb406689d5..281a438b898a2209384a4924d752273e85c3ad48 100644 (file)
--- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -123,10 +123,6 @@
           IF firefox_fixed_versions.0 == "";
             firefox_fixed_versions.0 = "Firefox " _ flag_name.substr(7);
           END;
-        ELSIF flag_name.substr(0, 4) == "b2g-";
-          IF firefox_fixed_versions.1 == "";
-            firefox_fixed_versions.1 = "Firefox OS " _ flag_name.substr(4);
-          END;
         END;
       END;
     END;

diff --git a/extensions/GuidedBugEntry/web/js/products.js b/extensions/GuidedBugEntry/web/js/products.js
index ffeee0af6ed2bcbfe7705db4e1a6c5859169e210..ade67ddde1c3daf0524e37823be1e27578d64a40 100644 (file)
--- a/extensions/GuidedBugEntry/web/js/products.js
+++ b/extensions/GuidedBugEntry/web/js/products.js
@@ -112,10 +112,6 @@ var products = {
     }
   },
 
-  "Marketplace": {
-    l10n: true
-  },
-
   "Penelope": {
     related: [ "Core", "Toolkit", "MailNews Core" ]
   },

diff --git a/extensions/Push/lib/Connector/TCL.pm b/extensions/Push/lib/Connector/TCL.pm
index f5b430e4769e2702d4de129a54914e60aa2b4256..6ad759bf26b59c706393e001eae7c6a449e92416 100644 (file)
--- a/extensions/Push/lib/Connector/TCL.pm
+++ b/extensions/Push/lib/Connector/TCL.pm
@@ -120,9 +120,7 @@ sub should_send {
 
     # send status and resolution updates
     foreach my $change (@{ $data->{event}->{changes} }) {
-        return 1 if $change->{field} eq 'bug_status'
-            || $change->{field} eq 'resolution'
-            || $change->{field} eq 'cf_blocking_b2g';
+        return 1 if $change->{field} eq 'bug_status' || $change->{field} eq 'resolution';
     }
 
     # send attachments
@@ -160,7 +158,6 @@ sub send {
         Who          => $data->{event}->{user}->{login},
         Status       => $bug_data->{status}->{name},
         Resolution   => $bug_data->{resolution},
-        Blocking_B2G => $bug_data->{cf_blocking_b2g},
     );
     if ($data->{event}->{routing_key} eq 'comment.create') {
         $xml{Comment} = $data->{comment}->{body};

diff --git a/extensions/TrackingFlags/template/en/default/hook/admin/admin-end_links_right.html.tmpl b/extensions/TrackingFlags/template/en/default/hook/admin/admin-end_links_right.html.tmpl
index 217d541997686add8775deb3b8543983bd4a3674..5d927794029dc4ea404ca63919f338e49aa7dbe6 100644 (file)
--- a/extensions/TrackingFlags/template/en/default/hook/admin/admin-end_links_right.html.tmpl
+++ b/extensions/TrackingFlags/template/en/default/hook/admin/admin-end_links_right.html.tmpl
@@ -12,7 +12,7 @@
   </dt>
   <dd>
     Tracking flags are special multi-value fields used to aid tracking releases
-    of Firefox, Firefox OS, Thunderbird, and other projects.
+    of Firefox, Thunderbird, and other projects.
   </dd>
 [% END %]
 

diff --git a/extensions/TrackingFlags/template/en/default/hook/bug/create/create-form.html.tmpl b/extensions/TrackingFlags/template/en/default/hook/bug/create/create-form.html.tmpl
index 005cc80625e5f8f1718d946bb182523e017af41c..bcb2b9339e6e58c4460a2694d9be05ac86c43cd9 100644 (file)
--- a/extensions/TrackingFlags/template/en/default/hook/bug/create/create-form.html.tmpl
+++ b/extensions/TrackingFlags/template/en/default/hook/bug/create/create-form.html.tmpl
@@ -15,7 +15,6 @@
   auto_affected = {
     "Firefox"               = [],
     "Firefox for Android"   = [],
-    "Firefox OS"            = [],
     "Core"                  = [],
     "Toolkit"               = [],
     "Firefox Health Report" = [ "Client: Desktop", "Client: Android" ],

diff --git a/extensions/UserStory/lib/Constants.pm b/extensions/UserStory/lib/Constants.pm
index 6a1c0c449a08917b18b234857aa4e39c08f56844..aba776b72c0438043652792ea3a379eac16a96d6 100644 (file)
--- a/extensions/UserStory/lib/Constants.pm
+++ b/extensions/UserStory/lib/Constants.pm
@@ -20,8 +20,8 @@ use constant USER_STORY_GROUP => 'editbugs';
 
 # Exclude showing the user story field for these products/components.
 # Examples:
-# Don't show User Story on any Firefox OS component:
-#   'Firefox OS' => [],
+# Don't show User Story on any Firefox component:
+#   'Firefox' => [],
 # Don't show User Story on Developer Tools component, visible on all other
 # Firefox components
 #   'Firefox'    => ['Developer Tools'],

diff --git a/scripts/generate_bmo_data.pl b/scripts/generate_bmo_data.pl
index 8bc2a78b545640c90da7d689a15dbfbf38ffb1f4..23fed2d3e86068cd4b04525187aff94854229170 100755 (executable)
--- a/scripts/generate_bmo_data.pl
+++ b/scripts/generate_bmo_data.pl
@@ -126,7 +126,6 @@ my @oses= (
     'Windows Phone',
     'Mac OS X',
     'Linux',
-    'Gonk (Firefox OS)',
     'Android',
     'iOS',
     'iOS 7',

diff --git a/template/en/default/account/prefs/mfa.html.tmpl b/template/en/default/account/prefs/mfa.html.tmpl
index 4f2bc3d1e8471bdcf3254fbde33fcf5d5f5552d2..8185a91bb691ab5675244e7c36dd8c952efe510c 100644 (file)
--- a/template/en/default/account/prefs/mfa.html.tmpl
+++ b/template/en/default/account/prefs/mfa.html.tmpl
@@ -229,9 +229,6 @@
             <a href="https://support.google.com/accounts/answer/1066447" target="_blank" rel="noopener noreferrer">Google Authenticator</a>,
             <a href="https://freeotp.github.io/" target="_blank" rel="noopener noreferrer">Red Hat FreeOTP</a>
           </li>
-          <li>Firefox OS:
-            <a href="https://marketplace.firefox.com/app/firekey/" target="_blank" rel="noopener noreferrer">Firekey</a>
-          </li>
           <li>Windows Phone:
             <a href="http://www.windowsphone.com/en-us/store/app/authenticator/021dd79f-0598-e011-986b-78e7d1fa76f8"
                 target="_blank rel="noopener noreferrer"">Authenticator</a>