gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-25 10:33:21 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,831 Commits 158 Branches 1,068 Tags 61 MiB
6b3e1ee027
Commit Graph

4831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Galaiko
ffb7351593
Merge pull request #2196 from gitbutlerapp/dependabot/cargo/thiserror-1.0.56 
chore(deps): bump thiserror from 1.0.53 to 1.0.56
 2024-01-09 12:39:59 +01:00
Nikita Galaiko
ff30894a11
Merge pull request #2197 from gitbutlerapp/dependabot/cargo/similar-2.4.0 
chore(deps): bump similar from 2.3.0 to 2.4.0
 2024-01-09 12:39:42 +01:00
Nikita Galaiko
3b92c18608 Merged origin/master into refactor-reader-writer 2024-01-09 10:27:02 +01:00
Nikita Galaiko
ec801c39ac
Merge pull request #2202 from gitbutlerapp/add-sentry-auth-token 
Add sentry auth token
 2024-01-09 10:26:16 +01:00
Nikita Galaiko
9f6833a48b chore: add SENTRY_AUTH_TOKEN environment variable to script 2024-01-09 10:17:27 +01:00
Nikita Galaiko
f2514ef4c2 Merged origin/master into refactor-reader-writer 2024-01-09 10:17:19 +01:00
Nikita Galaiko
728e57ba7f
Merge pull request #2201 from gitbutlerapp/use-env-var-for-sentry-auth-token 
Use env var for sentry auth token
 2024-01-09 10:03:51 +01:00
Nikita Galaiko
4417510d55 remove sentry api key from source code 2024-01-09 09:59:19 +01:00
Mattias Granlund
392bc45383 Fix UI recovery when switching back to gitbutler branch 2024-01-08 17:17:48 +01:00
Mattias Granlund
f481ba5311 Increase line-height of new/empty branch message 2024-01-08 17:16:45 +01:00
dependabot[bot]
ccf702c9ab
chore(deps): bump similar from 2.3.0 to 2.4.0 
Bumps [similar](https://github.com/mitsuhiko/similar) from 2.3.0 to 2.4.0.
- [Changelog](https://github.com/mitsuhiko/similar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mitsuhiko/similar/compare/2.3.0...2.4.0)

---
updated-dependencies:
- dependency-name: similar
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-08 15:37:51 +00:00
dependabot[bot]
274b3e7ce1
chore(deps): bump thiserror from 1.0.53 to 1.0.56 
Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.53 to 1.0.56.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.53...1.0.56)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-08 15:37:36 +00:00
dependabot[bot]
fc01c451a6
chore(deps): bump async-trait from 0.1.74 to 0.1.77 
Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.74 to 0.1.77.
- [Release notes](https://github.com/dtolnay/async-trait/releases)
- [Commits](https://github.com/dtolnay/async-trait/commits)

---
updated-dependencies:
- dependency-name: async-trait
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-08 15:37:15 +00:00
dependabot[bot]
58fdc447a6
chore(deps): bump tempfile from 3.8.1 to 3.9.0 
Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.8.1 to 3.9.0.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.8.1...v3.9.0)

---
updated-dependencies:
- dependency-name: tempfile
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-08 15:36:35 +00:00
Nikita Galaiko
4a92abdd9e
Merge pull request #2191 from gitbutlerapp/unapply-ownership-hunks 
GB-776: Unapply ownership hunks
 2024-01-08 16:02:20 +01:00
Nikita Galaiko
a68064723d allow unapplying locked ownerships 2024-01-08 15:39:31 +01:00
Nikita Galaiko
aefeba8c7c support unapplying locked ownerships 2024-01-08 15:39:22 +01:00
Mattias Granlund
2fcc03e939 Fix branch change copy 
- shoud say you've switched _away_ from gitbutler/integration
 2024-01-08 14:19:56 +01:00
Nikita Galaiko
7ad9caa5bd
Merge pull request #2189 from gitbutlerapp/update-notify-version 
chore: update notify dependency to version 6.1.1
 2024-01-08 12:29:02 +01:00
Nikita Galaiko
7c8f8cc68d chore: update notify dependency to version 6.1.1 2024-01-08 12:21:45 +01:00
Nikita Galaiko
5eb481fe20
Merge pull request #2147 from gitbutlerapp/dependabot/cargo/serde_json-1.0.109 
chore(deps): bump serde_json from 1.0.108 to 1.0.109
 2024-01-08 12:17:06 +01:00
Nikita Galaiko
4060cf47c4
Merge pull request #2149 from gitbutlerapp/dependabot/cargo/tauri-build-1.5.1 
chore(deps): bump tauri-build from 1.5.0 to 1.5.1
 2024-01-08 12:16:58 +01:00
Nikita Galaiko
6fe7fbda95
Merge pull request #2152 from gitbutlerapp/dependabot/cargo/bstr-1.9.0 
chore(deps): bump bstr from 1.8.0 to 1.9.0
 2024-01-08 12:16:46 +01:00
Mattias Granlund
a19939ea39 Fix zoom shortcuts on Linux 2024-01-08 10:24:45 +01:00
Nikita Galaiko
644359b821
Merge pull request #2187 from gitbutlerapp/refactor-session-writer-and-reader 
refactor: with_reader for readers, open for writers
 2024-01-08 10:04:52 +01:00
Nikita Galaiko
6503a15309 refactor: with_reader for readers, open for writers 2024-01-08 10:00:38 +01:00
Nikita Galaiko
a22319009f use batch write for virtual branches 2024-01-08 09:02:19 +01:00
Nikita Galaiko
11f4956503 sessions writer to use batch writer 2024-01-08 09:02:19 +01:00
Nikita Galaiko
9b00ef5339 use lock in writer 2024-01-08 09:02:19 +01:00
Nikita Galaiko
9070bb3373 use branch in branch target reader 2024-01-08 09:02:19 +01:00
Nikita Galaiko
118f598845 use batch in branch reader 2024-01-08 09:02:19 +01:00
Nikita Galaiko
91c1a86bda read files via batch reader 2024-01-08 09:02:19 +01:00
Nikita Galaiko
118ebe9654 use batch reader for sessions 2024-01-08 09:02:19 +01:00
Nikita Galaiko
49af066180 satisfy clippy 2024-01-08 09:02:19 +01:00
Nikita Galaiko
bcbf2f4d5e use batch reader for deltas reader 2024-01-08 09:02:19 +01:00
Nikita Galaiko
6c6c86de82 implement reader::batch that auto-locks directories 2024-01-08 09:02:19 +01:00
Nikita Galaiko
b6a8411841 lock::Dir implementation 2024-01-08 09:02:19 +01:00
Nikita Galaiko
b72c6317ef refactor Reader implementation to use enum instead of trait and remove unnecessary public functions 2024-01-08 09:02:19 +01:00
Nikita Galaiko
4e52086aa1 refactor writer module to remove unnecessary trait and consolidate methods 2024-01-08 09:02:19 +01:00
Nikita Galaiko
c032f01f82 chore: refactor branch and target readers to use generic reader type 2024-01-08 09:02:19 +01:00
Nikita Galaiko
ab93d48e73 remove unused is_dir method from Reader trait and its implementations 2024-01-08 09:02:19 +01:00
Pavel Laptev
da5bacb4d3
Merge pull request #2186 from gitbutlerapp/experementing-with-app-icons 
Experementing with app icons
 2024-01-08 00:03:02 +01:00
Pavel Laptev
44e02739c9 - updated app icons 2024-01-07 23:57:21 +01:00
Pavel Laptev
c227b7dd39
Merge pull request #2185 from gitbutlerapp/experementing-with-app-icons 
experementing with app icons
 2024-01-07 23:09:37 +01:00
Pavel Laptev
12f05dbca6 - updated app icons 2024-01-07 23:03:57 +01:00
Mattias Granlund
f3a84e42dd Show button spinner while committing 2024-01-07 21:47:22 +01:00
Mattias Granlund
b13132b4a6 Slugify branch names differently 
- user requested / in branch names
 2024-01-07 15:24:21 +01:00
Mattias Granlund
29bacad3d9 Bugfix for context menu item disabled state 2024-01-07 15:02:57 +01:00
Mattias Granlund
f7c062eb7d Disable branch rename when it has integrated commits 2024-01-07 14:03:33 +01:00
Mattias Granlund
4381bdc196 Show gap between selected files in tree view 2024-01-06 13:28:08 +01:00