Commit Graph
226 Commits
Author SHA1 Message Date
Mikayla Maki ea39983f78 Removed old experiments settings and staff mode flag, added new StaffMode global that is set based on the webserver's staff bit 2023-01-27 15:43:12 -08:00
Mikayla Maki d060114f00 Added complete scripts for generating third party license files 2023-01-23 12:47:12 -08:00
JuliaandNate Butler 2b1118f597 Add dismiss buffer search button & fix some faulty icon button styling
Co-Authored-By: Nate Butler <nate@zed.dev>
2023-01-01 23:50:46 -05:00
Mikayla Maki a1f273278b Added user notifications 2022-12-03 16:06:02 -08:00
JuliaandKay Simmons 847376a4f5 Start dragging project panel entries
Co-Authored-By: Kay Simmons <kay@zed.dev>
2022-11-07 17:00:01 -05:00
Antonio Scandurra 0b231e58fd Show placeholder text for pickers 2022-11-04 10:18:47 +01:00
Antonio Scandurra 08b84416d2 Avoid showing "No matches" when query is empty if there are no matches 2022-11-04 10:18:47 +01:00
Mikayla Maki ea9b009a22 Fixed bug with cut entry active states 2022-10-31 09:55:52 -07:00
Mikayla Maki 552ebc0f29 Implemented direct styling for ignored and cut project panel entries 2022-10-28 10:45:45 -07:00
Antonio Scandurra 56a66b348d Use the same background color as the editor for SharedScreen 2022-10-26 08:33:32 +02:00
K Simmons cfde3e348c Add pane splitting by dragged item. Works, but the overlay doesn't clear quite right 2022-10-24 23:31:58 -07:00
Antonio Scandurra fb7a92242b Merge pull request #1793 from zed-industries/screen-sharing
Introduce screen-sharing
2022-10-24 16:53:05 +01:00
Antonio Scandurra f99d70500c Allow opening shared screen via the contacts popover 2022-10-24 10:47:47 +02:00
Nate ButlerandMikayla Maki b015761131 WIP Re-case internal and experiment theme folders
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
2022-10-21 13:04:24 -04:00
Antonio Scandurra 7e411ae098 Merge branch 'main' into screen-sharing
# Conflicts:
#	crates/collab/src/integration_tests.rs
#	crates/collab/src/main.rs
#	styles/src/styleTree/workspace.ts
2022-10-21 14:29:45 +02:00
K Simmons e3809c267d flattened layers and elevations 2022-10-19 13:02:51 -07:00
Antonio Scandurra 773f569385 Add control to toggle screen-sharing 2022-10-19 10:19:20 +02:00
K Simmons b0ddbeb0ad Merge branch 'main' into elevations 2022-10-18 12:47:15 -07:00
Nathan SoboandMax Brunsfeld bc03592912 Only invalidate parent view on click/hover if we read that state when rendering
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-10-14 18:09:15 -06:00
Nate ButlerandKay Simmons 5708879b5a Style elevations & update styleTrees
Also rename `info` -> `accent`

Co-Authored-By: Kay Simmons <3323631+Kethku@users.noreply.github.com>
2022-10-11 17:38:28 -04:00
Max Brunsfeld 638e9f9477 Merge pull request #1715 from zed-industries/scrollbars
Add scrollbars
2022-10-11 13:34:15 -07:00
Max Brunsfeld acc85ad03c Impose a minimum height on the scrollbar 2022-10-11 13:18:33 -07:00
Antonio Scandurra ba6c5441c0 Always show invite link in contacts popover 2022-10-11 18:22:00 +02:00
Antonio Scandurra feb17c29ec Show participant projects in contacts popover 2022-10-11 12:23:15 +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 SoboandAntonio Scandurra 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
Max Brunsfeld eedcc585af Add scrollbars to editors 2022-10-10 16:20:47 -07:00
Antonio Scandurra afaacba41f Merge remote-tracking branch 'origin/main' into room 2022-10-10 15:43:38 +02:00
Antonio Scandurra 7cfe435e62 Style project shared notifications 2022-10-10 14:37:51 +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
Antonio Scandurra d14744d02f Show current user in active call 2022-10-08 14:38:17 +02:00
Antonio ScandurraandNathan Sobo f9fb3f78b2 WIP: Render active call in contacts popover
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-07 17:01:48 +02:00
Antonio Scandurra 4aaf3df8c7 Show contact status 2022-10-07 13:56:28 +02:00
Antonio Scandurra c43956d70a Move contacts panel styles into contacts popover 2022-10-06 14:07:21 +02:00
Antonio Scandurra 40163da679 Move contacts panel features into collab_ui 2022-10-06 14:00:14 +02:00
Antonio Scandurra 383c21046f Set room location when active workspace changes 2022-10-05 15:03:40 +02:00
Antonio Scandurra debedaf004 Show notification when a new project is shared and allow joining it 2022-10-04 16:55:41 +02:00
Antonio Scandurra 57930cb88a Show Share button for unshared projects when inside of a room 2022-10-04 15:56:20 +02:00
Antonio Scandurra de917c4678 Use a different style for inactive participants 2022-10-04 15:06:20 +02:00
Mikayla Maki 5769cdc354 made git diff rendering respect line wrap 2022-10-02 18:00:13 -07:00
Mikayla Maki 9fe6a5e83e made git stuff slightly more themable 2022-09-29 13:16:02 -04:00
8d2de1074b Pull git indicator colors out of theme
Co-Authored-By: Kay Simmons <kay@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
Nathan SoboandAntonio Scandurra 815cf44647 Rename AddParticipantPopover to ContactsPopover
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2022-09-28 09:10:01 -06:00
Nathan SoboandAntonio Scandurra f5b2d56efd Remove contacts menu bar extra
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2022-09-28 09:06:28 -06:00
Antonio Scandurra 0db6eb2fb8 Show add participant popover on click 2022-09-28 11:33:38 +02:00
Antonio Scandurra 5a3a85b2c8 Introduce a + button in the titlebar 2022-09-28 11:33:38 +02:00
K Simmons 962f087ac2 promote variant to its own styleset 2022-09-22 13:29:19 -07:00