Commit Graph

2791 Commits

Author SHA1 Message Date
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
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
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
Logan
d5b382e80a
Merge branch 'os1-rc' into foreign-metadata 2020-03-03 12:37:27 -08: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
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
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