urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-20 17:32:11 +03:00
Code Issues Packages Projects Releases Wiki Activity
17,969 Commits 768 Branches 10 Tags 215 MiB
566ea49651
Commit Graph

2920 Commits

Author SHA1 Message Date
Matilde Park
7ec75dcd62 link: rewrite metadata structure for consistency 2020-03-05 20:26:03 -05:00
Matilde Park
12cae5dda8 groups: sidebars polish, lining up vertically 2020-03-05 19:54:55 -05:00
Matilde Park
b539c3e24e groups: nav back to group details page from card 2020-03-05 19:54:37 -05:00
Matilde Park
3f95084eb5 groups: new buttons made consistent, dark mode 2020-03-05 19:54:12 -05:00
Matilde Park
9127b17b5c Merge branch 'master' into mp/os1/metadata-restructure 2020-03-05 19:16:37 -05:00
Matilde Park
9f45554047 chat: surface chat title in header 2020-03-05 19:15:49 -05:00
Logan Allen
2ce60e9f0d drum: start metadata-hook on OTA 2020-03-05 15:50:18 -08:00
Logan Allen
1a8dfccf22 publish: check if metadata-store has started before scrying it 2020-03-05 15:43:12 -08:00
Matilde Park
1dd78ef413 chat: associations data structure -> nested object 
Before this, it was a Map. But because we want to store multiple app
metadata stores -- and because maps are specialised objects -- this
commit restructures the store, reducers, and rewrites behaviour first.
 2020-03-05 18:39:06 -05:00
Logan Allen
b8987f6988 drum: start metadata-hook on OTA 2020-03-05 15:20:44 -08:00
ixv
3c039bce39
Merge pull request #2378 from urbit/m/link-meta 
link: metadata integration
 2020-03-05 15:09:59 -08:00
Fang
fd9c6cee5d
link fe: various ui/ux fixes based on feedback 
Also sneaks in a grammar correction for link-listen-hook documentation.
 2020-03-05 22:42:02 +01:00
Joe Bryan
67cef638c4 Merge branch 'master' into arvo-errors 
* master: (484 commits)
  king: Slight CLI cleanup and fix test build.
  king: Add command-line flags to configure HTTP and HTTPS ports.
  groups: reduce metadata updates, removal
  chat: reducer handles metadata removal
  groups: exclude group metadata from channels list
  groups: set and surface group name metadata
  groups: remove dummy 'share' flow, 'default' group
  contacts: rename, migrate '~contacts' to '~groups'
  sh/release: rename vere release tarballs
  vere: patch version bump (v0.10.3 -> v0.10.4.rc1) [ci skip]
  pills: updated brass and solid
  chat: pull room contacts from associated group
  chat: spell 'permanent' correctly
  eyre: remove padding from 'access' input
  chat: only delete metadata for a chat if you created it
  chat: settings inputs add borders on focus
  vere: disables gc on |mass in the daemon process
  chat: remove console.log from metadataAction
  chat: style fixes during review, use metadata-hook
  chat: edit description, color settings
  ...
 2020-03-05 11:56:49 -08:00
ixv
a16e40228d
Merge pull request #2399 from urbit/publish-metadata 
publish: integration with metadata
 2020-03-05 11:56:03 -08:00
Logan Allen
37820e5f51 publish: fill in title and description when importing, style 2020-03-05 11:44:34 -08:00
Fang
9a3f1be1b3
link fe: fix various display issues 2020-03-05 16:05:05 +01:00
Fang
6966aa0df3
link fe: support empty unmanaged groups 2020-03-05 15:53:44 +01:00
Fang
c71e5315e9
link fe: implement members & settings pages 2020-03-05 15:52:44 +01:00
Jared Tobin
2bf46d7d26
Merge branch 'mp/os1/metadata-remove' (#2401) 
* origin/mp/os1/metadata-remove:
  groups: reduce metadata updates, removal
  chat: reducer handles metadata removal

Signed-off-by: Jared Tobin <jared@tlon.io>
 2020-03-05 14:35:01 +04:00
Jared Tobin
9ef1744ac0
Merge branch 'mp/os1/groups/new' (#2398) 
* origin/mp/os1/groups/new:
  groups: exclude group metadata from channels list
  groups: set and surface group name metadata

Signed-off-by: Jared Tobin <jared@tlon.io>
 2020-03-05 14:34:26 +04:00
Jared Tobin
39055eeda2
Merge branch 'kh/configure-http-ports' (#2385) 
* origin/kh/configure-http-ports:
  king: Slight CLI cleanup and fix test build.
  king: Add command-line flags to configure HTTP and HTTPS ports.

Signed-off-by: Jared Tobin <jared@tlon.io>
 2020-03-05 14:31:56 +04:00
Benjamin Summers
237774adc5 king: Slight CLI cleanup and fix test build. 
Forgot to add `hidden` to http options. Without this, they show up on
the summary line in `king run --help`.
 2020-03-04 19:18:00 -08:00
Benjamin Summers
2dc97293cc king: Add command-line flags to configure HTTP and HTTPS ports. 2020-03-04 19:13:21 -08:00
Matilde Park
01c4909393 groups: reduce metadata updates, removal 2020-03-04 19:58:46 -05:00
Matilde Park
56d1630888 chat: reducer handles metadata removal 2020-03-04 19:45:02 -05:00
Matilde Park
ef386302bf invite search: proper padding, blending of group name 2020-03-04 18:57:31 -05:00
Logan Allen
3ace135c18 publish: integration with metadata 2020-03-04 15:56:48 -08:00
Matilde Park
cf7c7fd852 groups: exclude group metadata from channels list 2020-03-04 18:26:00 -05:00
Matilde Park
76c2f49054 groups: set and surface group name metadata 2020-03-04 18:20:32 -05:00
ixv
ab793f1f70
Merge pull request #2397 from urbit/mp/os1/contacts-groups 
contacts: prune unmanaged "share" flow, rename to "groups"
 2020-03-04 14:42:41 -08:00
Matilde Park
061deb94a8 groups: remove dummy 'share' flow, 'default' group 2020-03-04 16:13:19 -05:00
Matilde Park
aee2496588 contacts: rename, migrate '~contacts' to '~groups' 2020-03-04 16:13:12 -05:00
Fang
3e7f0dd9d8
link-view: support %delete and %invite actions 
%delete tries to be as local as possible in its impact.
%invite deals with un/managed branching for you.
 2020-03-04 22:11:54 +01:00
Fang
1f4e14f38a
link-view: include missing %create steps 
Expose the metadata and set up a permission set for the group.
 2020-03-04 22:06:24 +01:00
Fang
353f61cdd3
link: avoid duplicate entries when merging lists 
Otherwise we might store entries we had already heard previously.
 2020-03-04 21:22:04 +01:00
Fang
396d13ee1a
Merge branch 'os1-rc' of https://github.com/urbit/urbit into m/link-meta 2020-03-04 18:55:29 +01:00
Jared Tobin
bba91e7a96
vere: patch version bump (v0.10.3 -> v0.10.4.rc1) [ci skip] 2020-03-04 18:30:40 +04:00
Jared Tobin
a9ba8c56f0
Merge branch 'king-no-mas' (#2389) 
* origin/king-no-mas:
  vere: disables gc on |mass in the daemon process

Signed-off-by: Jared Tobin <jared@tlon.io>
 2020-03-04 18:02:45 +04:00
Jared Tobin
a1d489d977
Merge branch 'os1-rc' (#2365) 
* origin/os1-rc: (439 commits)
  pills: updated brass and solid
  chat: pull room contacts from associated group
  chat: spell 'permanent' correctly
  eyre: remove padding from 'access' input
  chat: only delete metadata for a chat if you created it
  chat: settings inputs add borders on focus
  chat: remove console.log from metadataAction
  chat: style fixes during review, use metadata-hook
  chat: edit description, color settings
  chat: add update-metadata to metadata reducer
  chat: revise api.js to match data structures
  metadata-json: add json to action parsers
  chat: construct settings page for metadata
  chat: correct bottom border on join links
  chat: copy shortcodes
  chat: linkify unmanaged chats
  metadata-hook: support group members other than host creating shared resources
  contacts: add bg-gray0 to root page
  chat + contact views: updated for style and to assert that group-path must be equal to app-path if there are ships in the members set
  contacts: changed color + copy of "add to group" button
  ...
 2020-03-04 15:48:05 +04:00
Logan
f457c0e568
Merge pull request #2394 from urbit/mp/os1/chat/contact-polling 
chat: pull room contacts from associated group
 2020-03-03 18:33:20 -08:00
Logan
8111328c92
Merge pull request #2393 from urbit/mp/os1/chat/permanent 
chat: spell 'permanent' correctly
 2020-03-03 18:32:26 -08:00
Logan
75a702c5b8
Merge pull request #2392 from urbit/mp/os1/launch-pad 
eyre: remove padding from 'access' input
 2020-03-03 18:31:09 -08:00
Matilde Park
92dbc4805e chat: pull room contacts from associated group 2020-03-03 21:02:45 -05:00
Matilde Park
2426343566 chat: spell 'permanent' correctly 2020-03-03 20:19:33 -05:00
Matilde Park
dd402e315f eyre: remove padding from 'access' input 2020-03-03 19:52:04 -05:00
Logan Allen
3210eac7e6 chat: only delete metadata for a chat if you created it 2020-03-03 16:10:54 -08:00
Joe Bryan
6322639436 vane: jet-hints all vanes for profiling 2020-03-03 14:17:42 -08:00
Joe Bryan
c94b5c25cb arvo: refines crash printfs 2020-03-03 14:17:42 -08:00
Matilde Park
2a9d570b6c chat: settings inputs add borders on focus 2020-03-03 17:13:39 -05:00
Joe Bryan
3e6f9d4698 vere: disables gc on |mass in the daemon process 2020-03-03 13:53:27 -08:00
Fang
9816ed69b3
link fe: remove unused "active" prop 2020-03-03 22:08:00 +01:00
Joe Bryan
066e994567 arvo: fix wire (and adapt old) for %vega reset notification 2020-03-03 12:58:56 -08:00
Logan
d5b382e80a
Merge branch 'os1-rc' into foreign-metadata 2020-03-03 12:37:27 -08:00
Fang
8568ecff9d
link fe: refactor route paths 
We change route paths back to their more-sane ordering, giving up
support for /longer/resource/paths.

The makeRoutePath utility constructs a route path for the given resource,
that optionally points to a specific page, or item, etc.

Also removes unused uuid utility.
 2020-03-03 21:35:40 +01:00
Fang
10842ecd92
link fe: remove references to chat & security 2020-03-03 18:31:08 +01:00
Fang
e524ffbdf6
link-view: use metadata-hook as advised in #2387 2020-03-03 16:47:07 +01:00
Fang
316cacf73b
link fe: support /join route 2020-03-03 16:44:28 +01:00
Fang
a72c74d74d
link fe: navigate to collection post-create 2020-03-03 16:26:42 +01:00
Fang
950023e448
link-view: in mark, use terms for +of cases 2020-03-03 16:26:08 +01:00
Jared Tobin
6f5b87f148
Merge branch 'ford-re-pit' (#2384) 
* origin/ford-re-pit:
  test: use %ford pit-shortcircuit instead of cache-priming
  ford: restores pit-shortcircuit, but only during boot

Signed-off-by: Jared Tobin <jared@tlon.io>
 2020-03-03 16:49:50 +04:00
Jared Tobin
be2c07d80d
Merge branch 'jt/urbit-large-log' (#2344) 
* origin/jt/urbit-large-log:
  build: remove urbit-large-log-limit derivation
  vere: use 40G mapsize only on macOS, 60G otherwise
  build: better vere label patch
  build: add configurePhase for urbit derivation
  build: label large-log-limit vere version
  Revert "Revert "Merge branch 'jt/urbit-large-log' (#2211)""

Signed-off-by: Jared Tobin <jared@tlon.io>
 2020-03-03 16:26:50 +04:00
Logan
ba76de8e7b
Merge pull request #2388 from urbit/mp/os1/chat/settings 
chat: settings — edit channel metadata, shortcode copying
 2020-03-02 20:31:05 -08:00
Matilde Park
92e8bba2c9 chat: remove console.log from metadataAction 2020-03-02 23:30:44 -05:00
Matilde Park
869f19c8f8 chat: style fixes during review, use metadata-hook 2020-03-02 23:27:07 -05:00
Matilde Park
e3e7c9e80c chat: edit description, color settings 2020-03-02 22:30:32 -05:00
Matilde Park
88b34c2ba7 chat: add update-metadata to metadata reducer 2020-03-02 22:30:32 -05:00
Matilde Park
4637587afd chat: revise api.js to match data structures 2020-03-02 22:30:32 -05:00
Matilde Park
15b5395f3c metadata-json: add json to action parsers 2020-03-02 22:30:32 -05:00
Matilde Park
eb2d914b23 chat: construct settings page for metadata 2020-03-02 22:30:26 -05:00
Matilde Park
ec089b4648 chat: correct bottom border on join links 2020-03-02 22:30:04 -05:00
Matilde Park
71d6937848 chat: copy shortcodes 2020-03-02 22:29:58 -05:00
Matilde Park
6464dc89ce chat: linkify unmanaged chats 2020-03-02 20:37:31 -05:00
Logan Allen
eb1561cfc4 metadata-hook: support group members other than host creating shared resources 2020-03-02 16:50:20 -08:00
Matilde Park
6dd84b467e contacts: add bg-gray0 to root page 2020-03-02 18:38:30 -05:00
Fang
a382f7d41b
Merge branch 'os1-rc' of https://github.com/urbit/urbit into m/link-meta 2020-03-03 00:16:41 +01:00
Fang
111333ec93
link: can create managed groups for new collections 
Just defers to contact-view for managed group creation.
 2020-03-03 00:12:05 +01:00
Joe Bryan
3444e20a92 test: use %ford pit-shortcircuit instead of cache-priming 2020-03-02 12:20:53 -08:00
Joe Bryan
18f199b2c3 ford: restores pit-shortcircuit, but only during boot 2020-03-02 12:20:21 -08:00
Logan
057d5996d1
Merge pull request #2379 from urbit/la-managed-chat-integration 
chat + contacts: integrate managed groups with metadata
 2020-03-02 11:27:59 -08:00
Logan Allen
b8614cc7d8 chat + contact views: updated for style and to assert that group-path must be equal to app-path if there are ships in the members set 2020-03-02 11:10:29 -08:00
Logan
f29bc2389d
Merge pull request #2381 from urbit/ed/qa-contacts-buttonfix 
contacts: changed color + copy of "add to group" button
 2020-03-02 10:10:02 -08:00
édouard
ebaecc3fd1 contacts: changed color + copy of "add to group" button 
I changed the copy and appearance (color only) of the "Invite" button previously located in Contacts, as it looked like a non-interactive label.
 2020-03-02 12:57:54 -05:00
Logan Allen
e66fd1cbd6 chat-view: send invites when creating chat and group already exists 2020-03-01 17:08:16 -08:00
Logan Allen
5915840237 contacts + chat: move permission-hook syncing for managed groups to contact-view so everyone can depend on it 2020-03-01 16:38:46 -08:00
Logan Allen
8b2398b3e2 contact-js: removed console.log 2020-03-01 15:49:31 -08:00
Logan Allen
bb0f56f17a chat + contacts: integrate managed groups with metadata 2020-03-01 15:40:49 -08:00
Jared Tobin
d72bddd66d
Merge branch 'reignore' (#2362) 
* origin/reignore:
  gitignore: re-add mystery lines [ci skip]
  gitattributes: export-ignore pkg/urbit/.gitignore [ci skip]
  gitignore: tweaks [ci skip]
  Revert "meta: remove herb, urbit .gitignore files [ci skip]"

Signed-off-by: Jared Tobin <jared@tlon.io>
 2020-03-01 23:40:18 +04:00
Jared Tobin
578593d347
vere: use 40G mapsize only on macOS, 60G otherwise 
Per discussion in urbit/urbit#2344, there doesn't seem to be any problem
in raising the default LMDB mapsize on non-mac operating systems.
 2020-03-01 22:58:20 +04:00
Fang
0539f3ca1f
link fe: metadata integration 
- finds resources & displays details using metadata-store
- supports creating new collections for groups
- supports creating new collections with new unmanaged group
- supports receiving invites for new (unmanaged) collections
 2020-03-01 02:10:35 +01:00
Fang
115fd1c14c
metadata-store: never crash fetching group metadata 
In order to track & respond to all group-related metadata, hooks may
want to subscribe to the metadata-store in response to group creation.
In that case it is possible that there are no entries for the group-path
in group-indices yet.

This makes us fall back to the empty set in case group-indices has no
entry for the group-path yet.
 2020-03-01 02:09:25 +01:00
Fang
0658367aaf
link hooks: discover resources with metadata-store 
Instead of assuming groups to be singular resources, now depends on
metadata-store to discover %link resources, and the groups associated
with those.
 2020-03-01 02:09:25 +01:00
Fang
068a8c98d6
metadata: add helper lib for common queries 2020-03-01 02:09:24 +01:00
Logan
3e235146ee
Merge pull request #2371 from litpub/bug/scroll-to-bottom-on-new-chat 
chat: Fixes #2347 pushes chat to bottom on <Chat> mount
 2020-02-29 16:35:38 -08:00
Logan
4ade3884bd
Merge pull request #2370 from urbit/mp/os1/dark 
os1: dark mode pass
 2020-02-29 16:34:44 -08:00
Jared Tobin
9c1d3090c9
Merge branch 'lukechampine/crypto-tests' (#2222) 
* lukechampine/crypto-tests:
  test: add bip32 vectors
  test: add scrypt vectors
  test: add hmac vectors
  test: add ed25519 vectors
  test: add expect arm
  test: add AES SIV mode vectors
  zuse: split sivb keys at correct offset
  test: add AES-CMAC vectors
  test: add AES CTR mode vectors
  test: add AES CBC mode vectors
  test: add AES ECB mode vectors
 2020-02-29 19:39:35 +04:00
Jared Tobin
70d099e969
gitattributes: export-ignore pkg/urbit/.gitignore [ci skip] 2020-02-29 18:05:17 +04:00
Jared Tobin
44c88cc645
gitignore: tweaks [ci skip] 
Removes the herb .gitignore previously removed in 7fab8be0dc, replacing
its contents with a cross-project ignore of Nix's 'result' symlink
artifact in the root .gitignore.

Moves some entries from the Vere .gitignore into the root file, as it
seems they can safely be assumed to be undesirable everywhere.

Also cleans up the root .gitignore, removing duplicate entries,
superfluous patterns, etc.
 2020-02-29 18:00:25 +04:00
Matilde Park
7535dd2e03 chat: display metadata titles in sidebar 2020-02-28 23:26:17 -05:00
Matilde Park
26ba8d3181 chat: initiate associations in store 2020-02-28 23:26:00 -05:00
Matilde Park
c3d14daff3 chat: add metadata-update reducer 2020-02-28 23:25:48 -05:00