Merge branch 'master' into feature/#1476-add-styles-for-POSDAO-network

* master:
  fix CHANGELOG: feature -> chore
  Update CHANGELOG
  Update telegram link

# Conflicts:
#	apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex
pull/1704/head
Gabriel Rodriguez Alsina 6 years ago
commit 51b5841bfd
  1. 1
      CHANGELOG.md
  2. 2
      apps/block_scout_web/config/config.exs
  3. 2
      apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex

@ -13,6 +13,7 @@
### Chore
- [#1749](https://github.com/poanetwork/blockscout/pull/1749) - Replace the link in the footer with the official POA announcements tg channel link
- [#1718](https://github.com/poanetwork/blockscout/pull/1718) - Flatten indexer module hierarchy and supervisor tree
- [#1753](https://github.com/poanetwork/blockscout/pull/1753) - Add a check mark to decompiled contract tab

@ -95,7 +95,7 @@ config :block_scout_web, BlockScoutWeb.Gettext, locales: ~w(en), default_locale:
config :block_scout_web, BlockScoutWeb.SocialMedia,
twitter: "PoaNetwork",
telegram: "oraclesnetwork",
telegram: "poa_network",
facebook: "PoaNetwork",
instagram: "PoaNetwork"

@ -19,7 +19,7 @@
<a href="https://www.twitter.com/PoaNetwork/" rel="noreferrer" target="_blank" class="footer-social-icon" data-toggle="tooltip" data-placement="top" title="<%= gettext("Twitter") %>">
<i class="fab fa-twitter"></i>
</a>
<a href="http://t.me/oraclesnetwork" rel="noreferrer" target="_blank" class="footer-social-icon" data-toggle="tooltip" data-placement="top" title="<%= gettext("Telegram") %>">
<a href="https://t.me/poa_network" rel="noreferrer" target="_blank" class="footer-social-icon" data-toggle="tooltip" data-placement="top" title="<%= gettext("Telegram") %>">
<i class="fab fa-telegram-plane"></i>
</a>
<a href="https://github.com/poanetwork" rel="noreferrer" target="_blank" class="footer-social-icon" data-toggle="tooltip" data-placement="top" title="<%= gettext("Github") %>">

Loading…
Cancel
Save