Commit Graph
4885 Commits
Author SHA1 Message Date
Max Brunsfeld 03a109cc57 collab 0.2.5 2022-11-30 14:10:10 -08:00
JuliaandMax Brunsfeld 8a7d081b89 Change verify macro to debug panic
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-11-30 13:03:15 -05:00
Julia df65473139 Add verify macros & use in one location for point conversion 2022-11-30 12:43:43 -05:00
Antonio Scandurra fdbb4bb974 Start on a new db2 module that uses SeaORM 2022-11-29 16:49:04 +01:00
Antonio Scandurra 0ad040f4d2 Start moving towards using sea-query to construct queries 2022-11-29 13:55:08 +01:00
Antonio Scandurra 68a40f777c Introduce per-room lock acquired before committing a transaction 2022-11-28 17:00:47 +01:00
Max Brunsfeld a26cdaed4e v0.67.x dev 2022-11-23 09:56:06 -08:00
Max Brunsfeld 8b38bcb8b6 collab 0.2.4 2022-11-17 11:44:29 -08:00
Antonio ScandurraandNathan Sobo b1e7672b2b WIP: Introduce a db field to Session
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-11-17 17:30:26 +01:00
Max Brunsfeld 1278e99760 v0.66.x dev 2022-11-16 14:22:18 -08:00
Nathan Sobo 1b3fcfe375 collab 0.2.3 2022-11-15 15:45:04 -07:00
Max Brunsfeld 392cf29a7b Merge pull request #1863 from zed-industries/erb
Add support for ERB
2022-11-14 16:59:51 -08:00
Max Brunsfeld d2b0487603 Bump tree-sitter after merging included-ranges PR 2022-11-14 16:56:09 -08:00
Max Brunsfeld 3c6eb78aa0 Bump tree-sitter for included range bugfix 2022-11-11 16:36:04 -08:00
Kay Simmons c70520c64e Merge pull request #1867 from zed-industries/drag-project-entry-to-pane
Drag project entry to pane
2022-11-10 17:25:22 -08:00
Max Brunsfeld 9180110748 Use upstream sqlx git repository 2022-11-10 15:13:32 -08:00
Max Brunsfeld 4f85bfa67e Use our fork of sqlx, for now 2022-11-10 14:58:05 -08:00
Max Brunsfeld 3644a1d2d3 Start work on using sqlite in tests 2022-11-09 19:26:29 -08:00
Max Brunsfeld 5355c878d8 v0.65.x dev 2022-11-09 13:18:23 -08:00
62177c70ff Get combined injections basically working
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
2022-11-07 16:58:12 -08:00
Max Brunsfeld 06427afdc7 Start work on handling combined injections in SyntaxMap 2022-11-07 14:45:17 -08:00
JuliaandKay Simmons c815ac878d Start dragging project panel entries
Co-Authored-By: Kay Simmons <kay@zed.dev>
2022-11-07 17:00:01 -05:00
Max Brunsfeld da03f91c24 collab 0.2.2 2022-11-04 10:04:14 -07:00
Max Brunsfeld 2b6021fa29 Start work on ERB language support 2022-11-04 09:33:59 -07:00
Antonio Scandurra 51d9f7995c Show placeholder text for pickers 2022-11-04 10:18:47 +01:00
Max BrunsfeldandKay Simmons a491a27b62 Add basic support for ruby
Co-authored-by: Kay Simmons <kay@zed.dev>
2022-11-03 15:52:33 -07:00
Max Brunsfeld 0c6a84c079 Bump tree-sitter-rust for let-else, let-chains 2022-11-03 12:35:12 -07:00
Max Brunsfeld 301a98029b collab 0.2.1 2022-11-02 10:27:26 -07:00
Joseph T Lyons 15be9a973d v0.64.x dev 2022-11-02 12:57:53 -04:00
Mikayla Maki f7e2e1c0ee Upgraded migration library to remove panic 2022-10-28 11:36:41 -07:00
Max Brunsfeld bc947c454b 0.63.x dev 2022-10-26 23:04:36 -07:00
Max Brunsfeld fe47daabea Dev 0.62.0 2022-10-26 16:38:38 -07:00
Max Brunsfeld c98a075e21 Store current release channel name in a file in the zed crate 2022-10-26 16:19:19 -07:00
Kay Simmons 978bb6cc53 Merge pull request #1791 from zed-industries/drag-tabs-more-places
Drag tabs more places
2022-10-25 00:34:50 -07:00
K Simmons 6c5af0b436 fix failing test 2022-10-25 00:11:59 -07:00
Max Brunsfeld 665718e8f0 collab 0.2.0 2022-10-24 17:06:54 -07:00
Antonio Scandurra 8325be5b10 Show shared screen as a pane item 2022-10-24 10:04:08 +02:00
Antonio Scandurra 231fc0f698 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
Nathan Sobo ede148827a Use fake LiveKit server to test we can send frames when screen sharing 2022-10-19 19:14:55 -06:00
K Simmons a5f1eff761 flattened layers and elevations 2022-10-19 13:02:51 -07:00
Mikayla Maki fa315f4d1c Restored chat_panel, just in case 2022-10-19 11:42:29 -07:00
Antonio ScandurraandNathan Sobo df546c2fc0 Use live_kit_client::TestServer in integration tests
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-19 16:35:34 +02:00
Antonio Scandurra afc1bee25f Start on implementing a fake live-kit server 2022-10-19 14:58:50 +02:00
Antonio Scandurra 5126184bfb Merge remote-tracking branch 'origin/main' into screen-sharing 2022-10-19 10:04:56 +02:00
K Simmons bf8b74f366 remove rocksdb 2022-10-18 17:21:15 -07:00
Kay Simmons a93578dca3 Merge pull request #1773 from zed-industries/rusqlite
Swap to sqlite for client persistence
2022-10-18 16:11:54 -07:00
Mikayla Makiand 3cf445cb27 Finished up initial sqlite implemention
Co-Authored-By: kay@zed.dev
2022-10-18 15:58:05 -07:00
Max Brunsfeld ed7c9109d4 0.61.0 2022-10-18 13:05:16 -07:00
K Simmons 061a82a267 Merge branch 'main' into elevations 2022-10-18 12:47:15 -07:00
K Simmons eabcaf8e8a Get rusqlite more shippable 2022-10-18 11:43:18 -07:00