Commit Graph

2716 Commits

Author SHA1 Message Date
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
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
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
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
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
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