mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 03:25:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
6196 commits 774 branches 798 tags 283 MiB
Commit graph

6196 commits

This branch
This branch
All branches
Author SHA1 Message Date
Max Brunsfeld
1f0a9ce418 Proceed with share while project state uploads 
Co-authored-by: Antonio Scandurra <as-cii@zed.dev>
 2022-10-11 10:17:20 -07:00
Antonio Scandurra
a656047c15
Merge pull request #1700 from zed-industries/room 
Introduce call-based collaboration
 2022-10-11 17:40:44 +01:00
Antonio Scandurra
f26695ea8c 💄 2022-10-11 18:34:04 +02:00
Antonio Scandurra
ba6c5441c0 Always show invite link in contacts popover 2022-10-11 18:22:00 +02:00
Antonio Scandurra
f83de0a91c Respect contacts popover size 2022-10-11 17:30:17 +02:00
Antonio Scandurra
4c07a0782b Allow active call to be optional on workspace 
This prepares us for a future where the workspace is unaware of the
active call and doesn't require all tests to invoke `call::init`.
 2022-10-11 17:27:37 +02:00
Antonio Scandurra
ee2587d3e5 Fix integration tests 2022-10-11 17:09:54 +02:00
Antonio Scandurra
45d118f96f Decide whether to clip to visible bounds on a per-element basis 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-11 17:05:13 +02:00
Antonio Scandurra
eb711cde53 Polish styling of contacts popover 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-11 16:52:20 +02:00
Antonio Scandurra
4504b36c8f Show a different message when participant is active on unshared project 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-11 15:24:31 +02:00
Antonio Scandurra
29c3b81a0a Show prompt when closing last window while there's an active call 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-11 14:52:47 +02:00
Antonio Scandurra
feb17c29ec Show participant projects in contacts popover 2022-10-11 12:23:15 +02:00
Antonio Scandurra
8e7f96cebc Update contacts when automatically canceling calls 2022-10-11 11:55:15 +02:00
Antonio Scandurra
0a306808da Dismiss project shared notifications when a project was unshared 2022-10-11 11:44:31 +02:00
Antonio Scandurra
1d4bdfc4a1 Cancel calls automatically when caller hangs up or disconnects 2022-10-11 11:28:27 +02:00
Antonio Scandurra
9ec62d4c1f Foreground app when accepting calls and project shares 2022-10-11 11:03:49 +02:00
Antonio Scandurra
bf0a04ab50 Dismiss popover when contact finder is unfocused 2022-10-11 11:01:38 +02:00
Antonio Scandurra
bf488f2027 Show project root names when displaying incoming call notification 2022-10-11 10:59:36 +02:00
Nathan Sobo
e0b6b0df2a Rename Join button to Open, rework message slightly 2022-10-10 18:12:00 -06:00
Nathan Sobo
b8c2acf0f2 Show worktree root names when sharing additional projects on a call 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2022-10-10 17:56:03 -06:00
Kay Simmons
7528bf8f32
Merge pull request #1714 from zed-industries/fix-autoclose 
Don't autoclose brackets when `close` is false
 2022-10-10 15:35:47 -07:00
Nathan Sobo
425e540c9a Fix tests by providing close: true 2022-10-10 15:29:24 -06:00
Nathan Sobo
3ae96f2c6e Don't autoclose brackets when is false 2022-10-10 15:15:43 -06:00
Mikayla Maki
576581c20d
Merge pull request #1699 from zed-industries/page-up 
Implemented page up and page down for the editor
 2022-10-10 11:43:35 -07:00
Mikayla Maki
1d2495d57b Re-arrange how lines are set 2022-10-10 11:38:28 -07:00
Julia
7d6690335f
Merge pull request #1712 from zed-industries/dont-select-on-copy-by-default-terminal 
Don't select on copy by default in the terminal
 2022-10-10 14:15:20 -04:00
Julia
2f96a09c46 Don't select on copy by default in the terminal 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-10-10 13:48:56 -04:00
Antonio Scandurra
94c68d246e 📝 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-10 19:18:05 +02:00
Antonio Scandurra
8dc99d42ff Remove menu bar extra 2022-10-10 18:21:11 +02:00
Antonio Scandurra
04fcd18c75 Show contacts popover when clicking on menu bar extra 2022-10-10 16:30:02 +02:00
Antonio Scandurra
d9d99e5e04 Fix seed script 2022-10-10 16:05:22 +02:00
Antonio Scandurra
5f9cedad23 Add margin to picker in contacts popover 2022-10-10 16:05:09 +02:00
Antonio Scandurra
afaacba41f Merge remote-tracking branch 'origin/main' into room 2022-10-10 15:43:38 +02:00
Antonio Scandurra
3396a98978 💄 2022-10-10 14:41:18 +02:00
Antonio Scandurra
7cfe435e62 Style project shared notifications 2022-10-10 14:37:51 +02:00
Antonio Scandurra
9d990ae329 Show all room participants in titlebar 
...and allow following them into external projects.
 2022-10-10 14:20:45 +02:00
Antonio Scandurra
25ff5959fb Superimpose external location message on active view 2022-10-10 12:23:50 +02:00
Antonio Scandurra
d7bac3cea6 Style incoming call notification 2022-10-10 11:36:39 +02:00
Antonio Scandurra
79748803a9 Add leave button on active call header 2022-10-10 10:30:51 +02:00
Antonio Scandurra
6f4edf6df5 Move contact finder into contacts popover 2022-10-10 09:56:21 +02:00
Mikayla Maki
1af4b263b2 Implemented page up and page down for the editor 2022-10-09 19:19:40 -07:00
Antonio Scandurra
34cb742db1 Set current location after calling another user 2022-10-08 14:47:40 +02:00
Antonio Scandurra
59aaf4ce1b Call contact on enter 2022-10-08 14:43:41 +02:00
Antonio Scandurra
d14744d02f Show current user in active call 2022-10-08 14:38:17 +02:00
Max Brunsfeld
e96abf1429 0.59.0 2022-10-07 14:51:18 -07:00
Mikayla Maki
2758234e03
Merge pull request #1693 from zed-industries/terminal-tidying 
Terminal Tidying
 2022-10-07 13:11:43 -07:00
Max Brunsfeld
00188511cb
Merge pull request #1697 from zed-industries/css-highlighting-fixes 
Highlighting fixes
 2022-10-07 12:56:31 -07:00
Julia
4456e81163
Merge pull request #1696 from zed-industries/reset-diff-on-set-none-diff-base 
Reset buffer git diff when setting diff base to None
 2022-10-07 15:48:18 -04:00
Max Brunsfeld
6ecf870c66 Tweak SCREAMING_SNAKE_CASE regexes in highlight queries 2022-10-07 12:46:49 -07:00
Max Brunsfeld
95cb9ceac9 Collapse variant and type into the same color 2022-10-07 12:44:55 -07:00