20405 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
matildepark	c2cf17c417	Merge pull request #3394 from urbit/mp/chat/hide-avatars-input ... chat: hideAvatars hides chat input avatar	2020-08-27 20:47:58 -04:00
Tyler Brown Cifu Shuster	b51046d258	chat: only show other participant in dms	2020-08-27 16:17:25 -07:00
Logan Allen	c9bfe272e3	interface: added graph API and stubbed out graph scries	2020-08-27 17:34:46 -05: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	a4b945b4a3	chat: hideAvatars hides chat input avatar ... Fixes #3386.	2020-08-27 16:42:02 -04:00
Matilde Park	f2eeb7a14f	chat: break up inline code ... Doesn't affect %code messages. Fixes #3358.	2020-08-27 15:49:48 -04:00
Matilde Park	c08509535f	publish: fix unread counts for long titles ... Fixes #3283.	2020-08-27 15:35:20 -04:00
Matilde Park	3c0dc59747	profile: log out of all sessions ... This was hidden in urbit-os-v1.0.44 until we could ensure it actually logged you out of all sessions. It requires a hidden input to function, so it's added here. Fixes #2649.	2020-08-27 15:11:03 -04:00
Matilde Park	13b5851b71	Merge branch 'master' into release/next-userspace	2020-08-27 14:50:27 -04:00
Logan Allen	20c94d34fe	interface: added graph reducer, store state, and subscription	2020-08-27 11:46:46 -05:00
Fang	723548ba02	Merge pull request #3389 from urbit/m/server-json-response ... lib: take json as argument to /lib/server's +json-response	2020-08-27 17:31:37 +02: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	b0577b9a33	soto: make background transparent ... It worked for images, but not colours.	2020-08-26 21:00:54 -04:00
Matilde Park	50b2794ef6	links: fix font setting for hidden nicknames	2020-08-26 20:58:10 -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
Matilde Park	dd82f3861a	Merge branch 'lf/settings-screen' (#3236) ... * origin/lf/settings-screen: (25 commits) interface: fix setting background color interface/api: fix s3 calls for setting endpoint, keys interface/profile: hide log out of all header interface/profile: hide 'log out of all' profile: address comments profile: add identity form publish,links: respect hide avatar and nickname settings StatusBar: update for new design chat: support hideAvatars and hideNicknames launch: add background to base hash StatusBar: update for profile + omnibox interface: breakpoints in px settings: refactor for line limit settings: add inline image upload settings: add drag and drop component to reorder tiles groups,dojo: fix transparencies clock: fix transparency on no location profile: refactor layout interface: change indigo breakpoints to old queries interface: handle transparency correctly ... Signed-off-by: Matilde Park <matilde.park@sunshinegardens.org>	2020-08-26 20:35:08 -04:00
Matilde Park	af44b8fdc8	interface: fix setting background color ... A semicolon.	2020-08-26 20:33:53 -04:00
Matilde Park	b540ad5c4e	interface/api: fix s3 calls for setting endpoint, keys	2020-08-26 20:29:56 -04:00
Matilde Park	84a832d6e7	interface/profile: hide log out of all header ... Ibid.	2020-08-26 20:25:18 -04:00
Matilde Park	ff40759e82	interface/profile: hide 'log out of all' ... Non-functional. Requires 'all' in post body, and hasn't been tested.	2020-08-26 20:24:48 -04:00
Liam Fitzgerald	e63c050a6e	profile: address comments	2020-08-27 10:05:29 +10:00
matildepark	5c380a46a5	Merge pull request #3377 from urbit/mp/chat/break-word ... chat: break overflowing one-word messages	2020-08-26 19:44:58 -04:00
Liam Fitzgerald	6085752f21	profile: add identity form	2020-08-27 09:16:26 +10:00
Liam Fitzgerald	e9c6322ff4	publish,links: respect hide avatar and nickname settings	2020-08-27 09:15:05 +10: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
matildepark	63321ca176	Merge pull request #3372 from urbit/mp/chat/fix-joining ... chat: restore join functionality	2020-08-25 22:14:04 -04:00
Matilde Park	e636611ccc	Merge branch 'release/next-userspace' into mp/chat/fix-joining	2020-08-25 21:57:51 -04:00
Matilde Park	ed17475f12	chat: break overflowing one-word messages ... Fixes #3358.	2020-08-25 21:34:51 -04: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	ed01376b74	Merge pull request #3312 from tylershuster/reactive-head ... interface: made head reactive	2020-08-25 10:43:54 -04:00
Tyler Brown Cifu Shuster	3ad6c95329	interface: made head reactive	2020-08-24 21:14:23 -07:00
Matilde Park	c5b71e55c1	chat: restore join functionality ... Fixes #3371.	2020-08-24 23:10:56 -04:00
Matilde Park	f9f6eb5d1a	Merge branch 'lf/publish-indigo' (#3337) ... * origin/lf/publish-indigo: (22 commits) publish: send read action if content does not overflow interface: fix missing import of ErrorBoundary publish: fix foreign notebooks publish: comment author correct interface: indigo Error publish: link preview correctly publish: loosen property access publish: address comments publish: style 'about' field for dark mode groupView: 'no ships are banned' styling publish: allow creation of unmanaged notebooks publish: adding dark mode declarations publish: make post submit button primary publish: improve responsivity on mobile publish: address review comments publish: remove extraneous files from merge publish: cleanup imports publish: finish rewrite publish: begin rewrite publish: rewrite note previews in indigo ... Signed-off-by: Matilde Park <matilde.park@sunshinegardens.org>	2020-08-24 23:01:18 -04:00
Liam Fitzgerald	f92866a83f	publish: send read action if content does not overflow	2020-08-25 12:50:55 +10:00
Matilde Park	92610b3d57	Merge branch 'lf/publish-indigo' of github.com:urbit/urbit into lf/publish-indigo	2020-08-24 21:52:12 -04:00
Matilde Park	ed053ed0ed	interface: fix missing import of ErrorBoundary	2020-08-24 21:51:39 -04:00
Liam Fitzgerald	5e0f6470a2	publish: fix foreign notebooks	2020-08-25 11:47:46 +10:00
Liam Fitzgerald	21a64076e2	publish: comment author correct	2020-08-25 11:47:11 +10:00
Liam Fitzgerald	17e8add450	interface: indigo Error	2020-08-25 11:46:12 +10:00
Liam Fitzgerald	1150c750cf	publish: link preview correctly	2020-08-25 11:33:29 +10:00
Liam Fitzgerald	766fd8411b	publish: loosen property access	2020-08-25 11:29:56 +10:00
Liam Fitzgerald	487377bd19	publish: address comments	2020-08-25 10:50:09 +10:00