<p>See pull request <a href="https://github.com/opentechinstitute/luci-commotion/pull/460" class="issue-link" title="Replace nodogsplash with fork of luci_splash">opentechinstitute/luci-commotion#460</a> for testing instructions.</p>

<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>  <a href='https://github.com/opentechinstitute/commotion-feed/pull/68'>https://github.com/opentechinstitute/commotion-feed/pull/68</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Add first pass at commotion-dnsproxy Makefile.</li>
  <li>Add commotion-dnsproxy to commotion-gui metapackage dependencies.</li>
  <li>Build LuCI fork from commotion-splash branch.</li>
  <li>Add luci-app-splash to LuCI fork Makefile.</li>
  <li>Add dnsproxy initscript and config.</li>
  <li>Merge branch 'commotion-dnsproxy' into commotion-splash</li>
  <li>Add luci-app-splash to commotion-gui metapackage dependencies.</li>
  <li>Replace nodogsplash with luci-app-splash in luci-commotion dependencies.</li>
  <li>Correct dnsproxy initscript and config file path.</li>
  <li>Merge branch 'commotion-dnsproxy' into commotion-splash</li>
  <li>Correct typo for port option in dnsproxy initscript.</li>
  <li>Merge branch 'commotion-dnsproxy' into commotion-splash</li>
  <li>Change packaging for luci-commotion to reflect luci_splash integration.</li>
  <li>Build luci-commotion against commotion-splash branch.</li>
  <li>Add extra iptables modules to luci-commotion dependencies to include physdev capabilities for splash screen.</li>
  <li>Update Makefile with config and hotplug file changes, updated postinst function.</li>
  <li>Tweak extra-install function for luci-app-olsr-viz.</li>
  <li>Switch targeted luci branch back to luci-0.12.</li>
  <li>Add commotion tag to LuCI version.</li>
  <li>Tweak LuCI version tag to try and make it take precedence.</li>
  <li>Make sure olsr-viz resources get installed with correct permissions.</li>
  <li>Clean up luci-commotion-splash Makefile options.</li>
  <li>Set luci-commotion PKG_VERSION to master.</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/commotion-feed/pull/68/files#diff-0">packages/commotion-dnsproxy/Makefile</a>
    (44)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/commotion-feed/pull/68/files#diff-1">packages/commotion-dnsproxy/dnsproxy.config</a>
    (4)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/commotion-feed/pull/68/files#diff-2">packages/commotion-dnsproxy/dnsproxy.init</a>
    (36)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/commotion-feed/pull/68/files#diff-3">packages/commotion/Makefile</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/commotion-feed/pull/68/files#diff-4">packages/luci-commotion/Makefile</a>
    (31)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/commotion-feed/pull/68/files#diff-5">packages/luci/Makefile</a>
    (18)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/opentechinstitute/commotion-feed/pull/68.patch'>https://github.com/opentechinstitute/commotion-feed/pull/68.patch</a></li>
  <li><a href='https://github.com/opentechinstitute/commotion-feed/pull/68.diff'>https://github.com/opentechinstitute/commotion-feed/pull/68.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href="https://github.com/opentechinstitute/commotion-feed/pull/68">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/AC7qBIum6aLs-btkaQJ9aI8CdOwfHjxWks5n4tDzgaJpZM4D0mlb.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
  <div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
    <link itemprop="url" href="https://github.com/opentechinstitute/commotion-feed/pull/68"></link>
    <meta itemprop="name" content="View Pull Request"></meta>
  </div>
  <meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>