<p>updated for R1 compatibility</p>

<hr>

<h4>You can merge this Pull Request by running</h4>
<pre>  git pull https://github.com/opentechinstitute/luci-commotion-linux R1</pre>
<p>Or view, comment on, or merge it at:</p>
<p>  <a href='https://github.com/opentechinstitute/luci-commotion-linux/pull/6'>https://github.com/opentechinstitute/luci-commotion-linux/pull/6</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>changed serval-{sign,verify} calls to match new serval-crypto format</li>
  <li>added lua-uri library</li>
  <li>updated service fields</li>
  <li>add form fixes</li>
  <li>misc fixes</li>
  <li>Merge branch 'serval-crypto' into R1</li>
  <li>fixes to commotion_helpers</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion-linux/pull/6/files#diff-0">Makefile</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion-linux/pull/6/files#diff-1">modules/commotion/luasrc/controller/commotion/apps_controller.lua</a>
    (75)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion-linux/pull/6/files#diff-2">modules/commotion/luasrc/view/commotion/apps_display.htm</a>
    (1)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion-linux/pull/6/files#diff-3">modules/commotion/luasrc/view/commotion/apps_form.htm</a>
    (26)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion-linux/pull/6/files#diff-4">modules/commotion/luasrc/view/themes/commotion/apps_apps.htm</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion-linux/pull/6/files#diff-5">modules/commotion/root/etc/config/applications</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion-linux/pull/6/files#diff-6">modules/commotion/root/usr/lib/lua/commotion_helpers.lua</a>
    (10)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion-linux/pull/6/files#diff-7">modules/lua-uri/Makefile</a>
    (2)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion-linux/pull/6/files#diff-8">modules/lua-uri/lua/uri.lua</a>
    (504)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion-linux/pull/6/files#diff-9">modules/lua-uri/lua/uri/_relative.lua</a>
    (81)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion-linux/pull/6/files#diff-10">modules/lua-uri/lua/uri/_util.lua</a>
    (128)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/opentechinstitute/luci-commotion-linux/pull/6.patch'>https://github.com/opentechinstitute/luci-commotion-linux/pull/6.patch</a></li>
  <li><a href='https://github.com/opentechinstitute/luci-commotion-linux/pull/6.diff'>https://github.com/opentechinstitute/luci-commotion-linux/pull/6.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/luci-commotion-linux/pull/6'>view it on GitHub</a>.<img src='https://github.com/notifications/beacon/3074564__eyJzY29wZSI6Ik5ld3NpZXM6QmVhY29uIiwiZXhwaXJlcyI6MTcwNTE2MDY4MiwiZGF0YSI6eyJpZCI6MjM0MTYzNTd9fQ==--29c7f62ee85576be2e7e2f58e116ac35573de6ee.gif' height='1' width='1'></p>