diff options
| author | jeroenpraat <jeroenpraat@xs4all.nl> | 2016-12-19 16:52:17 +0100 |
|---|---|---|
| committer | jeroenpraat <jeroenpraat@xs4all.nl> | 2016-12-19 16:52:17 +0100 |
| commit | 468fb3c77a60fe38a021502bce5ca6a4e4c211a4 (patch) | |
| tree | 0a6c99558d6815157a41d46ae8e50ecb0899e527 /view/js | |
| parent | 3a4bd27333a90191868393f747fad662a51753f0 (diff) | |
| parent | 3ad3d3037f8ba9643952bbf64e70c5edf302a73b (diff) | |
| download | volse-hubzilla-468fb3c77a60fe38a021502bce5ca6a4e4c211a4.tar.gz volse-hubzilla-468fb3c77a60fe38a021502bce5ca6a4e4c211a4.tar.bz2 volse-hubzilla-468fb3c77a60fe38a021502bce5ca6a4e4c211a4.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/acl.js | 1 | ||||
| -rw-r--r-- | view/js/main.js | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/view/js/acl.js b/view/js/acl.js index c11997c43..4dd60d303 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -276,6 +276,7 @@ ACL.prototype.update_view = function(value) { /* jot acl */ $('#jot-perms-icon, #dialog-perms-icon, #' + that.form_id[0].id + ' .jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock'); + $('#jot-perms-icon').removeClass('jot-lock-warn'); $('#dbtn-jotnets').show(); $('.profile-jot-net input').attr('disabled', false); diff --git a/view/js/main.js b/view/js/main.js index 1d6eca91d..bfe9d25a3 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1164,7 +1164,6 @@ function preview_mail() { return true; } - function unpause() { // unpause auto reloads if they are currently stopped totStopped = false; |