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
Mattias Granlund
da5fd9cc7a
Add ahead/behind to navigation panel
2024-01-17 16:23:22 +01:00
Josh Junon
bf607c0029
add core gitbutler-git crate
2024-01-17 16:21:21 +01:00
Mattias Granlund
1dbba1f9db
Fix sync & delete button UI bugs
2024-01-17 15:59:21 +01:00
dependabot[bot]
c876c405bb
chore(deps): bump futures from 0.3.29 to 0.3.30
...
Bumps [futures](https://github.com/rust-lang/futures-rs ) from 0.3.29 to 0.3.30.
- [Release notes](https://github.com/rust-lang/futures-rs/releases )
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.29...0.3.30 )
---
updated-dependencies:
- dependency-name: futures
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-01-17 14:46:27 +00:00
dependabot[bot]
bb4be4ca65
chore(deps): bump git2-hooks from 0.3.0 to 0.3.1
...
Bumps [git2-hooks](https://github.com/extrawurst/gitui ) from 0.3.0 to 0.3.1.
- [Release notes](https://github.com/extrawurst/gitui/releases )
- [Changelog](https://github.com/extrawurst/gitui/blob/master/CHANGELOG.md )
- [Commits](https://github.com/extrawurst/gitui/commits )
---
updated-dependencies:
- dependency-name: git2-hooks
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-01-17 14:45:16 +00:00
Qix
87a8f2e9ae
Merge pull request #2222 from gitbutlerapp/core-git
...
add gitbutler-diff core library
2024-01-17 15:42:00 +01:00
Josh Junon
f119ea60ab
add crate to manifests
2024-01-17 15:36:00 +01:00
Josh Junon
936160d0dd
get rid of old design of hunks/changesets
2024-01-17 15:36:00 +01:00
Josh Junon
d3095bb14d
add a few more notes
2024-01-17 15:36:00 +01:00
Josh Junon
4a9d20cf23
add notes about serde (and remove serde support for gitbutler-diff)
2024-01-17 15:36:00 +01:00
Josh Junon
789325b191
add signature handling
2024-01-17 15:36:00 +01:00
Josh Junon
217b051b2b
add gitbutler-diff core library
...
asdfa
2024-01-17 15:36:00 +01:00
Qix
c3bc898bab
Merge pull request #2283 from gitbutlerapp/virtual-branch-1
...
remove cargo-sort check from CI
2024-01-17 15:35:50 +01:00
Josh Junon
fe8c3e0615
remove cargo-sort check from CI
2024-01-17 15:35:17 +01:00
Mattias Granlund
942316861a
Fixes a few bugs
...
- project setup back button
- delete repo from problem page
- go to home screen after deleting repo from settings page
2024-01-17 14:18:51 +01:00
Nikita Galaiko
cc7102b18c
add failing test
2024-01-17 14:03:24 +01:00
Nikita Galaiko
4dec1fef4d
Merge pull request #2280 from gitbutlerapp/refactor-rebase-function
...
Refactor rebase function
2024-01-17 13:50:56 +01:00
Nikita Galaiko
f7bf028090
refactor: don't expose annotated commit
2024-01-17 13:42:56 +01:00
Mattias Granlund
52887a96bd
Fix occasional back button issue
2024-01-17 12:42:16 +01:00
