gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-24 18:12:48 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,831 Commits 157 Branches 1,067 Tags 61 MiB
6b3e1ee027
Commit Graph

4831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kiril Videlov
8b8fbde33d fix hunk context line injection corner cases 2024-01-17 13:20:19 +02:00
Mattias Granlund
47012bfe2f Hook up new app uodater 2024-01-17 00:08:17 +01:00
Pavel Laptev
50dfc8a967 - color replaced to a variable 2024-01-17 00:08:17 +01:00
Pavel Laptev
08cf0a658a update component updated 2024-01-17 00:08:17 +01:00
Pavel Laptev
9e16ab428d
Merge pull request #2276 from gitbutlerapp/update-select-styles-and-split-view 
Added new “error” state image, a few minor CSS fixes
 2024-01-17 00:06:33 +01:00
Pavel Laptev
5c30a71b3b Returned back for attr to the selector 2024-01-17 00:03:47 +01:00
Pavel Laptev
ad2ce2f83f Added new “error” state image, a few minor CSS fixes 2024-01-16 23:57:51 +01:00
Kiril Videlov
2c102dd957 🔨 chore: add tests for removed and new files in hunk_with_context function 2024-01-16 23:27:29 +02:00
Kiril Videlov
32a65ae110 ✨ feat: add instrumentation for creating pull requests in GitHub service 2024-01-16 22:49:33 +02:00
Kiril Videlov
1fc6aabde2 more tests for injecting of hunk context 2024-01-16 18:12:28 +02:00
Pavel Laptev
d93f76189c
Merge pull request #2272 from gitbutlerapp/update-icons-and-tag-icons 
Update icons and tag icons
 2024-01-16 16:58:33 +01:00
Pavel Laptev
010d4f0706 merged from upstream 2024-01-16 16:56:53 +01:00
Pavel Laptev
f72f9b15b0 updated icons, “disabled” state for the Tag component 2024-01-16 16:56:49 +01:00
Pavel Laptev
7703ab4c64 updated icons, “disabled” state for the Tag component 2024-01-16 16:56:38 +01:00
Mattias Granlund
3fb9dacbee More "problem state" improvements 
- show project name on problem pages
- improve project switcher
 2024-01-16 16:33:30 +01:00
Kiril Videlov
c981a10abe test: add more tests for the hunk context injection 2024-01-16 13:14:54 +02:00
Kiril Videlov
d59a78aa52 unit tests for hunk context lines 2024-01-16 12:38:25 +02:00
Pavel Laptev
65e34d095a
Merge pull request #2268 from gitbutlerapp/tokens-updates 
tokens updates
 2024-01-16 07:56:48 +01:00
Pavel Laptev
c316d9f4f1 tokens updates 2024-01-16 01:07:17 +01:00
Kiril Videlov
310d80394b 🐛 fix: handle potential index out of bounds error in context lines generation 2024-01-15 23:34:33 +02:00
Pavel Laptev
15c84d9fce
Merge pull request #2266 from gitbutlerapp/new-icon-tokens 
new icons and tokens
 2024-01-15 22:27:26 +01:00
Pavel Laptev
8c6b18d584 merged from upstream 2024-01-15 22:25:33 +01:00
Pavel Laptev
ee4552e8ee new icons and tokens 2024-01-15 22:25:15 +01:00
Pavel Laptev
ffc3c67e3b new icons and tokens 2024-01-15 22:24:43 +01:00
Kiril Videlov
f26321065e safe usize subtraction 2024-01-15 23:15:46 +02:00
Kiril Videlov
45352e1a6a sanitize branch url 2024-01-15 22:34:45 +02:00
Kiril Videlov
acf487a907 fix line context for commit diffs 
when a file is new, we cant expect the parent commit to have the file
 2024-01-15 22:29:10 +02:00
Mattias Granlund
01da5bee3e Refactor error pages 
- new switched away from page
- new problem loading repo page
 2024-01-15 20:35:40 +01:00
dependabot[bot]
7fb4261fb8
chore(deps): bump ssh-key from 0.6.3 to 0.6.4 
Bumps [ssh-key](https://github.com/RustCrypto/SSH) from 0.6.3 to 0.6.4.
- [Commits](https://github.com/RustCrypto/SSH/compare/ssh-key/v0.6.3...ssh-key/v0.6.4)

---
updated-dependencies:
- dependency-name: ssh-key
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-15 15:10:45 +00:00
Kiril Videlov
6d96b0bf23 🔨 chore: fix out of bounds error in context_before loop 2024-01-15 15:37:22 +02:00
Kiril Videlov
7d9360662f 🐛 fix: off-by-one error in context lines calculation 2024-01-15 15:22:39 +02:00
Kiril Videlov
f5da2f012d 🐛 fix: fix index out of bounds error in context line generation 2024-01-15 15:22:39 +02:00
Pavel Laptev
e69af1b620
Merge pull request #2249 from gitbutlerapp/update-color-variables-and-text-styles 
Update color variables and text styles
 2024-01-15 12:53:13 +01:00