Commit Graph

2694 Commits

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