yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,009 Commits 5 Branches 0 Tags
90d94deaa69e510c3016e18734cfd33fa8b06d34
Commit Graph
25009 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Brunsfeld c618af92cd Generalize notifications' actor id to entity id 
This way, we can retrieve channel invite notifications when
responding to the invites.
 2023-10-17 10:34:50 -07:00
Piotr Osiewicz 0113bca5ce workspace: Do not scan for .gitignore files if a .git directory is encountered along the way (#3135) 
Partially fixes zed-industries/community#575

This PR will see one more fix to the case I've spotted while working on
this: namely, if a project has several nested repositories, e.g for a
structure:
/a
/a/.git/
/a/.gitignore
/a/b/
/a/b/.git/
/a/b/.gitignore

/b/ should not account for a's .gitignore at all - which is sort of
similar to the fix in commit #c416fbb, but for the paths in the project.

The release note is kinda bad, I'll try to reword it too.
- [ ] Improve release note.
- [x] Address the same bug for project files.

Release Notes:
- Fixed .gitignore files beyond the first .git directory being respected
by the worktree (zed-industries/community#575).
 2023-10-17 18:56:03 +02:00
Antonio Scandurra 6446425359 WIP 2023-10-17 18:45:01 +02:00
Antonio Scandurra 6ab9a8cf9b WIP 2023-10-17 18:37:53 +02:00
Conrad Irwin 29b1d0ad13 Temporarily join public channels as a member 2023-10-17 10:29:43 -06:00
Antonio Scandurra ad948cf8b7 WIP 2023-10-17 18:28:58 +02:00
Conrad Irwin cab542114e Fix some tests 2023-10-17 10:15:20 -06:00
Max Brunsfeld f8e8340b84 Display invite response buttons inline in notification panel 2023-10-17 09:12:55 -07:00
Conrad Irwin 2da5b3d15e Fix channel test ordering 2023-10-17 10:01:31 -06:00
KCaverly 88254283cc implement initial concept of prompt chain 2023-10-17 11:58:45 -04:00
Conrad Irwin 9029a2807b Merge branch 'main' into guests 2023-10-17 09:54:17 -06:00
Conrad Irwin 7d67bc51fb Fix get_most_public_ancestor 2023-10-17 09:41:34 -06:00
Antonio Scandurra b492f9d4dc WIP 2023-10-17 13:32:49 +02:00
Antonio Scandurra 8d3e9b22f2 WIP 2023-10-17 12:46:50 +02:00
Mikayla dce496da2e Minor adjustments 2023-10-17 03:05:01 -07:00
Antonio Scandurra b4b5aa0296 Checkpoint 2023-10-17 11:35:48 +02:00
Antonio Scandurra d4a1940a56 Checkpoint 2023-10-17 11:31:13 +02:00
Mikayla Maki d39fa728ba Update IDs on interactive elements in LSP log viewer (#3133) 
This PR fixes a panic in the LSP log viewer when rendering the popover
UI. This did not ship to preview or stable, and so does not require a
release note.

Release Notes:

- N/A
 2023-10-17 02:27:37 -07:00
Mikayla Maki 17108d8c5b Adjust chat to allow channel admins to delete all messages (#3132) 
As it says on the tin

Release Notes:

- Changed chat permissions so that admins of a channel can delete any
message in a channel.
 2023-10-17 02:24:14 -07:00
Mikayla 4c91261cab Update IDs on interactive elements in LSP log viewer 2023-10-17 02:22:34 -07:00
Antonio Scandurra c684b8754d Checkpoint 2023-10-17 11:21:02 +02:00
Antonio Scandurra 5f8c949407 Checkpoint 2023-10-17 11:20:11 +02:00
Mikayla 942f910aee Adjust chat permisisons to allow deletion for channel admins 2023-10-17 02:16:17 -07:00
Antonio Scandurra 33d8caf69f Checkpoint 2023-10-17 11:08:48 +02:00
Antonio Scandurra 11511f9e5b Checkpoint 2023-10-17 10:14:22 +02:00
Antonio Scandurra f3e85df701 Merge branch 'gpui2-text-wrap' into gpui2 2023-10-17 09:03:16 +02:00
Antonio Scandurra 07dcf4ef24 Checkpoint 2023-10-17 09:03:01 +02:00
Antonio Scandurra b01dd45781 Checkpoint 2023-10-17 08:57:20 +02:00
Antonio Scandurra e87b18ea3e Checkpoint 2023-10-17 08:52:26 +02:00
Antonio Scandurra adf5ff1e0c Checkpoint 2023-10-17 08:32:33 +02:00
Nathan Sobo 1901b8552f Checkpoint 2023-10-17 08:26:12 +02:00
Conrad Irwin 968aa29b0c New entitlements: (#3118) 
Release Notes:

- Support Universal Links for Channel links
- Share credentials between Stable and Preview
 2023-10-16 22:10:14 -06:00
Nathan Sobo 8bad9a330e Checkpoint 2023-10-17 06:09:03 +02:00
Nathan Sobo 724f42a671 Include length in run to not use tuples 2023-10-17 05:15:00 +02:00
Nathan Sobo 9e16dffd70 Use cloned 2023-10-17 05:08:56 +02:00
Conrad Irwin 925986cc1f Provisioning profiles for stable and preview 2023-10-16 20:38:10 -06:00
Conrad Irwin 61d349956e Allow pasting ZED urls in the command palette in development 2023-10-16 20:03:44 -06:00
KCaverly f87d15ea57 progress on prompt chains 2023-10-16 18:47:10 -04:00
Conrad Irwin 74ffac5519 Ensure that invitees do not have permissions 
They have to accept the invite, (which joining the channel will do),
first.
 2023-10-16 16:24:10 -06:00
Conrad Irwin 2899a628c7 Make joining a channel as a guest always succeed 2023-10-16 15:14:13 -06:00
Marshall Bowers 1d1cfcd4fa Merge branch 'gpui2-ui' into gpui2 2023-10-16 16:54:40 -04:00
Marshall Bowers ccfacd3bcc Call is_toggled as a method 2023-10-16 15:55:43 -04:00
Max Brunsfeld 0b084d3b67 Add an empty state to the notification panel 2023-10-16 12:54:44 -07:00
Nate ButlerandKyle Caverly 281d4266c3 Update indexing icon 
Co-Authored-By: Kyle Caverly <22121886+KCaverly@users.noreply.github.com>
 2023-10-16 15:53:29 -04:00
Max Brunsfeld 8836f25dc4 Merge branch 'main' into notifications 2023-10-16 12:37:52 -07:00
Nathan Sobo 4b83b8bada Fix compile error 2023-10-16 20:19:04 +02:00
Nathan Sobo 49f73ce19c Checkpoint 2023-10-16 20:16:35 +02:00
Nathan Sobo 2904780c6a WIP 2023-10-16 20:15:41 +02:00
Nathan Sobo 458c7aa4f5 Get everything rendering again 2023-10-16 20:15:24 +02:00
Joseph T. Lyons 15e11762cc Fix telemetry-related crash on start up (#3131) 
Fixes (hopefully)
[#2136](https://github.com/zed-industries/community/issues/2136).

Release Notes:

- N/A
 2023-10-16 14:01:52 -04:00