Commit Graph

23316 Commits

Author SHA1 Message Date
matildepark
71f16fc32b
Merge pull request #4246 from urbit/mp/landscape/link-collection-icon
landscape: use 'collections' icon
2021-01-07 19:54:24 -05:00
matildepark
ef289cf282
Merge pull request #4210 from urbit/m/file-surfer-docs
file-server: inline docs for actions
2021-01-07 19:46:04 -05:00
matildepark
9c44c7eec5
Merge pull request #4225 from urbit/mp/landscape/allow-blank-ships
shipSearch: skip validating 'undefined'
2021-01-07 19:45:29 -05:00
matildepark
caa18af943
Merge pull request #4227 from urbit/mp/landscape/edit-mentioned-comments
landscape: edit comments include leading sig
2021-01-07 19:45:07 -05:00
matildepark
ca0cf64a54
Merge pull request #4243 from urbit/mp/landscape/upload-ios
landscape/useS3: restore behaviour on iOS
2021-01-07 19:44:45 -05:00
Matilde Park
c922fad2ff landscape: use 'collections' icon 2021-01-07 19:40:25 -05:00
Logan Allen
83036c0cc3 hark-group-hook: add type checking to vase sent to %hark-store, fix #4217 2021-01-07 14:03:03 -06:00
matildepark
7a41664ba1
Merge pull request #4238 from urbit/mp/term/you-dropped-this
term: use 'this' in notificationscount
2021-01-07 13:52:25 -05:00
Matilde Park
40473bf833 landscape/useS3: restore behaviour on ios 2021-01-07 13:28:21 -05:00
matildepark
0830c01024
Merge pull request #4230 from tylershuster/font-fallback
interface: add fallback fonts
2021-01-07 01:17:49 -05:00
matildepark
d441d826a0
Merge pull request #4144 from urbit/ga/qa-3
Ga/qa 3
2021-01-06 18:57:59 -05:00
Gavin Atkinson
c8c7621fdd launch: remove console.log 2021-01-06 15:35:58 -08:00
Gavin Atkinson
7363852f29 Landscape: Explaination of private vs public group in NewGroup 2021-01-06 15:36:18 -08:00
Gavin Atkinson
681d849265 landscape: Style chage on shipSearch tag 2021-01-06 15:36:09 -08:00
Gavin Atkinson
1fcd8076d7 landscape: spacing tweaks in groupSwitcher and sidebar 2021-01-06 15:35:58 -08:00
Gavin Atkinson
a726de34f7 leap: Resolves leap spacing 2021-01-06 15:35:58 -08:00
fang
2154444755
Merge pull request #4237 from urbit/m/spider-ids
spider: prefix thread ids with thread name
2021-01-07 00:22:04 +01:00
github-actions[bot]
5053b1f38b
Merge 85435e9a81 into release/next-js 2021-01-06 22:44:17 +00:00
Matilde Park
85435e9a81 release: urbit-os-v2.13 2021-01-06 17:38:34 -05:00
Matilde Park
d9be43ea6f Merge branch 'la/fix-4160' (#4234)
* origin/la/fix-4160:
  graph-delete thread: properly remove entry from metadata-store and hook

Signed-off-by: Matilde Park <matilde.park@gmail.com>
2021-01-06 17:28:14 -05:00
fang
69704c6a80
graph: make the join thread back off
Pushes the pathological case back a bit, but doesn't make it stop trying.
2021-01-06 23:22:54 +01:00
Matilde Park
38c89616fe term: use 'this' in notificationscount 2021-01-06 17:12:49 -05:00
Logan Allen
c99bf65d81 graph-delete thread: properly remove entry from metadata-store and hook 2021-01-06 15:32:16 -06:00
fang
6769e5cf5a
spider: prefix thread ids with thread name
For thread ids generated by spider itself, includes the name of the thread,
for convenient identification.
2021-01-06 22:20:51 +01:00
matildepark
1b96410b94
Merge pull request #4197 from tylershuster/hark-title
interface: document title
2021-01-06 16:10:37 -05:00
Tyler Brown Cifu Shuster
207c9accde interface: document title 2021-01-06 12:54:52 -08:00
L
2725f5b2c0
Merge pull request #4216 from urbit/la/fix-4164
4164: fixes display issue with jobs / gigs based on faulty hark state
2021-01-06 12:24:36 -06:00
matildepark
bb48d8b3c7
Merge pull request #4224 from urbit/mp/landscape/patp-punctuation
landscape: allow most patp punctation in tokenize
2021-01-06 13:06:10 -05:00
github-actions[bot]
78556de387
Merge dde827b2d3 into release/next-js 2021-01-06 17:36:52 +00:00
Matilde Park
dde827b2d3 Merge branch 'mp/meta/deploy' (#4222)
* origin/mp/meta/deploy:
  meta: update MAINTAINERS for auto-deploy
  meta: add CD development stream information

Signed-off-by: Matilde Park <matilde.park@gmail.com>
2021-01-06 12:36:14 -05:00
Matilde Park
3612b35e99 meta: update MAINTAINERS for auto-deploy 2021-01-06 12:34:39 -05:00
github-actions[bot]
31b7b26022
Merge 3204e3b44d into release/next-js 2021-01-06 16:50:09 +00:00
Jared Tobin
3204e3b44d
Merge pull request #4232 from urbit/jt/merge-workflow
Add a GitHub workflow that auto-merges master to release/next-js on push
2021-01-06 20:49:21 +04:00
Jared Tobin
169908a1a4
meta: add merge action 2021-01-06 20:25:44 +04:00
Jared Tobin
eae48b76c6
meta: stage a merge workflow
Adds a workflow that, on any push to master, will merge master to
release/next-js.

Presently targeted at another branch for testing.
2021-01-06 20:25:44 +04:00
Tyler Brown Cifu Shuster
1bc5d22412 interface: add fallback fonts 2021-01-05 22:05:36 -08:00
matildepark
5a502ae0f0
Merge pull request #4226 from tylershuster/overlay-state
interface: fixes bug where profile overlay would crash due to hook use
2021-01-05 22:16:46 -05:00
Tyler Brown Cifu Shuster
dbc452ff44 interface: fixes bug where profile overlay would crash due to hook use 2021-01-05 19:04:15 -08:00
Matilde Park
ad57a565dd Merge branch 'master' into release/next-js 2021-01-05 21:55:56 -05:00
matildepark
b5258fc916
glob.yml: remove on-PR globbing
Sorry for direct push, just a critical issue.
2021-01-05 21:55:26 -05:00
Matilde Park
bd1148e171 landscape: edit comments include leading sig
Fixes #4212.
2021-01-05 21:47:38 -05:00
Matilde Park
4573043168 shipSearch: skip validating 'undefined'
Fixes #4218.
2021-01-05 21:37:52 -05:00
Matilde Park
746fa57d15 landscape: allow most patp punctation in tokenize
Fixes #4183.
2021-01-05 21:14:41 -05:00
Matilde Park
822a378fb4 Merge branch 'release/next-js' into release/next-userspace 2021-01-05 20:06:37 -05:00
Matilde Park
3abfcbd4ea statusbar: change color on collapsed text 2021-01-05 19:54:50 -05:00
Matilde Park
9159d92927 meta: correct environment in status bar 2021-01-05 19:33:04 -05:00
Matilde Park
113aad6db5 meta: remove unnecessary variable 2021-01-05 19:24:51 -05:00
Matilde Park
2c0ecc6494 meta: amend environment variable access 2021-01-05 19:18:35 -05:00
Matilde Park
b21f5e0f06 statusbar: add conditional dev stream render 2021-01-05 18:54:43 -05:00
Matilde Park
f24b1bdeac Merge branch 'master' into release/next-js 2021-01-05 18:53:48 -05:00