Commit Graph
214 Commits
Author SHA1 Message Date
Marshall Bowers 8602fa9ece Update tenses of doc comment summary lines (#4161)
This PR updates the tenses used by the summary line of doc comments to
match the [Rust API documentation
conventions](https://rust-lang.github.io/rfcs/1574-more-api-documentation-conventions.html#summary-sentence).

Specifically:

> The summary line should be written in third person singular present
indicative form. Basically, this means write ‘Returns’ instead of
‘Return’.

I'm sure there are plenty occurrences that I missed.

Release Notes:

- N/A
2024-01-19 11:18:50 -05:00
Conrad Irwin 9ed647ef72 Fine tune 2024-01-18 15:59:13 -07:00
Max Brunsfeld b41c6148e8 Store the impersonator id on access tokens created via ZED_IMPERSONATE (#4108)
* Use the impersonator id to prevent these tokens from counting against
the impersonated user when limiting the users' total of access tokens.
* When connecting using an access token with an impersonator add the
impersonator as a field to the tracing span that wraps the task for that
connection.
* Disallow impersonating users via the admin API token in production,
because when using the admin API token, we aren't able to identify the
impersonator.
2024-01-18 10:26:34 -08:00
Max Brunsfeld 791081ebff For impersonating access tokens, store impersonatee in the new column
This way, we don't need an index on both columns
2024-01-17 18:06:16 -08:00
Max BrunsfeldandMarshall 090aea60ec Store the impersonator id on access tokens created via ZED_IMPERSONATE
* Use the impersonator id to prevent these tokens from counting
  against the impersonated user when limiting the users' total
  of access tokens.
* When connecting using an access token with an impersonator
  add the impersonator as a field to the tracing span that wraps
  the task for that connection.
* Disallow impersonating users via the admin API token in production,
  because when using the admin API token, we aren't able to identify
  the impersonator.

Co-authored-by: Marshall <marshall@zed.dev>
2024-01-17 18:06:16 -08:00
Mikayla Maki 607f2a7ba5 Add typo detection to CI (#4107)
Adding the typos crate to our CI will take some doing, as we have
several tests which rely on typos in various ways (e.g. checking state
as the user types), but I thought I'd take a first stab at fixing what
it finds.

Release Notes:

- N/A
2024-01-17 17:13:47 -08:00
Mikayla Maki 325d7f44b1 Merge branch 'main' into fix-typos 2024-01-17 14:36:03 -08:00
Mikayla 0b43bd7c14 Fix typos detected by crate-ci/typos 2024-01-17 14:31:21 -08:00
Max Brunsfeld b82cde2e83 Rework db-seeding, so that it doesn't depend on a github auth token
Instead, admins are specified using a JSON file, 'admins.json'. This file is
gitignored. If it is not present, there is a default list of admins in
'admins.default.json'.
2024-01-17 13:28:58 -08:00
Marshall BowersandConrad 5f5679ddf8 Add more documentation to collab (#4095)
This PR adds more documentation to the `collab` crate.

Release Notes:

- N/A

---------

Co-authored-by: Conrad <conrad@zed.dev>
2024-01-17 13:38:12 -05:00
Conrad Irwin d97618364c Fix multiple mentions in one message 2024-01-13 21:53:22 -07:00
Mikayla 10f7f2c447 enviroment -> environment 2024-01-10 22:57:58 -08:00
Conrad Irwin 57296f3d42 Prototype cursor sharing (the inefficient way) (#3970)
Release Notes:

- Sync guest users' cursor positions
2024-01-09 22:21:24 -07:00
Conrad Irwin 13ae271a65 Implement live kit promotion/demotion 2024-01-09 16:10:12 -07:00
Conrad Irwin fb7516db13 Prototype cursor sharing (the inefficient way)
I think this will be a key user experience driver, but we do need to
find a way to enable it without widening our vector clocks.
2024-01-08 22:32:30 -07:00
Conrad Irwin 71ef720072 Allow adding write access to guests 2024-01-08 22:02:56 -07:00
Conrad Irwin 32f85b5bc6 guest acls (#3958)
- First pass of real access control
- Check user is host for host-broadcasted project messages
- Only allow read-write users to update buffers

[[PR Description]]

Release Notes:

- (Added|Fixed|Improved) ...
([#<public_issue_number_if_exists>](https://github.com/zed-industries/community/issues/<public_issue_number_if_exists>)).
2024-01-08 15:45:21 -07:00
Conrad Irwin c069f7bd61 Only allow read-write users to update buffers 2024-01-08 15:39:24 -07:00
Conrad Irwin da2a7bd1b2 Use "test" consistently 2024-01-08 14:07:18 -07:00
Max Brunsfeld 86f3d1efa1 Check user is host for host-broadcasted project messages 2024-01-08 12:04:59 -08:00
Conrad IrwinandMax 39c49bb1e3 First pass of real access control
Co-Authored-By: Max<max@zed.dev>
2024-01-08 12:23:40 -07:00
Conrad Irwin 6248af11a4 Merge branch 'main' into following-tests 2024-01-05 16:14:12 -07:00
Conrad IrwinandMax 70dd73f875 Port 1.00 following tests
Co-Authored-By: Max <max@zed.dev>
2024-01-05 15:55:33 -07:00
Conrad Irwin 2cf11423a3 Tidy up branch 2024-01-04 11:55:14 -07:00
Conrad Irwin 9674fc3189 Fix privilege escalation when guests invite people 2024-01-03 19:31:43 -07:00
Conrad Irwin c0686acc11 Prevent guests from screen-sharing, unmuting or screen sharing 2024-01-03 19:31:43 -07:00
Conrad Irwin fcdf0e8028 Track room participant role
(Also wire that through to project collaboration rules for now)
2024-01-03 19:30:32 -07:00
Conrad Irwin 5f8ac7c29b Plumbing to pass role for room participants 2024-01-03 19:30:32 -07:00
4ed92d64b7 Start work on read-only project access for channel guests
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 19:30:32 -07:00
Max BrunsfeldandMikayla 2e155121f8 Remove 2 suffix for collab, rope, settings, menu
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 12:29:16 -08:00
Max Brunsfeld 27b62e0898 Prevent moving a channel into its descendant 2023-12-01 11:41:38 -08:00
Max Brunsfeld 0bf3d36ae7 Allow moving channels to the root 2023-10-25 15:50:37 +02:00
Max Brunsfeld 7f767a024c Set up UI to allow dragging a channel to the root 2023-10-25 15:39:02 +02:00
e3864cb084 Remove logic for multiple channel parents
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Kyle <kyle@zed.dev>
Co-authored-by: Joseph <joseph@zed.dev>
2023-10-24 17:29:23 +02:00
Conrad Irwin 14590458c3 Fix set_channel_visibility for public channels 2023-10-24 10:55:10 +02:00
Conrad Irwin 416c049767 Merge branch 'main' into guest-exp 2023-10-23 17:47:21 +02:00
Max Brunsfeld e879c28daf Mark contact acceptance notifications as read automatically 2023-10-22 12:22:47 +02:00
Max Brunsfeld cee43e1a60 Mark chat mention notifications as read when viewing the message 2023-10-22 11:57:10 +02:00
Conrad Irwin de6e3d8e10 Fix notifications for membership changes too 2023-10-19 23:05:06 -06:00
Max Brunsfeld b938e8bbad Fix filtering when providing non-admins info about channel members 2023-10-19 12:54:47 -07:00
Max BrunsfeldandPiotr 9449d46b70 Create notifications for mentioned users
Co-authored-by: Piotr <piotr@zed.dev>
2023-10-19 10:52:40 -07:00
Conrad Irwin 331d334bae Refactor to avoid some (mostly hypothetical) races
Tidy up added code to reduce duplicity of X and X_internals.
2023-10-18 21:42:10 -06:00
Max Brunsfeld f0434bfebc Fix possibility of extra mention insertion on nonce collision 2023-10-18 18:04:56 -07:00
Max Brunsfeld 256ef99284 Merge branch 'main' into notifications 2023-10-18 17:20:04 -07:00
Max Brunsfeld d286c4441d Persist chat mentions 2023-10-18 16:56:03 -07:00
Conrad Irwin 8d9c9c16d4 Fix notifications on channel changes 2023-10-18 15:56:33 -06:00
Mikayla 77da29e4a9 Restrict DAG-related functionality, but retain infrastructure for implementing symlinks 2023-10-18 05:28:05 -07:00
Conrad Irwin 4d5b7e32a1 Sync Role as part of channels
Begin to fix guest notifications
2023-10-17 22:48:44 -06:00
Conrad Irwin c339356343 Allow guests to chat 2023-10-17 19:03:02 -06:00
Max Brunsfeld 1b89d99654 Start work on chat mentions 2023-10-17 17:59:42 -07:00