Merge branch 'master' into Development

Improved packaging support
2021-02-07 08:54:29 +01:00
parent 33a0a4c173 7b7494b8a4
commit 251a77c8b4
30 changed files with 2540 additions and 2514 deletions
@@ -171,9 +171,11 @@
        </tbody>
      </table>

+      {%  if feature_support['updater'] %}
      <div class="hidden" id="update_error"> <span>{{update_error}}</span></div>
      <div class="btn btn-primary" id="check_for_update">{{_('Check for Update')}}</div>
      <div class="btn btn-primary hidden" id="perform_update" data-toggle="modal" data-target="#StatusDialog">{{_('Perform Update')}}</div>
+      {%  endif %}
    </div>
  </div>
 </div>