Commit Graph
2567 Commits
Author SHA1 Message Date
Mikayla 23628aaf3f Position and style the channel editor correctly
Fix a bug where some channel updates would be lost
Add channel name sanitization before storing in the database
2023-08-08 12:46:13 -07:00
Mikayla e377b3dedc Fix a bug where channel invitations would show up in the channels section
Block non-members from reading channel information
WIP: Make sure Arc::make_mut() works
2023-08-08 11:47:13 -07:00
Nathan Sobo d03f2437e5 Remove window when closing workspace in test 2023-08-08 09:13:17 -06:00
Nathan Sobo 337db743e9 Remove TestAppContext::add_view
Instead, we now call this on window handles.
2023-08-07 22:46:48 -06:00
Nathan Sobo 8a187b0b25 Move window-related methods from TestAppContext to AnyWindowHandle 2023-08-07 20:23:04 -06:00
Nathan Sobo ce33bd19e5 Get compiling 2023-08-07 19:08:58 -06:00
Max Brunsfeld d51cac5ab2 Merge branch 'main' into collab-panel 2023-08-07 11:50:40 -07:00
Nathan Sobo d1e01ba625 WIP 2023-08-06 12:45:31 -06:00
Max BrunsfeldandMikayla e93fc31525 Fix joining descendant channels, style channel invites
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-08-04 16:21:43 -07:00
Max BrunsfeldandMikayla acce8aba4a Flesh out channel member management
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-08-04 14:12:08 -07:00
Max Brunsfeld f89a7be963 Don't expose channel admin actions in UI if user isn't admin 2023-08-04 10:24:46 -07:00
Max Brunsfeld c0c1398223 Add test assertion where user is not admin of channel 2023-08-04 09:51:37 -07:00
Max Brunsfeld 9bc96ab5c5 Start work on exposing which channels the user has admin rights to 2023-08-03 18:31:00 -07:00
Max Brunsfeld aba42b1b60 Implement channel member removal, permission check for member retrieval 2023-08-03 18:03:40 -07:00
Nathan Sobo 1d54e24f21 WIP: Return WindowHandle<V: View> from AppContext::add_window (#2820)
Instead of returning a usize for the window id, I'm instead returning a
`WindowHandle<V: View>` where `V` is the type of the window's root view.
@as-cii helped me with a cool technique using generic associated types
where methods on `WindowHandle` can return either T or Option<T>
depending on the `BorrowWindowContext::Result` associated type.

Some example usage...

```rs
let window = cx.add_window(|cx| MyView::new(cx));
let my_view = window.root(cx); // If cx is TestAppContext, returns MyView. Otherwise returns Option<MyView>, because the window could be closed.
```


This isn't insanely beneficial on its own, but I think it will help
clean up our testing story. I'm planning on making `window` more useful
in tests for laying out elements, etc.

- [x] Rework tests that call `add_window` 😅 to expect only a window in
return.
- [x] Get tests passing
- [x] 🚬  test
2023-08-03 18:45:51 -06:00
Nathan Sobo 40f28de681 Don't refcount window handles 2023-08-03 17:11:47 -06:00
Max BrunsfeldandMikayla 20f804d1b9 Implement basic channel member management UI
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-08-03 14:49:01 -07:00
Mikayla Maki dbcdcd43c5 simplify server implementation 2023-08-03 13:27:00 -07:00
Mikayla Maki cca30c8481 Add the ability to jump between channels while in a channel 2023-08-02 17:13:09 -07:00
Max Brunsfeld 71a1a3904f wip 2023-08-02 15:52:56 -07:00
Max BrunsfeldandMikayla cd2a7330a2 Restore seeding of random GH users in seed-db
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-08-02 15:45:22 -07:00
Max Brunsfeldandmikayla 45c92ae784 Start work on rendering channel participants in collab panel
Co-authored-by: mikayla <mikayla@zed.dev>
2023-08-02 15:09:37 -07:00
Nathan Sobo 680c0185e4 Get tests compiling returning WindowHandle<V: View> from add_window 2023-08-02 14:05:03 -06:00
Max Brunsfeld e12e58c413 WIP 2023-08-02 12:15:06 -07:00
Mikayla Maki a4055fd370 WIP: Broadcast room updates to channel members 2023-08-02 09:21:30 -07:00
Max Brunsfeld ec8d26cf15 Merge branch 'main' into collab-panel 2023-08-02 09:20:53 -07:00
Max Brunsfeld a318f5465e Fix warnings surfaced in Rust 1.71 2023-08-02 09:19:23 -07:00
Mikayla Maki 84d7733596 Fix a few bugs in how channels are moved around 2023-08-01 18:42:14 -07:00
Mikayla Makiandmax a2a1d23b74 Add subchannel creation
co-authored-by: max <max@zed.dev>
2023-08-01 16:48:11 -07:00
Mikayla Makiandmax c9a92422bd Add remove channel method
Move test client fields into appstate and fix tests

Co-authored-by: max <max@zed.dev>
2023-08-01 16:06:27 -07:00
Mikayla Maki 824279d459 WIP: Add channel creation to panel UI 2023-08-01 13:22:06 -07:00
Max Brunsfeld 87da14ff8c Start work on displaying channels and invites in collab panel 2023-07-31 18:00:14 -07:00
Mikayla Makiandmax a7fd3f4037 Add room creation from channel join
co-authored-by: max <max@zed.dev>
2023-07-31 16:54:12 -07:00
Mikayla Makiandmax f63051148b Add ability to join a room from a channel ID
co-authored-by: max <max@zed.dev>
2023-07-31 16:53:57 -07:00
Max BrunsfeldandMikayla 0886ea1dcb Set up basic RPC for managing channels
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-07-28 17:05:56 -07:00
Max BrunsfeldandMikayla 29cb60e740 Get DB channels query working with postgres
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-07-28 14:56:02 -07:00
Mikayla Maki dade666d51 implement recursive channel query 2023-07-28 13:24:43 -07:00
Mikayla Maki a1af046130 Add channel_tests.rs 2023-07-28 13:24:43 -07:00
Mikayla Maki e7a7350529 WIP: Channel CRUD 2023-07-28 13:24:43 -07:00
Max Brunsfeld 3881f754ce WIP 2023-07-28 13:24:43 -07:00
Alex ViscreanuandMikayla Maki ef7952c045 feat(workspace): allow alternative actions to open files and symbols in split
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
2023-07-14 21:49:15 +02:00
Joseph T. LyonsandMax Brunsfeld b3f5408ed4 Add call events
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2023-07-11 13:58:55 -04:00
Piotr Osiewicz fc1830dd9b chore: Replace lazy_static Mutex with const. (#2693)
Mutex::new() is const-stable as of Rust 1.63.

Release Notes:
- N/A
2023-07-07 15:07:12 +02:00
Kirill Bulatov 4e5a620d1c Remove redundant hint kind checks in tests 2023-07-06 23:27:25 +03:00
Mikayla Maki 0a81688832 Move audio dependency to dev 2023-07-05 12:15:56 -07:00
Mikayla Maki bcad49983c Remove spurious audio depedency 2023-07-05 12:05:16 -07:00
Mikayla Maki 4876ac6d52 collab 0.16.0 2023-07-05 11:47:17 -07:00
Mikayla Maki 0710451b93 Add first-pass sound support to Zed 2023-07-03 13:30:04 -07:00
Mikayla Maki 99894d922c Add basic sound handling infrastructure 2023-06-30 16:10:49 -07:00
Mikayla Maki 91f2a5401c fmt and update dependency 2023-06-29 17:49:42 -07:00