yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,175 Commits 5 Branches 0 Tags
fbda4f862a2fb03b854636b17bd04be3db3d94de
Commit Graph
39175 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph T. Lyons faa5932dbc Merge pull request #1829 from zed-industries/add-release-channel-information-to-telemetry-events 
Add release channel information to telemetry events
 2022-10-31 16:42:28 -04:00
Max Brunsfeld 3f81ecf528 Generate themes before compiling the 'assets' crate 2022-10-31 13:25:12 -07:00
Max Brunsfeld a598e0f62a Merge pull request #1839 from zed-industries/contact-list-project-color 
Don't use 'on' background color for projects in the contact list
 2022-10-31 12:39:17 -07:00
Max Brunsfeld 1f75ab60c4 Don't use 'on' color for projects in the contact list 2022-10-31 12:28:25 -07:00
Julia 93d7f4d262 Merge pull request #1800 from zed-industries/go-to-diff-hunk 
Add action to go to next/previous git diff in editor
 2022-10-31 14:38:52 -04:00
Julia bc601527b8 Layout git gutters inclusively 2022-10-31 14:35:42 -04:00
Max Brunsfeld 7bb6aeb154 Merge pull request #1838 from zed-industries/tab-panic 
Fix panic when hitting tab at the beginning of a line with mixed tab/…
 2022-10-31 10:55:48 -07:00
Max Brunsfeld 4df8c58951 Fix panic when hitting tab at the beginning of a line with mixed tab/space indent 2022-10-31 10:51:20 -07:00
Mikayla Maki 21d7ffe3f0 Adds a little spacing between the share button and the screenshare icon 2022-10-31 10:19:06 -07:00
Mikayla Maki ea32304c8c Remove annoyoing debug 2022-10-31 10:02:17 -07:00
Mikayla Maki b9dbd4a87d Fixed bug with cut entry active states 2022-10-31 09:55:52 -07:00
Nate Butler 51e29a1129 Update ignored, cut entry styles in the project panel 2022-10-31 10:30:58 -04:00
Julia e45632083a Slightly expand region hunk layout checks for folds 2022-10-28 19:05:29 -04:00
Julia 985758426d Add test for go-to hunk and fix discovered bugs 2022-10-28 15:08:13 -04:00
JuliaandKay Simmons a7aad379e0 WIP start setting up test infrastructure for editor diff actions 
Co-Authored-By: Kay Simmons <kay@zed.dev>
 2022-10-28 15:08:13 -04:00
JuliaandKay Simmons 412c77460e Add action to go to next/previous git diff in editor 
Co-Authored-By: Kay Simmons <kay@zed.dev>
 2022-10-28 15:08:13 -04:00
Mikayla Maki 080b825e67 Merge pull request #1833 from zed-industries/add-channel-to-db 
Added channel info to database directories
 2022-10-28 11:54:46 -07:00
Mikayla Maki 6ddef58248 Added channel to database directories 2022-10-28 11:50:26 -07:00
Mikayla Maki d6a47ad76f Merge pull request #1832 from zed-industries/upgrade-migration-lib 
Upgraded migration library to remove panic
 2022-10-28 11:41:31 -07:00
Mikayla Maki f7e2e1c0ee Upgraded migration library to remove panic 2022-10-28 11:36:41 -07:00
Mikayla Maki e368083092 Removed stray test file 2022-10-28 10:48:54 -07:00
Mikayla Maki e052719862 Implemented direct styling for ignored and cut project panel entries 2022-10-28 10:45:45 -07:00
Nate Butler 60b445cb20 Update icons 
- `x_mark_thin` combined into `x_mark`
- updated many icons
- remove unused icons
 2022-10-28 12:59:05 -04:00
Max Brunsfeld 38cda11c1f Merge pull request #1830 from zed-industries/auto-update-filename 
Make auto-update handle an app bundle name other than 'Zed.app'
 2022-10-27 16:47:34 -07:00
Max Brunsfeld f0bacf5d49 Avoid hard-coding app bundle filename in auto-updater 2022-10-27 16:44:07 -07:00
Max BrunsfeldandJoseph Lyons e75e8de169 Avoid posting in Discord about preview releases (for now) 
Co-authored-by: Joseph Lyons <joseph@zed.dev>
 2022-10-27 15:43:00 -07:00
Joseph T LyonsandMax Brunsfeld dfcffd78e1 Make release_channel optional to fix tests 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-10-27 18:06:34 -04:00
Kay Simmons ba75dd1589 Merge pull request #1827 from zed-industries/fix-keymap-resolution-fallback 
Keymap resolution fallbacks
 2022-10-27 13:50:38 -07:00
K Simmons 915bc6afe2 remove unnecessary comment 2022-10-27 13:29:57 -07:00
K Simmons 395e073298 upgrade existing test to match new expected behavior 2022-10-27 13:28:49 -07:00
Max Brunsfeld a8b41b6bc5 Add livekit to the Procfile, update the README 2022-10-27 13:24:35 -07:00
Joseph T Lyons 4139e7f003 Rename all keys, in telemetry events, to be consistent with Mixpanels conventions 2022-10-27 16:19:21 -04:00
Max Brunsfeld 42b7360811 Run CI when pushing to release branches (e.g. 'v0.62.x') 2022-10-27 13:03:35 -07:00
Joseph T Lyons 7aa769c8a5 Add missing struct field 
This must've gotten lost on the merging of main into this branch
 2022-10-27 15:59:22 -04:00
Joseph T Lyons 51c3c38338 Merge branch 'main' into add-release-channel-information-to-telemetry-events 2022-10-27 15:57:17 -04:00
Joseph T Lyons 6b4dbecea2 Add release channel information to telemetry events 2022-10-27 15:53:14 -04:00
Max Brunsfeld a03491100a Merge pull request #1828 from zed-industries/following-scrollbar 
Show scrollbar when scrolling while following
 2022-10-27 12:46:14 -07:00
Max Brunsfeld 655f409f11 Show scrollbar when scrolling while following 2022-10-27 12:42:34 -07:00
Max Brunsfeld e062b30de8 🔥 stray dbg 2022-10-27 12:42:20 -07:00
Max Brunsfeld 9b324fd1b7 Avoid spurious log messages in development builds 2022-10-27 12:42:03 -07:00
K Simmons fa8f180406 minor tweak to keymap code 2022-10-27 12:36:53 -07:00
K Simmons 726cc8aca6 fixed binding fallback 2022-10-27 12:33:51 -07:00
Max Brunsfeld 47439cc7e1 Tweak version-bumping scripts 2022-10-27 12:10:09 -07:00
Max Brunsfeld 0fc73db7ec Remove stale docs folder 2022-10-27 12:08:55 -07:00
Nate Butler da555f1e99 Refine editor styles 
- Update active line backgrounds and line numbers
- Add a higher contrast border between the dock and panes
 2022-10-27 14:59:50 -04:00
Mikayla Maki b67c414bc3 WIP: Change to matches to vec 2022-10-27 11:27:26 -07:00
Max Brunsfeld 8dde69fec9 Merge pull request #1825 from zed-industries/update-notification-release-channel 
Indicate release channel in auto-update notification
 2022-10-27 11:00:16 -07:00
Max Brunsfeld 0643a2c422 Indicate release channel in auto-update notification 2022-10-27 10:57:59 -07:00
Joseph T. Lyons 631a086d03 Merge pull request #1824 from zed-industries/change-telemetry-event-field-name-to-app 
Change telemetry event field name to app
 2022-10-27 13:16:45 -04:00
Max Brunsfeld ce64dda817 Merge pull request #1822 from zed-industries/dont-bundle-app-on-prs 
Don't bundle the app on CI for PRs
 2022-10-27 10:10:29 -07:00