diff options
| author | Mario <mario@mariovavti.com> | 2020-11-04 15:16:52 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-11-04 15:16:52 +0000 |
| commit | 20d2811cd5d0e2f518169a7625c8df3734f7137c (patch) | |
| tree | 9e6fe1ac4fbc73b6833fccfb5384f6688afa8594 | |
| parent | b4ca5c133cdc0f4934eb6d348dcc423a5ff4fe02 (diff) | |
| parent | 207df132e69bd3e70f28addbd63bd3c638da9b08 (diff) | |
| download | volse-hubzilla-20d2811cd5d0e2f518169a7625c8df3734f7137c.tar.gz volse-hubzilla-20d2811cd5d0e2f518169a7625c8df3734f7137c.tar.bz2 volse-hubzilla-20d2811cd5d0e2f518169a7625c8df3734f7137c.zip | |
Merge branch 'dev' into 5.0RC
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 9 | ||||
| -rw-r--r-- | view/js/main.js | 4 | ||||
| -rwxr-xr-x | view/tpl/connections.tpl | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 08e5ffaca..e7fa6352a 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1018,6 +1018,7 @@ class Activity { if(! $extended) { return $p['xchan_url']; } + $ret = []; $c = ((array_key_exists('channel_id',$p)) ? $p : channelx_by_hash($p['xchan_hash'])); @@ -1063,10 +1064,16 @@ class Activity { ] ]; + $ret['publicKey'] = [ + 'id' => $p['xchan_url'], + 'owner' => $p['xchan_url'], + 'publicKeyPem' => $p['xchan_pubkey'] + ]; + $arr = [ 'xchan' => $p, 'encoded' => $ret ]; call_hooks('encode_person', $arr); - $ret = $arr['encoded']; + $ret = $arr['encoded']; return $ret; } diff --git a/view/js/main.js b/view/js/main.js index fb7bcb52f..8ceb0b143 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1868,7 +1868,9 @@ function sse_handleNotifications(obj, replace, followup) { } else { $('.' + type + '-update').html('0'); - $('.' + type + '-button').fadeOut(); + $('.' + type + '-button').fadeOut(function() { + sse_setNotificationsStatus(); + }); } if(obj[type].notifications.length) sse_handleNotificationsItems(type, obj[type].notifications, replace, followup); diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index 021c33146..fedcff1e3 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -20,7 +20,7 @@ <div class="input-group form-group"> <input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" /> <div class="input-group-append"> - <button id="contacts-search-submit" class="btn btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button> + <button id="contacts-search-submit" class="btn btn-sm btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button> </div> </div> </form> |