urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-28 22:33:06 +03:00
Code Issues Packages Projects Releases Wiki Activity
20,869 Commits 768 Branches 10 Tags 215 MiB
f614a38f6d
Commit Graph

2833 Commits

Author SHA1 Message Date
Liam Fitzgerald
af77d47e73 graph-view: revived groupify 2020-09-11 10:15:04 +10:00
Liam Fitzgerald
574e6de984 graph-view: refine threads 2020-09-11 10:15:04 +10:00
Liam Fitzgerald
556759ee3f graph-view: address review comments 2020-09-11 09:35:44 +10:00
Liam Fitzgerald
cd0ca3a1b4 lib/graph: fix scries 2020-09-11 09:35:44 +10:00
Liam Fitzgerald
ff1219bbda marks: add graph-view marks 2020-09-11 09:35:44 +10:00
Liam Fitzgerald
2a9c1bf3fa Revert "graph-hooks: deleted for now until we can test them with a UI" 
This reverts commit 738481ff71.
 2020-09-11 09:35:44 +10:00
Liam Fitzgerald
08dab6c5b0 graph-view: add delete, leave threads 2020-09-11 09:35:44 +10:00
Liam Fitzgerald
47561d806f spider: add state adapters for HTTP interface 2020-09-11 09:35:44 +10:00
Liam Fitzgerald
06012abe2e spider: add HTTP interface 2020-09-11 09:35:44 +10:00
Liam Fitzgerald
19371c46c2 graph-view: added create,join threads 2020-09-11 09:35:44 +10:00
Liam Fitzgerald
c3fd4922aa lib/strandio: add +scry 2020-09-11 09:35:44 +10:00
Matilde Park
a2adf7359d glob: update to 0v4.kdc52.27is2.c7mnh.7vsrb.ij4jo 2020-09-09 00:19:14 -04:00
Matilde Park
7d857d3a83 glob: update to 0v6.vnpkl.sq452.quabg.73g7k.dhi55 2020-09-08 20:39:36 -04:00
Matilde Park
c7f8af1fd2 Merge branch 'release/next-userspace' 2020-09-08 20:32:02 -04:00
Fang
c109111ff9
dbug: attempt to scry for state 
If the underlying app implements a /x/dbug/state endpoint in +on-peek,
dbug will now use that for %state evaluation. Falls back to the vase
provided by +on-save if the peek fails.

This allows apps and (perhaps more usefully) wrapper agents to provide
customized vases to /lib/dbug.

Updates /lib/shoe to make use of this, properly prepending the wrapped
app's vase to shoe's own, instead of including it as-is.
 2020-09-07 15:55:45 +02:00
matildepark
d136c50ccc
Merge pull request #3243 from urbit/lf/lib-hooks-docs 
lib-hooks: document with comments
 2020-09-05 16:18:17 -04:00
Liam Fitzgerald
2c2a61746b graph-store: fix signatures & marks 2020-09-04 15:37:39 +10:00
Liam Fitzgerald
003537e80e lib/hooks: remove reference to scrying 2020-09-03 10:13:29 +10:00
Liam Fitzgerald
3cce0f3830 glob: update to 0v5.g2nge.n1pgc.v5326.ivfqv.7ici2 2020-09-01 22:34:24 -04:00
Liam Fitzgerald
e96671b930 chat-view: no-op instead of crash on self-join 2020-09-02 11:44:10 +10:00
Liam Fitzgerald
b006e7f4ad chat-view: crash on joining own chat 2020-09-02 11:21:44 +10:00
Liam Fitzgerald
b81153db03 pull-hook: prevent from subscribing to ourselves 2020-09-02 11:21:14 +10:00
Fang
941d9b90c0
shoe: add %table and %row usage to example app 
Adds "table" and "row" commands, in addition to the existing "demo" one,
to provide examples of dime-table rendering, text wrapping etc.
 2020-09-01 20:13:48 +02:00
Fang
7658686a03
shoe: add %table and %row shoe commands 
For rendering a data table or just a single table row respectively.

Table data is a list of header names, a list of width restrictions, and a list
of rows, defined as lists of dimes.
Row contents are rendered as per the aura in the dime. This also determines
their alignment (left/right), and how they break to fit smaller-width columns.

%row was added because %table necessitated implementing it. Whether it's a good
fit for the shoe "protocol" remains to be seen.
 2020-09-01 20:12:30 +02:00
Ted Blackman
4b26b2dd71 link: archive graph on migration 2020-09-01 13:57:19 -04:00
L
48df07cd55
Merge pull request #3390 from urbit/la/graph-js 
interface: added graph reducer, store state, and subscription
 2020-09-01 12:27:07 -05:00
Matilde Park
ef3b9282c2 various: add [landscape] marker to apps in arvo 2020-08-31 21:54:39 -04:00
Matilde Park
293e3261f1 Merge branch 'mp/maintainers-rfc' (#3381) 
* origin/mp/maintainers-rfc:
  arvo/README: update maintainers

Signed-off-by: Matilde Park <matilde.park@sunshinegardens.org>
 2020-08-31 15:01:38 -04:00
Philip Monk
9d4003d415
Merge pull request #3400 from urbit/philip/diff 
clay: minimal -diff thread
 2020-08-28 11:39:37 -07:00
Philip Monk
4c758372d6
clay: minimal -diff thread 
Barebones 2-way diff thread.  Further development should include:

- recognize at least %txt and %hoon diff types as (urge:clay cord) and
print them prettily

- check if they're directories and recurse through them, noting files
that exist in one or the other and diffing ones that exist in both

- support 3-way diffs.  Since we know the desks they're on, we can find
a mergebase (see how +trouble gets the base-hash in #3378) and do a
3-way diff.

- extend the above to support all the useful diffs, including
diff3(a,b), diff2(mergebase(a,b),a) and any other useful ones.
 2020-08-27 21:14:47 -07:00
Logan Allen
bbf854d956 graph-store: updated scry interface to return %graph-store marks so as to properly do %json conversion 2020-08-27 17:31:36 -05:00
Matilde Park
13b5851b71 Merge branch 'master' into release/next-userspace 2020-08-27 14:50:27 -04:00
Fang
ddb61adbd1
lib: take json as argument to server json-response 
No reason conversion to octs has to happen outside of this function.
 2020-08-27 16:57:03 +02:00
Matilde Park
d47cfdb57d release: urbit-os-v1.0.43 2020-08-26 21:12:53 -04:00
Matilde Park
d78e28a167 glob: update to 0v6.8fpt6.7mcjg.nb019.df3fo.haav6 2020-08-26 21:11:32 -04:00
Matilde Park
e76e919755 landscape/index.html: restore aws script 
This got dropped in a merge conflict somewhere.
 2020-08-26 20:50:49 -04:00
Matilde Park
0245ea73cf Merge branch 'la/file-server-fix' (#3379) 
* origin/la/file-server-fix:
  file-server: fix %file-server by adding SPA flag and threading is-file through request

Signed-off-by: Matilde Park <matilde.park@sunshinegardens.org>
 2020-08-26 20:39:38 -04:00
matildepark
e8b51df6dd
arvo/README: update maintainers 2020-08-26 18:29:19 -04:00
Logan Allen
e1b011224d file-server: fix %file-server by adding SPA flag and threading is-file through request 2020-08-26 14:24:16 -05:00
Liam Fitzgerald
a7779025e8 Merge branch 'release/next-userspace' into lf/settings-screen 2020-08-26 10:50:12 +10:00
Philip Monk
9f96259261
Merge pull request #3311 from ohAitch/fix-wuts 
dojo: restore `??` and `???` syntax
 2020-08-25 15:00:49 -07:00
Anton Dyudin
46af34cfe8
dojo: fix dy-show-type-noun indent 2020-08-25 13:45:32 -07:00
matildepark
2bd4a7035a
Merge pull request #3316 from urbit/dk-peek 
updated on-peek for s3-store
 2020-08-24 14:37:32 -04:00
Logan Allen
1a419895a3 link-hooks: left TODO comments 2020-08-19 16:27:08 -07:00
Logan Allen
5838b017f8 link: deactivated view 2020-08-19 16:26:21 -07:00
Logan Allen
291ec5526b link-hooks: deactivated and deleted state 2020-08-19 16:21:42 -07:00
Logan Allen
a4e21da3f0 hood: starts %graph-pull-hook and %graph-push-hook 2020-08-19 12:48:08 -07:00
Logan Allen
7ec18b834d Merge branch 'la/graph-hook' into lt/link-migration 2020-08-19 12:28:11 -07:00
Logan Allen
b70cae9d77 graph-hook: both hooks compile 2020-08-19 12:26:58 -07:00
Logan Allen
928e5f7362 graph-hooks: initial sketch 2020-08-19 12:22:20 -07:00
David Kerschner
dd3e1a5bcc launch: minor on-peek update 2020-08-19 11:46:52 -07:00
matildepark
669a55ecf3
Merge pull request #3307 from cmarcelo/json-for-chat-update-keys 
chat: serialize %keys to JSON for chat update
 2020-08-19 13:02:32 -04:00
matildepark
f9805aada9
Merge pull request #3327 from urbit/lf/groups-join-fix 
groups: join fixes
 2020-08-19 11:09:05 -04:00
David Kerschner
1eb6407062 launch: added scrys for missing options 2020-08-18 17:25:51 -07:00
David Kerschner
bf4faf467c s3-store: requested stylistic changes 2020-08-18 17:25:35 -07:00
Ted Blackman
dd2bae9320 links: data migration compiles; untested and still needs subscription migration 2020-08-18 15:41:24 -04:00
Ted Blackman
96d2906edc link: graph validator compiles and runs 2020-08-18 13:32:04 -04:00
Liam Fitzgerald
a8e4e00627 Merge branch 'release/next-userspace' into lf/settings-screen 2020-08-18 09:56:04 +10:00
Logan Allen
9c33fbd9be file-server: fix #3047, incorrect path matching 2020-08-17 13:30:05 -07:00
David Kerschner
8837e6686e updated per comments 2020-08-17 12:57:46 -07:00
Matilde Park
80b3d59789 Merge branch 'master' into release/next-userspace 2020-08-17 13:00:28 -04:00
Liam Fitzgerald
e89cb3bd71 Merge branch 'release/next-userspace' into lf/settings-screen 2020-08-17 18:10:00 +10:00
Liam Fitzgerald
5a1a994b9f group-store: Disallow joining of nonexisting groups 
Returns %.n upon requesting a join of group that does not exist
 2020-08-17 12:51:45 +10:00
Liam Fitzgerald
f658d99c76 pull-hook: no-op on double add 
If we receive an %add poke for a resource we are already pulling, no-op
instead of crashing. This should prevent crashes upon repulling a
resource after a breach of the host.
 2020-08-17 12:47:40 +10:00
Liam Fitzgerald
516423b853 contact-hook: no-op on accepted invite 
The contact-hook was attempting to join a group upon it's invite being
accepted. However, the join poke is also sent from the frontend, causing
a potential race condition. Changes contact-hook to no-op on an
%invite-update.
 2020-08-17 12:41:24 +10:00
David Kerschner
a2c7b16eb1 updated on-peek for s3-store 2020-08-14 11:36:29 -07:00
Tyler Brown Cifu Shuster
a593a9a3de interface: div is not a self-closing tag 2020-08-13 21:17:36 -07:00
Anton Dyudin
4c45ffc7f0 dojo: reintroduce "?? expr" raw-ish type printer 2020-08-14 00:27:31 +00:00
Anton Dyudin
dda386472c dojo ???: handle threads 2020-08-14 00:27:31 +00:00
Anton Dyudin
d372da3829 dojo: reintroduce "??? expr" parse debug mode 
NOTE does a somewhat quetionable type thing, original version didn't compile
 2020-08-14 00:27:31 +00:00
Caio Marcelo de Oliveira Filho
04326ad04d chat: Refactor to use ?- in chat update JSON serialization 2020-08-13 01:11:12 -07:00
Caio Marcelo de Oliveira Filho
058ec8aa2c chat: serialize %keys to JSON for chat update 2020-08-13 01:10:24 -07:00
Matilde Park
b0d252fa76 publish: no-op when joining our own notebook 
Fixes #3300.
 2020-08-12 23:08:31 -04:00
Matilde Park
b963a55b04 publish: no-op when joining our own notebook 
Fixes #3300.
 2020-08-12 21:12:05 -04:00
Liam Fitzgerald
993ba2d00f glob: update to 0v2.pbthv.gd1q2.h2ura.5esrn.d361c 2020-08-11 22:14:07 -04:00
Matilde Park
a123dd67dd interface: allow pinch zooming if needed 2020-08-11 16:20:19 -04:00
Matilde Park
087dbf0221 interface: prevent interface zooming on iOS 2020-08-11 15:24:28 -04:00
Liam Fitzgerald
7abeebc672 glob: update to 0v7.foe2o.ang8k.28dnr.fudi0.74c8d 2020-08-11 00:26:02 -04:00
Matilde Park
442d124836 landscape/index.html: update for new bundle 2020-08-10 23:01:01 -04:00
Matilde Park
f79f1a128b glob: update to 0v2.aal6p.71bo0.v3r4f.ka7l6.8js3t 2020-08-10 23:00:40 -04:00
Matilde Park
f93448e473 landscape/index.html: update for new bundle 2020-08-10 22:09:57 -04:00
Matilde Park
ef26b119dc glob: update to 0vmf0mo.4kgmp.27315.046hb.ikabc 2020-08-10 21:30:27 -04:00
Liam Fitzgerald
e3d1293f6a Merge branch 'release/next-userspace' into lf/settings-screen 2020-08-10 09:52:36 +10:00
Liam Fitzgerald
1238c2034b Merge branch 'release/next-userspace' into lf/settings-screen 2020-08-07 10:48:21 +10:00
Liam Fitzgerald
860794e084 Merge branch 'release/next-userspace' into lf/versioned-js-bundles 2020-08-07 10:30:13 +10:00
Matilde Park
fe4b6facb1 omnibox: use current assets 2020-08-05 21:32:19 -04:00
Matilde Park
67e1586f94 Merge branch 'release/next-userspace' into mp/omnibox 2020-08-05 15:27:10 -04:00
Liam Fitzgerald
531d53ddfc lib-hooks: address mark review 2020-08-05 13:55:12 +10:00
Liam Fitzgerald
b3139f0e52 settings: add inline image upload 2020-08-05 13:39:25 +10:00
matildepark
ef62796305
Merge pull request #3251 from urbit/lf/admin-invite 
contact-view: poke %group-push-hook correctly
 2020-08-04 19:12:31 -04:00
Liam Fitzgerald
13e22455f3 contact-view: poke %group-push-hook correctly 
Fixes #3214
 2020-08-04 12:55:05 +10:00
Liam Fitzgerald
044cea6eb4 glob: update glob for versioning 2020-08-04 10:53:45 +10:00
Liam Fitzgerald
0d1930b6ac file-server: migrate to new dir 2020-08-04 10:38:56 +10:00
Liam Fitzgerald
f4971ae08c glob: serve all webpack assets out of /bundle 2020-08-04 10:36:51 +10:00
Liam Fitzgerald
255cf8a730 glob: handle versioned JS bundles in |make 2020-08-03 10:09:49 +10:00
Liam Fitzgerald
cf84670fc8 file-server: do not cache index.html 
Removes caching for index.html so JS versioning can occur by referencing
JS bundles with different filenames
 2020-08-03 09:53:49 +10:00
Liam Fitzgerald
d91de5f276 lib-hooks: document with comments 2020-08-01 11:11:13 +10:00
Matilde Park
baaea9a2a4 glob: update to 0v3.cus8h.vc64c.rfb3t.22oji.b529a 2020-07-31 01:25:41 -04:00
Matilde Park
5fd6d657b8 glob: update to 0v1.lkkr3.b5rri.loft7.tctif.hlu0t 2020-07-31 00:28:08 -04:00
Matilde Park
9bbe87acb3 Merge branch 'master' into release/next-userspace 2020-07-31 00:16:39 -04:00
matildepark
6ff8176380
Merge pull request #3228 from urbit/la/fix-out-of-sync 
chat-hook: fix synced map getting out of sync with outgoing subscriptions
 2020-07-30 22:43:37 -04:00
Matilde Park
1be4aed640 interface: add omnibox, new statusbar 2020-07-30 19:14:03 -04:00
L
798f3b5de0
Merge pull request #3110 from urbit/la/graph-store 
graph-store: a consistent, strongly validated, interoperable data storage format
 2020-07-30 15:25:17 -07:00
Logan Allen
d7b31680f4 graph-store: moved ~| to within var declarations so crashes don't affect anything else 2020-07-30 15:06:48 -07:00
Logan Allen
871818b241 graph-store: if there is no hash in added node, replace signatures with ~, otherwise check validity of signatures 2020-07-30 15:02:04 -07:00
Logan Allen
7fb50a3f97 graph-store: respond to phil's comments, request %next for clay, and compare +tear to hash 2020-07-30 14:43:40 -07:00
Logan Allen
f8320b3de1 chat-hook: fix synced map getting out of sync with outgoing subscriptions 2020-07-30 14:20:40 -07:00
Philip Monk
4a5d087de6
Merge remote-tracking branch 'origin/master' into release/next-sys 2020-07-30 13:46:13 -07:00
Philip Monk
48745e945a
Merge branch 'philip/ames-lane' (#3186) 
* origin/philip/ames-lane:
  ames: fix lane discovery during some lane changes

Signed-off-by: Philip Monk <phil@pcmonk.me>
 2020-07-30 13:33:29 -07:00
Philip Monk
a289615f8d
Merge branch 'philip/clay' (#3188) 
* philip/clay:
  clay: fix ph tests
  clay: remove debugging printfs
  clay: rewrite new protocol
  clay: refactor over-the-wire protocol

Signed-off-by: Philip Monk <phil@pcmonk.me>
 2020-07-30 13:30:16 -07:00
Philip Monk
3d1b7f2b35
clay: fix ph tests 2020-07-28 21:44:45 -07:00
Matilde Park
3ab634a788 release: urbit-os-v1.0.35 2020-07-29 00:16:05 -04:00
Logan Allen
77bdc63899 graph-store: null scry results are now [~ ~] 2020-07-28 12:32:18 -07:00
Logan Allen
7c3d608185 hood: update to %9 and start %graph-store 2020-07-28 12:24:55 -07:00
Logan Allen
043714752e hood: no longer start graph hooks for now 2020-07-28 12:21:30 -07:00
Logan Allen
738481ff71 graph-hooks: deleted for now until we can test them with a UI 2020-07-28 12:10:12 -07:00
Logan Allen
452d6ea4e1 graph-store: fully tested mark validation system 2020-07-28 12:03:09 -07:00
Liam Fitzgerald
f381b53e06 chat-hook: identify DMs correctly 2020-07-28 17:04:41 +10:00
Matilde Park
4d288f2e4e release: urbit-os-v1.0.34 2020-07-27 22:28:04 -04:00
Liam Fitzgerald
66e665d683 chat-hook: rerun fix on OTA 2020-07-28 12:16:48 +10:00
Liam Fitzgerald
ccf9296bab chat-hook: correctly poke chat-view on fix case and fix path 2020-07-28 12:14:27 +10:00
Matilde Park
e1c55c9f1f release: urbit-os-v1.0.33 2020-07-27 21:42:42 -04:00
matildepark
1382537357
Merge pull request #3199 from urbit/ixv/publish-groups-fixes 
publish: fix issues with new groups
 2020-07-27 21:27:33 -04:00
Philip Monk
e29b7ea70a
Merge pull request #3124 from lukechampine/wtts-axis 
hoon: fix wtts axis for simple wings
 2020-07-27 18:01:47 -07:00
Isaac Visintainer
ed3d9bda12 publish: set group tags for notebook write permissions 2020-07-27 18:41:30 -06:00
matildepark
333361edcb
Merge pull request #3170 from urbit/lf/chat-cli-groups-refactor 
chat-cli: revive chat creation and add group association
 2020-07-27 20:15:33 -04:00
matildepark
3d0e70dbf9
Merge pull request #3178 from urbit/la/fix-dms 
chat-hook: recreate all foreign dms as local dms
 2020-07-27 20:03:43 -04:00
Isaac Visintainer
cf57af3065 publish: don't let group-pull-hook go into an infinite loop 2020-07-27 17:49:47 -06:00
Isaac Visintainer
b3a7266440 publish: only delete group in unsubscribe action if the notebook is unmanaged 2020-07-27 17:49:47 -06:00
Logan Allen
a35749e2be graph-store: first validator mark builds 2020-07-27 12:56:30 -07:00
Logan Allen
325667f9ec Merge branch 'master' into la/graph-store 2020-07-27 12:10:22 -07:00
Logan Allen
a3cc668392 gen: add-graph uses empty graph 2020-07-27 12:09:19 -07:00
Fang
3315be4a24
Merge pull request #3197 from urbit/m/spur-timers 
gen: use spur in +timers
 2020-07-27 20:33:10 +02:00
Fang
89d8abf765
gen: use spur in +timers 
+en-beam expects a spur, reversing it for the final path rendering.
 2020-07-27 19:48:26 +02:00
Liam Fitzgerald
e819d2f197 chat-cli: address review comments 2020-07-27 11:15:57 +10:00
Philip Monk
0fe11da822
Merge remote-tracking branch 'origin/master' into philip/clay 2020-07-25 18:48:40 -07:00
Philip Monk
495a6cf004
clay: remove debugging printfs 2020-07-24 22:05:49 -07:00
Philip Monk
39052bdec0
Merge pull request #3185 from urbit/philip/kiln 
kiln: get germ for actual desk
 2020-07-24 21:20:53 -07:00
Philip Monk
1d0409c4c4
ames: fix lane discovery during some lane changes 
We used to not accept new indirect lanes if we already have a direct
lane.  This means that if Bob, with a publicly-accessible lane, changes
lanes (eg by restarting the process and getting a new port or changing
ip addresses), tries to talk to Alice, who is behind a NAT, then Bob
will try directly but fail (because Alice is behind a NAT), so he will
route the message through her galaxy.  This is good -- the message gets
to Alice.  However, Alice had a direct route to Bob's old lane, so she
will try to ack on that lane, which fails.  She will not time out this
lane because she doesn't know that Bob isn't getting the acks (acks
don't have their own acks).

The solution is that if Alice receives an indirect lane for Bob when she
already has a direct lane, she shouldn't ignore it.  If the lane is the
same as what she has, she shouldn't change anything (in particular, she
shouldn't mark it as indirect).  But if it's a new lane, she should
discard her old direct lane and use the new indirect lane.
 2020-07-24 20:41:48 -07:00
Philip Monk
5490a3cb73
kiln: get germ for actual desk 2020-07-24 16:37:15 -07:00
Logan Allen
49dc81f7d1 chat-hook: append messages to new dm 2020-07-24 15:50:21 -07:00
Logan Allen
1578103128 chat-hook: cleaned up and fixed app paths 2020-07-24 14:38:34 -07:00
Matilde Park
75acc5aeb5 Merge branch 'master' into release/next-userspace 2020-07-24 17:34:09 -04:00
Philip Monk
3a489e2f6f
Merge pull request #3156 from urbit/philip/moon 
moon: print key with correct life
 2020-07-24 14:13:57 -07:00
Logan Allen
d737cb28ae chat-hook: recreate all foreign dms as local dms 2020-07-24 13:59:15 -07:00
Philip Monk
51983e5480
clay: rewrite new protocol 
Use an explicit state machine to carefully manage pending downloads.
 2020-07-24 00:20:22 -07:00
matildepark
c5039c4c41
Merge pull request #3169 from urbit/lf/md-hook-fix 
metadata-store,hook: ignore bad paths in on-load
 2020-07-23 23:44:07 -04:00
Liam Fitzgerald
7ba585f719 chat-cli: revive chat creation and add group association 2020-07-24 13:17:48 +10:00
Liam Fitzgerald
5ef6637af0 metadata-store,hook: ignore bad paths in on-load 2020-07-24 11:47:12 +10:00
matildepark
3b253a332b
Merge pull request #3166 from urbit/mp/doubling-trouble 
file-server: fix base-hash trimming
 2020-07-23 19:19:29 -04:00