Commit Graph
22259 Commits
Author SHA1 Message Date
Max Brunsfeld f2d36a47ae 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 31241f48be 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 19c1a54fea WIP 2023-10-17 18:45:01 +02:00
Antonio Scandurra 850d43c1e8 WIP 2023-10-17 18:37:53 +02:00
Conrad Irwin 5b39fc8123 Temporarily join public channels as a member 2023-10-17 10:29:43 -06:00
Antonio Scandurra ec368c8102 WIP 2023-10-17 18:28:58 +02:00
Conrad Irwin 3412becfc5 Fix some tests 2023-10-17 10:15:20 -06:00
Max Brunsfeld f225039d36 Display invite response buttons inline in notification panel 2023-10-17 09:12:55 -07:00
Conrad Irwin 2456c077f6 Fix channel test ordering 2023-10-17 10:01:31 -06:00
KCaverly ad92fe49c7 implement initial concept of prompt chain 2023-10-17 11:58:45 -04:00
Conrad Irwin 9cc55f895c Merge branch 'main' into guests 2023-10-17 09:54:17 -06:00
Conrad Irwin 851701cb6f Fix get_most_public_ancestor 2023-10-17 09:41:34 -06:00
Antonio Scandurra c04171abf6 WIP 2023-10-17 13:32:49 +02:00
Antonio Scandurra 488d08b43c WIP 2023-10-17 12:46:50 +02:00
Mikayla 465d726bd4 Minor adjustments 2023-10-17 03:05:01 -07:00
Antonio Scandurra 18abb068b1 Checkpoint 2023-10-17 11:35:48 +02:00
Antonio Scandurra cec5280013 Checkpoint 2023-10-17 11:31:13 +02:00
Mikayla Maki adabf0107f 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 fd03915f85 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 a81484f13f Update IDs on interactive elements in LSP log viewer 2023-10-17 02:22:34 -07:00
Antonio Scandurra c126ff10a7 Checkpoint 2023-10-17 11:21:02 +02:00
Antonio Scandurra bb348c1353 Checkpoint 2023-10-17 11:20:11 +02:00
Mikayla 162f625716 Adjust chat permisisons to allow deletion for channel admins 2023-10-17 02:16:17 -07:00
Antonio Scandurra fb1e7eef6b Checkpoint 2023-10-17 11:08:48 +02:00
Antonio Scandurra ac5b32c491 Checkpoint 2023-10-17 10:14:22 +02:00
Antonio Scandurra b526fc070d Merge branch 'gpui2-text-wrap' into gpui2 2023-10-17 09:03:16 +02:00
Antonio Scandurra 88ae4679d1 Checkpoint 2023-10-17 09:03:01 +02:00
Antonio Scandurra 9e7a579365 Checkpoint 2023-10-17 08:57:20 +02:00
Antonio Scandurra b040ae8d4d Checkpoint 2023-10-17 08:52:26 +02:00
Antonio Scandurra c6e20aed9b Checkpoint 2023-10-17 08:32:33 +02:00
Nathan Sobo 695a24d8a7 Checkpoint 2023-10-17 08:26:12 +02:00
Conrad Irwin b168bded1d 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 2472142532 Checkpoint 2023-10-17 06:09:03 +02:00
Nathan Sobo bf49f55c95 Include length in run to not use tuples 2023-10-17 05:15:00 +02:00
Nathan Sobo 0df1eb71cb Use cloned 2023-10-17 05:08:56 +02:00
Conrad Irwin c12f0d2697 Provisioning profiles for stable and preview 2023-10-16 20:38:10 -06:00
Conrad Irwin 6ffbc3a0f5 Allow pasting ZED urls in the command palette in development 2023-10-16 20:03:44 -06:00
KCaverly 500af6d775 progress on prompt chains 2023-10-16 18:47:10 -04:00
Conrad Irwin 2feb091961 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 4e7b35c917 Make joining a channel as a guest always succeed 2023-10-16 15:14:13 -06:00
Marshall Bowers c8b452d411 Merge branch 'gpui2-ui' into gpui2 2023-10-16 16:54:40 -04:00
Marshall Bowers 708034d1d3 Call is_toggled as a method 2023-10-16 15:55:43 -04:00
Max Brunsfeld c66385f0f9 Add an empty state to the notification panel 2023-10-16 12:54:44 -07:00
Nate ButlerandKyle Caverly 247728b723 Update indexing icon
Co-Authored-By: Kyle Caverly <22121886+KCaverly@users.noreply.github.com>
2023-10-16 15:53:29 -04:00
Max Brunsfeld 522b76e452 Merge branch 'main' into notifications 2023-10-16 12:37:52 -07:00
Nathan Sobo 3127c78bc7 Fix compile error 2023-10-16 20:19:04 +02:00
Nathan Sobo 938dd8b9ca Checkpoint 2023-10-16 20:16:35 +02:00
Nathan Sobo 847376cd8f WIP 2023-10-16 20:15:41 +02:00
Nathan Sobo 1a3650ef2a Get everything rendering again 2023-10-16 20:15:24 +02:00
Joseph T. Lyons 247cdb1e1a 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