yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,544 Commits 5 Branches 0 Tags
29c2cdc36bc9b9d044df884185cedcd8c4faed42
Commit Graph
6544 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mikayla Maki 29c2cdc36b Merge pull request #1799 from zed-industries/fix-project-panel-notify 
Fix project panel not showing files / folders
 2022-10-24 13:28:26 -07:00
Mikayla Maki e86d51029b removed dev file 2022-10-24 13:20:45 -07:00
Mikayla Maki cf5330544c Delete generate-db.rs 2022-10-24 13:19:30 -07:00
Mikayla Maki 93e41a9b77 Added notify call 2022-10-24 13:18:02 -07:00
Max Brunsfeld 065dae2558 Merge pull request #1785 from zed-industries/auto-deploy-collab 
Automatically build collab server docker images based on git tags
 2022-10-24 12:07:35 -07:00
Max Brunsfeld ace5b792ce Merge branch 'main' into auto-deploy-collab 2022-10-24 12:01:32 -07:00
Max Brunsfeld c457be6049 Add version bump scripts 2022-10-24 08:58:14 -07:00
Antonio Scandurra 1083b78372 Merge pull request #1793 from zed-industries/screen-sharing 
Introduce screen-sharing
 2022-10-24 16:53:05 +01:00
Nathan SoboandAntonio Scandurra 07e02516f0 Render a tooltip on toggle screen sharing button 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2022-10-24 09:44:05 -06:00
Antonio Scandurra c9a03f8892 Revert "Temporarily upload app bundle as CI artifact" 
This reverts commit 757b833398.
 2022-10-24 17:36:19 +02:00
Antonio ScandurraandNathan Sobo 019cc9959b Bump protocol version 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-24 17:06:40 +02:00
Antonio ScandurraandNathan Sobo 757b833398 Temporarily upload app bundle as CI artifact 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-24 17:04:33 +02:00
Antonio ScandurraandNathan Sobo 31139b7be7 Provide LiveKit environment variables on Kubernetes 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-24 17:03:18 +02:00
Antonio ScandurraandNathan Sobo ad8d284e3a Replace Screen Sharing label with Screen 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-24 16:50:56 +02:00
Antonio Scandurra d3d4e4b1de Add test for screen-sharing 2022-10-24 15:17:25 +02:00
Antonio Scandurra a63f6b99d8 Set location on ActiveCall even before there's a room 
We will automatically call `Room::set_location` once a room has been
assigned.
 2022-10-24 15:07:25 +02:00
Antonio Scandurra fc251e4f7a Init submodules on CI 2022-10-24 14:28:58 +02:00
Antonio Scandurra 70299e8135 Remove stray log statement 2022-10-24 11:02:41 +02:00
Antonio Scandurra 98160bd1ff Focus shared screen item when clicking on it 2022-10-24 11:02:10 +02:00
Antonio Scandurra 493bc28cc6 Simplify room events 2022-10-24 10:53:44 +02:00
Antonio Scandurra 75a35cabc4 Allow opening shared screen via the contacts popover 2022-10-24 10:47:47 +02:00
Antonio Scandurra 8325be5b10 Show shared screen as a pane item 2022-10-24 10:04:08 +02:00
Max Brunsfeld 52670ff022 Improve deploy scripts 2022-10-21 15:50:14 -07:00
Nate Butler 5fed35f669 Merge pull request #1783 from zed-industries/add-new-internal-themes 
Add new internal themes
 2022-10-21 18:31:02 -04:00
Max Brunsfeld b7690d277e Add what-is-deployed-script 2022-10-21 14:28:55 -07:00
Max Brunsfeld 459cf41b9c Run migrations via a collab subcommand 2022-10-21 14:28:55 -07:00
Max Brunsfeld 2885c26b68 Publish collab docker images on CI, deploy pre-built images 2022-10-21 14:24:43 -07:00
Max Brunsfeld 0eb142bd33 Add more paths to dockerignore 2022-10-21 14:24:43 -07:00
Joseph T. Lyons 0e4abe475e Merge pull request #1781 from zed-industries/switch-to-mixpanel 
Switch to mixpanel
 2022-10-21 15:26:08 -04:00
Nate ButlerandMikayla Maki 0c561d0817 Make the assets/themes folder if it doesn't exist 
- Also only run clearThemes if the folder exists

Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2022-10-21 13:19:44 -04:00
Nate ButlerandMikayla Maki 1e8c135f23 Update gitignore because of macOS case sensitive weirdness 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2022-10-21 13:05:59 -04:00
Nate ButlerandMikayla Maki 201899d76d 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
Nate Butler be2849db0b Update Zenburn license 2022-10-21 13:03:54 -04: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
Antonio Scandurra 03b5a26fd6 Leave Zed room when LiveKit room disconnects 2022-10-21 14:21:45 +02:00
Antonio Scandurra 17a5db3a44 Switch back to using the legacy screen capturing API 
The new API is buggy and inconsistent, so I think we should move on
for now.
 2022-10-21 11:54:52 +02:00
Antonio Scandurra 97bd7980ac Re-build live_kit_client when MACOSX_DEPLOYMENT_TARGET changes 2022-10-21 10:18:03 +02:00
Antonio Scandurra f42838534b Remove unused LKDisplays API 2022-10-21 10:12:24 +02:00
Nathan Sobo 678585fb7c Merge pull request #1788 from zed-industries/style 
Apply a slight stylistic tweak
 2022-10-20 18:43:50 -06:00
Nathan Sobo 22770aa942 Apply a slight stylistic tweak 2022-10-20 18:38:27 -06:00
Kay Simmons 8e7aaa83a5 Merge pull request #1784 from zed-industries/fix-keymap-panic 
Fix panic in keymap parsing
 2022-10-20 16:39:38 -07:00
K Simmons a03d4d9802 catch keymap string only modifiers and no key 2022-10-20 16:30:07 -07:00
Joseph T Lyons 359c56fef4 Temporarily restore integration with Amplitude 
This will be reverted later, once we fully switch to Mixpanel
 2022-10-20 19:27:55 -04:00
Nate Butler 0f0ff3b377 Update tokyo night meta 2022-10-20 18:22:34 -04:00
Nate Butler 5420ed2bd3 Merge branch 'main' into add-new-internal-themes 2022-10-20 18:19:21 -04:00
Nate Butlerandgibusu 5981772cb2 Add metadata to all themes and organize 
Co-Authored-By: gibusu <95764254+gibusu@users.noreply.github.com>
 2022-10-20 17:08:09 -04:00
Nathan Sobo 56bec8d03b Preserve symlinks in WebRTC.framework to avoid bundle signing failure 2022-10-20 14:37:04 -06:00
Nate Butlerandgibusu f86f3e1707 Fix a few incorrectly named themes 
Co-Authored-By: gibusu <95764254+gibusu@users.noreply.github.com>
 2022-10-20 16:28:08 -04:00
Nate Butlerandgibusu c7a4faaaaa Update gruvbox to use manual accent ramps 
Also updated it's neutral to contain more values sourced from the gruvbox repo

Co-Authored-By: gibusu <95764254+gibusu@users.noreply.github.com>
 2022-10-20 16:25:54 -04:00
Nate Butler bde125c7bd Add a range of new themes as internal themes for testing 2022-10-20 15:32:56 -04:00