oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,234 Commits 1 Branch 0 Tags
005e2cb2bec9754b446dcbe4b360b7e7b5a2f368
Commit Graph
3065 Commits
Author SHA1 Message Date
Mikayla Maki 005e2cb2be Compiling again... finally 2022-07-20 10:04:08 -07:00
Mikayla Maki 4f7b6b8b22 Finally finished merging this massive ball of changes 2022-07-20 10:04:08 -07:00
Mikayla Maki 150d2ff53f Attempting to continue rebase 2022-07-20 10:04:08 -07:00
Mikayla Maki 4a483618be Finished graceful terminal failure 2022-07-20 10:04:08 -07:00
Mikayla Maki 40d30a898b Rebasing continues 2022-07-20 10:04:08 -07:00
Mikayla Maki 9d063ae6d8 Switched to hybrid iterator and while loop grid processor. Still hairy but much more managable. Not finished compiling yet. 2022-07-20 10:04:08 -07:00
Mikayla Maki c9584a9d0c Continuing rebases on other work 2022-07-20 10:04:08 -07:00
Mikayla Maki a4ca11ba17 Finished design touchups 2022-07-20 10:04:08 -07:00
Mikayla Maki c19956373a Finished bel, moving on to title 2022-07-20 10:04:06 -07:00
Nate Butler bcc554a3db Merge branch 'main' into theme-improvements 2022-07-19 20:12:02 -04:00
Keith Simmons c2868a39e8 Merge pull request #1388 from zed-industries/mouse-region-refactor 
Mouse Region Refactor
 2022-07-19 16:50:12 -07:00
Nate Butler 46384e71b7 Add icon sets for sizes 8, 12 and 16, remove old icons 2022-07-19 17:11:15 -04:00
Max Brunsfeld e5602b0ad4 0.48.1 2022-07-18 19:11:12 -07:00
Max Brunsfeld 815ce22fb7 Revert "Merge pull request #1359 from zed-industries/plugin-json-enable" 
This reverts commit 94b443a704, reversing
changes made to 285832e810.
 2022-07-18 19:04:49 -07:00
Max Brunsfeld 142a019ada 0.48.0 2022-07-18 16:24:57 -07:00
Max Brunsfeld c1dfb6294b Dismiss project panel's rename editor when it loses focus 2022-07-18 16:10:09 -07:00
Max Brunsfeld 2ab732efdb Merge pull request #1390 from zed-industries/fix-fs-watch-leak 
Ensure that FS watchers are dropped when dropping their event stream
 2022-07-18 15:16:41 -07:00
Max Brunsfeld 43613fe2ac Ensure that fs watches are dropped when dropping the event stream 2022-07-18 14:55:24 -07:00
Max BrunsfeldandNathan Sobo 7998771d9f Avoid panic when unable to access a GPU 
This will remove noise from our panic logs.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-07-18 14:13:12 -07:00
K Simmons deeefed7eb Change mouse_event_handler to use HandlerSet 2022-07-18 10:08:14 -07:00
K Simmons ec25fa9260 Extract handler set from MouseRegion 2022-07-18 09:54:48 -07:00
Antonio Scandurra 11ef6bfbae Avoid unnecessarily emitting fake fs events for dirs that exist 2022-07-18 17:36:40 +02:00
Antonio Scandurra f9df5fe595 Detect cycles also when processing events 2022-07-18 17:31:09 +02:00
Antonio Scandurra b3218641cd Create intermediate directories in FakeFs::create_dir 2022-07-18 16:38:26 +02:00
Antonio Scandurra b48118830f Detect cycles when scanning a directory 2022-07-18 13:47:15 +02:00
Antonio Scandurra df33556693 Introduce a new TreeSet struct in sum_tree 
This is just a special case of `TreeMap<K, V>` where `V = ()`.
 2022-07-18 13:40:30 +02:00
Max Brunsfeld f9a5ed3a85 Start work on a test for a worktree with symlink cycles 2022-07-18 12:23:07 +02:00
Max Brunsfeld f6c1393dfd Restructure FakeFs to let it model symlinks 
Instead of storing paths, model the FS more directly
as nodes
 2022-07-18 12:23:07 +02:00
Antonio Scandurra 0aafc78eb7 Merge pull request #1385 from zed-industries/fix-lifetime-error 
Fix spurious borrow checker error
 2022-07-18 12:22:54 +02:00
Antonio Scandurra 51c40f4136 Merge pull request #1384 from zed-industries/expose-collaboration-metrics 
Expose collaboration metrics
 2022-07-18 10:44:29 +02:00
Antonio Scandurra 316a534a16 Allow querying active user counts for people that have collaborated 2022-07-18 10:29:10 +02:00
Isaac Clayton c326a20193 Merge pull request #1367 from zed-industries/plugin-opaque 
Guide to Opaque Types and Callbacks in Plugins
 2022-07-18 09:20:10 +02:00
Antonio Scandurra 2cbb0ae843 Expose max number of project collaborators in Db::get_top_user_activity 2022-07-18 08:58:09 +02:00
K Simmons 8add81350e Rework presenter and MouseRegion to use Handler hashmap rather than individual fields 2022-07-17 23:19:32 -07:00
Nate Butler 4ca4449394 Update icons in rust 
Updated icons
- Diagnostic states
- Sidebar icons (project, contacts)
- Navigation arrows
 2022-07-16 11:51:10 -04:00
Antonio Scandurra af917de684 Handle inserting multiple tabs on the same row 
This also fixes a panic when tabbing on a row that contained multi-byte
characters.
 2022-07-16 08:40:44 +02:00
Mikayla Maki 8349ead6b2 Add bracketed paste support 2022-07-15 19:01:08 -07:00
Mikayla Maki cfc956d78f Merge pull request #1376 from zed-industries/terminal-settings 
Added settings for common terminal configurations
 2022-07-15 18:50:40 -07:00
Mikayla Maki 6675c96c8a Removed some old dbgs and comments 2022-07-15 18:42:07 -07:00
Mikayla Maki 523e565b9b bad patch for panic on mis configured shell 2022-07-15 18:38:17 -07:00
Mikayla Maki dc120c1e05 Added settings for common terminal configurations 2022-07-15 18:27:10 -07:00
Max Brunsfeld 69146fb318 Allow the web client to specify activity bucket durations 2022-07-15 16:46:44 -07:00
Max Brunsfeld 1363d2c502 Add admin API for counting users with a given amount of activity 2022-07-15 16:46:44 -07:00
Mikayla Maki 1b3fb257b2 Merge branch 'main' into copy-test-update 2022-07-15 13:24:11 -07:00
Mikayla Maki e156675640 Revamped testing in terminals 2022-07-15 12:15:55 -07:00
Mikayla Maki 8282858941 Updated copy integration test to match retries on terminal integration test 2022-07-15 11:30:14 -07:00
Mikayla Maki f38206f819 Merge branch 'main' into keybindings-grind 2022-07-15 11:24:16 -07:00
Mikayla Maki 3e86411627 Finished new keybindings system for now 2022-07-15 11:20:54 -07:00
Mikayla Maki 90428255d9 Added some simple tests for the new keybindings 2022-07-15 10:36:37 -07:00
Isaac Clayton 85cf703282 Fix typos, minor revisions 2022-07-15 13:16:01 +02:00