git ssb

10+

Matt McKegg / patchwork



Commit 8e308450fe64500e05acf9f9f82a8d91a22ea58f

Merge remote-tracking branch 'upstream/master' into no_followers_2

Gordon Martin committed on 2/18/2018, 10:19:06 AM
Parent: 2e2e0a092b955da7781f9a2347257017d8854de5
Parent: a84aec048346a76c0e35e32f7a6d9c3373a2ee49

Files changed

locales/en.jsonchanged
modules/feed/html/rollup.jschanged
modules/page/html/render/public.jschanged
modules/profile/obs/contact.jschanged
package.jsonchanged
locales/en.jsonView
@@ -66,9 +66,8 @@
6666 "other": "View %s more"
6767 },
6868 "Self Assigned": "Self Assigned",
6969 "Assigned By": "Assigned By",
70- "(you)": "(you)",
7170 "from now": "from now",
7271 "ago": "ago",
7372 "years": "years",
7473 "months": "months",
@@ -83,63 +82,26 @@
8382 "day": "day",
8483 "hour": "hour",
8584 "minute": "minute",
8685 "second": "second",
86+ "Liked by": "Liked by",
87+ "likes": "likes",
8788 "See less": "See less",
8889 "See more": "See more",
8990 "Reply": "Reply",
91+ "mentioned you": "mentioned you",
9092 "View full thread": "View full thread",
91- "mentioned you": "mentioned you",
93+ "(you)": "(you)",
94+ "replied to this message": "replied to this message",
95+ "in reply to ": "in reply to ",
96+ "mentioned in your network": "mentioned in your network",
9297 "followed ": "followed ",
93- "in reply to ": "in reply to ",
94- "replied to this message": "replied to this message",
98+ " referenced this message:": " referenced this message:",
99+ "added changes": "added changes",
95100 " and ": " and ",
96- "identifies ": "identifies ",
97- " as \"": " as \"",
98- "Liked by": "Liked by",
99- "likes": "likes",
100- " others": " others",
101101 "like": "like",
102- "subscribed to ": "subscribed to ",
103- "liked this message": "liked this message",
104- "Click to unblock": "Click to unblock",
105- "Blocked": "Blocked",
106- "Click to unfollow": "Click to unfollow",
107- "Follow Back": "Follow Back",
108- "Follow": "Follow",
109- "Click to block syncing with this person and hide their posts": "Click to block syncing with this person and hide their posts",
110- "Block": "Block",
111- "This is you.": "This is you.",
112- "unsubscribed from ": "unsubscribed from ",
113- "mentioned in your network": "mentioned in your network",
114- "on ": "on ",
115- "assigned a display image to ": "assigned a display image to ",
116- "Close": "Close",
117- "Write a public message": "Write a public message",
118- "Missing message": "Missing message",
119- " via ": " via ",
120- "The author of this message could be outside of your follow range or they may be blocked.": "The author of this message could be outside of your follow range or they may be blocked.",
121- "New Message": "New Message",
122- "Write a private reply": "Write a private reply",
123- "Write a public reply": "Write a public reply",
124- "Confirm": "Confirm",
125- "Cancel": "Cancel",
126- "self assigned a description": "self assigned a description",
127- "self assigned a display image": "self assigned a display image",
128- "unfollowed ": "unfollowed ",
129- "Click to unsubscribe": "Click to unsubscribe",
130- "Subscribed": "Subscribed",
131- "Subscribe": "Subscribe",
132- "You follow %s people that subscribe to this channel.": {
133- "one": "You follow %s people that subscribe to this channel.",
134- "other": "You follow %s people that subscribe to this channel."
135- },
136- "Write a message in this channel": "Write a message in this channel",
137- "You may not be able to see new channel content until you follow some users or pubs.": "You may not be able to see new channel content until you follow some users or pubs.",
138- "mentioned this channel": "mentioned this channel",
139- " forked this discussion:": " forked this discussion:",
140- "self identifies as ": "self identifies as ",
141102 "%s people from your network replied to this message on ": {
142103 "one": "%s people from your network replied to this message on ",
143104 "other": "%s people from your network replied to this message on "
144- }
105+ },
106+ "unfollowed ": "unfollowed "
145107 }
modules/feed/html/rollup.jsView
@@ -116,9 +116,9 @@
116116 newSinceRefresh.add(msg.key)
117117 unreadIds.add(msg.key)
118118 }
119119
120- if (updates() === 0 && msg.value.author === yourId && container.scrollTop < 20) {
120+ if (updates() === 0 && msg.value.author === yourId && container.scrollTop < 500) {
121121 refresh()
122122 } else if (msg.value.author === yourId && content()) {
123123 // dynamically insert this post into the feed! (manually so that it doesn't get slow with mutant)
124124 var existingContainer = content().querySelector(`[data-root-id="${msg.value.content.root}"]`)
modules/page/html/render/public.jsView
@@ -255,9 +255,9 @@
255255 h('div.progress', [
256256 api.progress.html.peer(id)
257257 ]),
258258 h('div.controls', [
259- h('a.disconnect', {href: '#disconnect', 'ev-click': send(disconnect, id), title: i18n('Force Disconnect')}, ['x'])
259+ h('a.disconnect', {href: '#', 'ev-click': send(disconnect, id), title: i18n('Force Disconnect')}, ['x'])
260260 ])
261261 ])
262262 })
263263 ])
modules/profile/obs/contact.jsView
@@ -46,10 +46,10 @@
4646 })
4747
4848 var isYou = computed([yourId, id], (a, b) => a === b)
4949
50- var isNotFollowingAnybody = computed(following, followingList => {
51- return !followingList || !followingList.length
50+ var isNotFollowingAnybody = computed([following, following.sync], (following, sync) => {
51+ return sync && (!following || !following.length)
5252 })
5353
5454 var hasNoFollowers = computed(followers, followersList => {
5555 return !followersList || !followersList.length
package.jsonView
@@ -1,9 +1,9 @@
11 {
22 "name": "ssb-patchwork",
33 "productName": "Patchwork",
44 "repository": "git@github.com:ssbc/patchwork.git",
5- "version": "3.8.6",
5+ "version": "3.8.8",
66 "description": "A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB).",
77 "main": "index.js",
88 "scripts": {
99 "test": "standard",
@@ -55,15 +55,17 @@
5555 "pull-pause": "~0.0.1",
5656 "pull-ping": "^2.0.2",
5757 "pull-pushable": "^2.0.1",
5858 "pull-stream": "~3.6.0",
59- "scuttlebot": "github:ssbc/scuttlebot#383d7075a3da53278e1102455f3dc3ea7af18c46",
59+ "scuttlebot": "github:ssbc/scuttlebot#22d894d03235a96f1cad8e836b55ca57eb25d17f",
60+ "secret-stack": "4.0.1",
6061 "sorted-array-functions": "~1.0.0",
6162 "spacetime": "^1.0.7",
6263 "ssb-about": "~0.1.1",
6364 "ssb-avatar": "^0.2.0",
6465 "ssb-backlinks": "~0.6.1",
6566 "ssb-blobs": "~1.1.4",
67+ "ssb-client": "4.5.2",
6668 "ssb-config": "^2.2.0",
6769 "ssb-friends": "^2.3.5",
6870 "ssb-keys": "^7.0.13",
6971 "ssb-mentions": "^0.4.0",

Built with git-ssb-web