<p>In diary posts, comments, and previews sequence [map]some features here[/map] now will be converted into embedded maps. Also add builtin editor (link in markdown help).</p>

<p>See more about mapBB here <a href="http://mapbbcode.org/">http://mapbbcode.org/</a></p>

<hr>

<h4>You can merge this Pull Request by running</h4>
<pre>  git pull https://github.com/kiselev-dv/openstreetmap-website mapBB</pre>
<p>Or view, comment on, or merge it at:</p>
<p>  <a href='https://github.com/openstreetmap/openstreetmap-website/pull/524'>https://github.com/openstreetmap/openstreetmap-website/pull/524</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Add support for mapBB in diary entryes</li>
  <li>Merge branch 'master' of github.com:kiselev-dv/openstreetmap-website</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-0">Gemfile</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-1">Gemfile.lock</a>
    (7)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-2">Vendorfile</a>
    (13)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-3">app/assets/stylesheets/common.css.scss</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-4">app/controllers/site_controller.rb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-5">app/helpers/application_helper.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-6">app/views/diary_entry/_diary_entry.html.erb</a>
    (14)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-7">app/views/diary_entry/view.html.erb</a>
    (16)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-8">app/views/site/_markdown_help.html.erb</a>
    (20)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-9">app/views/site/mapbbeditor.html.erb</a>
    (37)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-10">config/locales/en.yml</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-11">config/locales/ru.yml</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-12">config/routes.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-13">lib/rich_text.rb</a>
    (5)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-14">vendor/assets/mapbb/Bing.js</a>
    (124)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-15">vendor/assets/mapbb/images/spritesheet-2x.png</a>
    (0)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-16">vendor/assets/mapbb/images/spritesheet.png</a>
    (0)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-17">vendor/assets/mapbb/leaflet.draw.css</a>
    (234)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-18">vendor/assets/mapbb/leaflet.draw.ie.css</a>
    (49)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-19">vendor/assets/mapbb/leaflet.draw.js</a>
    (10)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-20">vendor/assets/mapbb/mapbbcode-config.js</a>
    (8)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/524/files#diff-21">vendor/assets/mapbb/mapbbcode.js</a>
    (24)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/524.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/524.patch</a></li>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/524.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/524.diff</a></li>
</ul>