oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,668 Commits 1 Branch 0 Tags
495fd151f5794d2d225bd918c687a3f465eeebcb
Commit Graph
6668 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph T Lyons 495fd151f5 Revert Amplitude's "app" name back to "platform" 
This was unintentional.  We only want to rename the Mixpanel telemetry "platform" field to "app."  We want to keep it as "platform" on Amplitude because we want to keep using Amplitude for a bit, and the event fields should be the same.
 2022-10-31 19:18:03 -04:00
Max Brunsfeld 482a5bb02a Merge pull request #1840 from zed-industries/build-themes-in-assets-crate 
Generate themes before compiling the 'assets' crate
 2022-10-31 14:18:28 -07:00
Joseph T. Lyons c180137e02 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 ef837232bc Generate themes before compiling the 'assets' crate 2022-10-31 13:25:12 -07:00
Max Brunsfeld d0aa9f1c57 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 aa549d1da7 Don't use 'on' color for projects in the contact list 2022-10-31 12:28:25 -07:00
Julia 259a758849 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 7ac45379eb Layout git gutters inclusively 2022-10-31 14:35:42 -04:00
Max Brunsfeld 0940482c62 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 9cbb698b96 Fix panic when hitting tab at the beginning of a line with mixed tab/space indent 2022-10-31 10:51:20 -07:00
Julia c8fbc0d348 Slightly expand region hunk layout checks for folds 2022-10-28 19:05:29 -04:00
Julia 8361b4d47a Add test for go-to hunk and fix discovered bugs 2022-10-28 15:08:13 -04:00
JuliaandKay Simmons ae2021e073 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 c4b21a0ab5 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 8a095d0a55 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 c0bf8fd6a8 Added channel to database directories 2022-10-28 11:50:26 -07:00
Mikayla Maki 14329980e1 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 950626fe9e Upgraded migration library to remove panic 2022-10-28 11:36:41 -07:00
Max Brunsfeld 9156d488ca 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 e1ac1675ea Avoid hard-coding app bundle filename in auto-updater 2022-10-27 16:44:07 -07:00
Max BrunsfeldandJoseph Lyons 863250904b 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 8a926c4a23 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 760cceb378 Merge pull request #1827 from zed-industries/fix-keymap-resolution-fallback 
Keymap resolution fallbacks
 2022-10-27 13:50:38 -07:00
K Simmons c5650f9334 remove unnecessary comment 2022-10-27 13:29:57 -07:00
K Simmons bf968707df upgrade existing test to match new expected behavior 2022-10-27 13:28:49 -07:00
Max Brunsfeld 31fa7ca90c Add livekit to the Procfile, update the README 2022-10-27 13:24:35 -07:00
Joseph T Lyons 309f401015 Rename all keys, in telemetry events, to be consistent with Mixpanels conventions 2022-10-27 16:19:21 -04:00
Max Brunsfeld 33d02cedd7 Run CI when pushing to release branches (e.g. 'v0.62.x') 2022-10-27 13:03:35 -07:00
Joseph T Lyons daa75b5282 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 36c64045ae Merge branch 'main' into add-release-channel-information-to-telemetry-events 2022-10-27 15:57:17 -04:00
Joseph T Lyons 93e1e30323 Add release channel information to telemetry events 2022-10-27 15:53:14 -04:00
Max Brunsfeld 9b69f9a3ff 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 d5fbb59656 Show scrollbar when scrolling while following 2022-10-27 12:42:34 -07:00
Max Brunsfeld 7ba95d5d6c 🔥 stray dbg 2022-10-27 12:42:20 -07:00
Max Brunsfeld d79aeba2c1 Avoid spurious log messages in development builds 2022-10-27 12:42:03 -07:00
K Simmons 672b445676 minor tweak to keymap code 2022-10-27 12:36:53 -07:00
K Simmons e02199fa2a fixed binding fallback 2022-10-27 12:33:51 -07:00
Max Brunsfeld 9e55051811 Tweak version-bumping scripts 2022-10-27 12:10:09 -07:00
Max Brunsfeld 7db176a763 Remove stale docs folder 2022-10-27 12:08:55 -07:00
Mikayla Maki 8d94de8eb2 WIP: Change to matches to vec 2022-10-27 11:27:26 -07:00
Max Brunsfeld eaebec88c0 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 22fa6c07dd Indicate release channel in auto-update notification 2022-10-27 10:57:59 -07:00
Joseph T. Lyons afe9ab9d8c 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 16139cc6b6 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
Joseph T Lyons 31a904d370 Change telemetry event field name to app 2022-10-27 12:35:35 -04:00
Max Brunsfeld 02cf7679a3 0.63.x dev 2022-10-26 23:04:36 -07:00
Max Brunsfeld df708465d1 Ensure only the just-built app bundle is included in the DMG 2022-10-26 21:06:06 -07:00
Kay Simmons aa9ccf3411 Merge pull request #1823 from zed-industries/reduce-cursor-blink-load 
Reduce Cursor Blink CPU Load
 2022-10-26 17:58:56 -07:00
Max Brunsfeld 6410fdc474 Clear out bundle directory before creating a new app bundle 2022-10-26 17:49:03 -07:00
Kay Simmons 499d947e69 Merge pull request #1821 from zed-industries/better-pending-bindings 
Better pending bindings
 2022-10-26 17:42:56 -07:00