Isaac Visintainer
00a9eb9eab
Merge branch 'master' into os1-rc
2020-02-19 16:04:21 -08:00
matildepark
7d4f9bc6b2
Merge pull request #2315 from urbit/mp/os1/weather/hotfix-border
...
weather: add border to manual entry
2020-02-19 16:41:41 -07:00
Logan
11d8953873
Merge pull request #2310 from urbit/mp/os1/invite-search-ship
...
chat, publish: invite-search surfaces valid ship name as result
2020-02-19 13:48:43 -08:00
Logan
5df24fc856
Merge pull request #2312 from litpub/support-line-breaks
...
chat: Supports translating /n into new <p> tags
2020-02-19 13:48:21 -08:00
Logan
1e05f47d91
Merge branch 'os1-rc' into support-line-breaks
2020-02-19 13:48:14 -08:00
Matilde Park
eec6713338
weather: add border to manual entry
2020-02-19 15:43:05 -05:00
matildepark
76576003be
Merge pull request #2308 from urbit/mp/os1/weather/colors
...
weather: add blurred color gradient, changes based on weather
2020-02-19 13:05:46 -07:00
Matilde Park
1638c62406
weather: style fixes
2020-02-19 15:01:21 -05:00
Logan
6d86c44f4b
Merge pull request #2314 from urbit/la-group-create
...
chat-js: fixed group creation
2020-02-19 11:23:52 -08:00
Logan
820e14757a
Merge branch 'os1-rc' into la-group-create
2020-02-19 11:23:05 -08:00
Matilde Park
3d0f1ff898
weather: increase blur
2020-02-19 13:20:52 -05:00
~litpub
b96df813aa
Supports translating /n into new <p> tags
2020-02-18 23:07:41 -08:00
Logan
6289ef9727
Merge pull request #2311 from litpub/autoresize-textarea
...
Adds autoresize functionality to chat input
2020-02-18 22:55:16 -08:00
~litpub
e687b8988b
Adds autoresize functionality to chat input
2020-02-18 22:26:05 -08:00
Matilde Park
c4bba73833
publish: invite-search shows valid ship in results
2020-02-18 23:32:21 -05:00
Matilde Park
7aeb593fb4
chat: invite-search shows valid ship in results
2020-02-18 23:32:11 -05:00
Matilde Park
069df98edd
weather: colors change based on weather
2020-02-18 21:22:19 -05:00
Logan Allen
688f9c33a1
chat-js: fixed group creation
2020-02-18 18:05:12 -08:00
Fang
5b1c3f3cca
Merge pull request #2302 from urbit/m/link-listen-bugfix
...
link: peer subscription fixes
2020-02-18 23:40:58 +01:00
ixv
42945d14ed
Merge pull request #2305 from urbit/ixv/auto-start-apps
...
OS1: automatically start contacts and links apps upon recieving ota
2020-02-18 11:59:17 -08:00
Isaac Visintainer
7fced14cfc
automatically start contacts and links apps upon recieving ota
2020-02-18 11:22:36 -08:00
ixv
feb5523b73
Merge pull request #2296 from urbit/update-build-interface-script
...
OS1: Update build interface script
2020-02-18 10:37:53 -08:00
Fang
83fecabba9
Merge pull request #2303 from urbit/m/link-order
...
link: ensure content remains sorted by timestamp
2020-02-18 18:53:27 +01:00
Fang
199f7e6279
link fe: ensure items remain sorted by timestamp
...
So that they're always displayed in post-order, and our index of them
stays consistent with the data on the backend.
2020-02-18 16:31:47 +01:00
Fang
583c3dc364
link-store: ensure latest-first ordering of state
...
We may %hear or %read content that was posted some time ago, so we need
to make sure we add it at the appropriate position (wrt timestamp)
rather than just sticking it at the head of the list.
2020-02-18 16:00:50 +01:00
Fang
a5889794b9
link-listen-hook: ping groupies for retry on-join
...
Shortcuts the existing retry timer by having new members send out a poke
when they acknowledge joining the group.
The existing retry logic is left in place to deal with other cases of
subscription failure.
Also fixes an incorrect relevancy check during subscription retries, now
properly preventing duplicate subscriptions.
2020-02-18 15:43:04 +01:00
Jared Tobin
618cfa862b
MAINTAINERS: several updates [ci skip]
...
* recommend using sh/merge-with-custom-msg
* recommend cherry-picking merge commits
* drop hep from release candidate tag format
* minor other additions
2020-02-18 16:51:07 +04:00
Jared Tobin
915bf1332f
sh/release-archive: 'set -e' in header [ci skip]
...
Bail out on encountering any errors.
2020-02-18 16:32:21 +04:00
Jared Tobin
6acb751560
sh/merge-with-custom-msg: add checks [ci skip]
...
* Use 'set -e' to bail on any errors.
* If the pull request number is not specified, bail out.
* Print a simple pre-merge checklist before prompting for merge.
2020-02-17 18:21:34 +04:00
Logan
bf789b987c
Merge pull request #2297 from pkova/os1-rc
...
chat: fix station string format
2020-02-16 19:28:10 -08:00
pkova
b850fc0a0d
chat: fix station string format
2020-02-16 14:21:33 +02:00
Logan
2b3c4b68be
Merge pull request #2299 from urbit/mp/os1/link/unread-gray
...
link: correct unread color class
2020-02-15 22:35:29 -08:00
Matilde Park
bf87ee3daf
link: correct unread color class
2020-02-15 16:42:43 -07:00
Isaac Visintainer
2c847ab9be
updated sh/build-interface
2020-02-14 17:06:20 -08:00
Logan
1106e4b5b3
Merge pull request #2291 from urbit/metadata-os1
...
metadata-store: associate groups with resources within apps, and allow various types of queries
2020-02-14 16:50:51 -08:00
Logan Allen
962ac2e184
metadata-store: sanitized paths and %y to %x
2020-02-14 16:41:39 -08:00
Logan Allen
6e2bcd9428
metadata-store: updated to use better naming for resources, added a few metadata fields
2020-02-14 14:59:22 -08:00
Fang
f2cf3d43d3
link-proxy-hook: fix incorrect scry paths
...
We were scrying for /gx/path instead of /gx/=link-store=/path.
In the %annotations case, that path wasn't even correct.
Also refactors scries out into a +scry-for helper.
2020-02-14 23:35:04 +01:00
ixv
d49987bcc7
Merge pull request #2286 from urbit/ixv/publish-members-settings
...
OS1: added members and settings page to publish
2020-02-14 14:34:43 -08:00
Isaac Visintainer
ac620baadb
dont send invite on unban
...
split dropdown component out from api actions in subscribers
2020-02-14 13:55:55 -08:00
Logan
c71bc22bbc
Merge pull request #2221 from pkova/chat-bugfix
...
chat: fix double message bug
2020-02-14 11:03:53 -08:00
Logan
9410b3ad1e
Merge pull request #2292 from urbit/mp/os1/contacts/notes-design-updates
...
contacts: resizable "notes" field, sidebar scroll tweak, os1 nav buttons
2020-02-14 10:58:38 -08:00
Jared Tobin
36e770f722
Merge branch 'philip/gall-ack-fix' ( #2288 )
...
* origin/philip/gall-ack-fix:
gall: give both acks in case of unexpected ack
gall: make 2140e07
2020-02-14 20:00:50 +04:00
Fang
5d01b4750b
Merge pull request #2289 from urbit/m/link-tile
...
link: properly support the launch tile
2020-02-14 12:50:26 +01:00
Matilde Park
0cb03b0461
contacts: sidebar scrollbar automatic, os1 buttons
2020-02-14 00:29:03 -07:00
Jared Tobin
696a1314f7
sh/merge-with-custom-msg: 'origin' handling fix [ci skip]
...
The KERNEL_CHANGED and PILLS_CHANGED variables used the revision with
'origin' stripped from it (intended for using in messages only), which
caused them to miss remote revisions.
Also tweaks the conditional so that the kernel diff only displays when
pills haven't been updated.
2020-02-14 10:47:18 +04:00
Jared Tobin
e2c4f2cc3f
Merge branch 'm/rep-comment' ( #2287 )
...
* origin/m/rep-comment:
hoon: clarify comments for +rep:in and +rep:by
Signed-off-by: Jared Tobin <jared@tlon.io>
2020-02-14 10:47:08 +04:00
Philip Monk
4fda5e8e38
gall: give both acks in case of unexpected ack
...
It's hard to say what's the safest thing to do when we get an ack we
weren't expecting due to losing outstanding.agents.state in +load
3-to-4, so this gives both a watch-ack and a poke-ack. This seems most
likely to succeed.
2020-02-13 17:48:33 -08:00
Logan Allen
498c6e8e97
metadata-store: added scry + watch paths, an %update-metadata update
2020-02-13 17:22:52 -08:00
Philip Monk
e082845e0d
gall: make 2140e07 ota-able
...
Does not change state type, but clears outstanding.agents.state since
it's full of garbage values. This introduces a possibility that we may
have been in the middle of something, so we handle that in a reasonably
sane way.
2020-02-13 17:20:27 -08:00
