Commit Graph

4733 Commits

Author SHA1 Message Date
Qix
8cd7994d42
Merge pull request #2255 from gitbutlerapp/dependabot/cargo/ssh-key-0.6.4
chore(deps): bump ssh-key from 0.6.3 to 0.6.4
2024-01-18 17:32:51 +01:00
Qix
a2b0cf7ad4
Merge pull request #2253 from gitbutlerapp/dependabot/cargo/futures-0.3.30
chore(deps): bump futures from 0.3.29 to 0.3.30
2024-01-18 17:32:34 +01:00
Qix
74390dc6c7
Merge pull request #2254 from gitbutlerapp/dependabot/cargo/git2-hooks-0.3.1
chore(deps): bump git2-hooks from 0.3.0 to 0.3.1
2024-01-18 17:32:22 +01:00
Qix
40cdc3a990
Merge pull request #2192 from gitbutlerapp/dependabot/npm_and_yarn/codemirror/state-6.4.0
chore(deps-dev): bump @codemirror/state from 6.3.1 to 6.4.0
2024-01-18 17:31:18 +01:00
Qix
aac17f7ddd
Merge pull request #2150 from gitbutlerapp/dependabot/npm_and_yarn/nanoid-5.0.4
chore(deps-dev): bump nanoid from 5.0.3 to 5.0.4
2024-01-18 17:30:46 +01:00
Qix
468ea895b2
Merge pull request #2311 from gitbutlerapp/virtual-branch-1-1
fix readme it’s -> its
2024-01-18 17:24:43 +01:00
Josh Junon
c308727927 fix readme it’s -> its 2024-01-18 17:24:17 +01:00
Qix
f1852893ad
Merge pull request #2310 from gitbutlerapp/virtual-branch-1
add core libs to push changes workflow
2024-01-18 17:23:21 +01:00
Josh Junon
6471696108 add core libs to push changes workflow 2024-01-18 17:22:50 +01:00
Qix
51ff3bb8a1
Merge pull request #2309 from gitbutlerapp/add-gitbutler-integration-tests
add integration tests for core git abstraction library
2024-01-18 17:20:48 +01:00
Josh Junon
897fd8b217 add integration tests for core git abstraction library 2024-01-18 17:20:00 +01:00
Mattias Granlund
cc44e2c8ff Add initial value for branches observable 2024-01-18 16:01:36 +01:00
Mattias Granlund
dd73f2397f Fix board reactivity when switching projects
- you would see old branch data until list_virtual_branches returned
2024-01-18 15:57:05 +01:00
Kiril Videlov
1e50bbd708 update tests 2024-01-18 15:31:53 +01:00
Kiril Videlov
7b36315149 use the new change type to determine add/del/modified instead of hunk header 2024-01-18 15:31:53 +01:00
Kiril Videlov
27347f66fb serialize enum with lowercase 2024-01-18 15:31:53 +01:00
Kiril Videlov
8d564a6b45 skip types that we dont need for frontend 2024-01-18 15:31:53 +01:00
Kiril Videlov
b9b72fe7e2 🔨 chore: refactor diff printing to include change type information 2024-01-18 15:31:53 +01:00
Mattias Granlund
9e79bebb67 Show js error on problem loading repo page 2024-01-18 14:26:11 +01:00
Mattias Granlund
b5f3bb3609 feat: add tooltip to ahead/behind 2024-01-18 14:01:52 +01:00
Nikita Galaiko
ed6030486c
Merge pull request #2281 from gitbutlerapp/rebase-and-merge-function
Rebase and merge function
2024-01-18 13:03:32 +01:00
Nikita Galaiko
ed1feccca3 assume integrated commits's parents are integrated 2024-01-18 12:56:10 +01:00
Mattias Granlund
104a02c4ec feat: add locked indicator to file diff section
The changes in this commit add a locked indicator to the file diff section in the Svelte component. This indicator will be displayed if the section's hunk is locked.
2024-01-18 12:23:47 +01:00
Mattias Granlund
976d3b6567 chore: disable use of editorconfig in prettier configuration 2024-01-18 12:21:35 +01:00
Pavel Laptev
2d92896a52
Merge pull request #2301 from gitbutlerapp/fix-input-width-calculation
input width calculation fixed
2024-01-18 12:05:40 +01:00
Pavel Laptev
d8556e7b74 input width calculation fixed 2024-01-18 12:04:03 +01:00
Mattias Granlund
be55e6b487 Update ahead/behind again
- changed the style again to be more subtle
2024-01-18 11:50:51 +01:00
Pavel Laptev
6cb62d9d3a
Merge pull request #2299 from gitbutlerapp/new-text-class
New text class
2024-01-18 11:37:30 +01:00
Pavel Laptev
0d6e95f329 merged from upstream 2024-01-18 11:32:29 +01:00
Pavel Laptev
736bee1706 new text class 2024-01-18 11:32:27 +01:00
Pavel Laptev
aaad511741 new text class 2024-01-18 11:32:20 +01:00
Mattias Granlund
68b23c20f3 Update ahead/behind styles 2024-01-18 11:11:09 +01:00
Pavel Laptev
43f39e5f14
Merge pull request #2297 from gitbutlerapp/mono-font-updated
Mono font updated
2024-01-18 02:15:46 +01:00
Pavel Laptev
414f0ddde7 format updated 2024-01-18 02:13:45 +01:00
Pavel Laptev
5aa57b9189 Prettier formatted 2024-01-18 02:10:38 +01:00
Pavel Laptev
281c5e8c4c udated font spelling 2024-01-18 02:09:50 +01:00
Pavel Laptev
b78c46d999 Updated ahead/behind 2024-01-18 02:07:29 +01:00
Pavel Laptev
e567f29c21 Mono font updated 2024-01-18 02:01:17 +01:00
Kiril Videlov
a26a87f655 improve sentry perfm metrics fr pr service 2024-01-17 22:56:12 +01:00
Qix
14a482b7c9
Merge pull request #2295 from gitbutlerapp/add-cli-based-backend
Add basic fork/exec implementation with Tokio backend
2024-01-17 22:42:23 +01:00
Josh Junon
58951cc415 add basic fork/exec implementation with Tokio backend 2024-01-17 22:31:51 +01:00
Mattias Granlund
7ad3be8350 Fix even more UI bugs
- show delete confirmation dialog from problem loading repo page
- prevent error signal race condition when deleting project
- move app window from decorated view
- fix selected item in select list
2024-01-17 18:05:23 +01:00
Mattias Granlund
d26bb05027 Pnpm format files 2024-01-17 17:52:54 +01:00
Qix
163acf7d89
tell prettier to ignore .editorconfig (#2293)
* tell prettier to ignore .editorconfig

* tell prettier to ignore .editorconfig
2024-01-17 16:45:43 +00:00
Mattias Granlund
845855dc81 fix: update context menu labels for creating branches to the left and right 2024-01-17 16:47:18 +01:00
Qix
62c3322154
Merge pull request #2287 from gitbutlerapp/core-git
add core gitbutler-git crate
2024-01-17 16:30:52 +01:00
Qix
a42ac7dbe0
Merge pull request #2290 from gitbutlerapp/add-editorconfig-as-recommended-extension
add editorconfig as a recommended extension
2024-01-17 16:30:33 +01:00
Josh Junon
474f862efb add editorconfig as a recommended extension 2024-01-17 16:30:07 +01:00
Qix
ccf28f4d44
Merge pull request #2289 from gitbutlerapp/add-editorconfig-file
add .editorconfig
2024-01-17 16:28:13 +01:00
Josh Junon
6085b0115c add .editorconfig 2024-01-17 16:27:47 +01:00