gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-27 11:36:48 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,015 Commits 157 Branches 1,070 Tags 61 MiB
2083296b48
Commit Graph

2015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mattias Granlund
2083296b48 Movet settings to repo folder 
Doing this even if we are planning to rename this folder, we need things
in the same place.
 2023-07-22 00:06:49 +01:00
Kiril Videlov
d6407dd93a more fixes 2023-07-21 21:30:46 +02:00
Kiril Videlov
ee5efbd7c6 header color 2023-07-21 21:30:46 +02:00
Scott Chacon
27d3f332ec
warn users that we are the committer (#789) 
also, first merge conflict resolved in GitButler!
 2023-07-21 18:53:19 +02:00
Kiril Videlov
01a7d1bbaf only show commit button if there is something to commit 2023-07-21 18:08:14 +02:00
Kiril Videlov
0961e04c9e fix lane overflow 2023-07-21 17:49:07 +02:00
Kiril Videlov
6e7cb1900d commit at the lane header 2023-07-21 17:16:23 +02:00
Scott Chacon
338d8c753d so dumb 2023-07-21 17:15:31 +02:00
Scott Chacon
265f8ba43d revert to github runners 2023-07-21 16:47:34 +02:00
Scott Chacon
c57d5759de
Merge pull request #784 from gitbutlerapp/show-recent-commits 
Adding recent commits to the branch base thing at the bottom
 2023-07-21 15:57:41 +02:00
Scott Chacon
acecda995e try testing on self-hosted 2023-07-21 15:40:53 +02:00
Kiril Videlov
59ca4b15be some more animations 2023-07-21 15:18:23 +02:00
Scott Chacon
fc7caad8f9 adding recent commits to the branch base thing at the bottom 2023-07-21 15:09:01 +02:00
Kiril Videlov
875ff90773 animate file card expanding 2023-07-21 14:53:17 +02:00
Nikita Galaiko
d87a3fb0e0 load diffs even if session is flushed 2023-07-21 14:41:15 +02:00
Kiril Videlov
79427412a5 style commits section 2023-07-21 14:33:04 +02:00
Nikita Galaiko
c23a611e71 update search index version 2023-07-21 14:29:01 +02:00
Nikita Galaiko
3e5da26ee2 bump tantivy 2023-07-21 14:14:52 +02:00
Scott Chacon
832237dc34
Merge pull request #780 from gitbutlerapp/upstream-branch-lane 
upstream branch lane
 2023-07-21 14:11:28 +02:00
Scott Chacon
32bef845df upstream branch lane 2023-07-21 14:07:57 +02:00
Nikita Galaiko
43d1b455d4 bump sentry anyhow 2023-07-21 13:32:16 +02:00
Nikita Galaiko
ab2df215a9 activate devtools nightly 2023-07-21 13:18:12 +02:00
Nikita Galaiko
fd713a5d67 add devtools feature 2023-07-21 13:18:12 +02:00
Scott Chacon
5732a1804f
Merge pull request #772 from gitbutlerapp/return-commits-with-base-branch 
Return commit list with base branch data
 2023-07-21 11:57:38 +02:00
Scott Chacon
e255e3b7a1 fix tests 2023-07-21 11:50:51 +02:00
Mattias Granlund
03f7ab304c Fix file icons by modifying CSP in relases 2023-07-21 10:40:18 +01:00
Kiril Videlov
2e64a268a1 inline modal for 2 phase comits 2023-07-21 11:13:06 +02:00
Nikita Galaiko
0892f58a10 fix compilation 2023-07-21 11:07:39 +02:00
Nikita Galaiko
de6bbe1650 reduce amount of events sent 2023-07-21 11:07:39 +02:00
Scott Chacon
f479f867d1 show upstream commits 2023-07-21 10:59:20 +02:00
Scott Chacon
2d1417f6b4 rename fixes 2023-07-21 10:29:41 +02:00
Scott Chacon
ab5582b47a returning commit list with base branch data, plus lots of renaming 2023-07-21 10:15:41 +02:00
Nikita Galaiko
5f8c5c267b cargo fmt 2023-07-21 09:30:29 +02:00
Nikita Galaiko
98fbf967f6 filter out base from tray 2023-07-21 09:30:29 +02:00
dependabot[bot]
daf79894b1 Bump sentry-debug-images from 0.31.4 to 0.31.5 in /src-tauri 
Bumps [sentry-debug-images](https://github.com/getsentry/sentry-rust) from 0.31.4 to 0.31.5.
- [Release notes](https://github.com/getsentry/sentry-rust/releases)
- [Changelog](https://github.com/getsentry/sentry-rust/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-rust/compare/0.31.4...0.31.5)

---
updated-dependencies:
- dependency-name: sentry-debug-images
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-21 08:59:53 +02:00
dependabot[bot]
46fd67a814 Bump rusqlite from 0.28.0 to 0.29.0 in /src-tauri 
Bumps [rusqlite](https://github.com/rusqlite/rusqlite) from 0.28.0 to 0.29.0.
- [Release notes](https://github.com/rusqlite/rusqlite/releases)
- [Changelog](https://github.com/rusqlite/rusqlite/blob/master/Changelog.md)
- [Commits](https://github.com/rusqlite/rusqlite/compare/v0.28.0...v0.29.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-21 08:59:41 +02:00
dependabot[bot]
8ff1b650b6 Bump tokio-tungstenite from 0.18.0 to 0.19.0 in /src-tauri 
Bumps [tokio-tungstenite](https://github.com/snapview/tokio-tungstenite) from 0.18.0 to 0.19.0.
- [Changelog](https://github.com/snapview/tokio-tungstenite/blob/master/CHANGELOG.md)
- [Commits](https://github.com/snapview/tokio-tungstenite/compare/v0.18.0...v0.19.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-21 08:59:32 +02:00
Scott Chacon
ede0c571f5
Merge pull request #769 from gitbutlerapp/can-commit-binary-files 
Binary diff support
 2023-07-21 08:57:34 +02:00
Nikita Galaiko
a8e35f5ef7 cargo fmt 2023-07-21 08:38:17 +02:00
Nikita Galaiko
b9e8e0f65d handlers: move tests into same file 2023-07-21 08:38:17 +02:00
Nikita Galaiko
fd741b1fa8 copy values inside dispatcher 2023-07-21 08:38:17 +02:00
Scott Chacon
1e4b2cc304 formatting 2023-07-21 08:08:14 +02:00
Scott Chacon
cd0ad44157 Some minimal stuff for the UI 
just don’t have an expand thing
 2023-07-21 08:03:56 +02:00
Scott Chacon
5fc68c8201 merged upstream 2023-07-21 07:57:38 +02:00
Mattias Granlund
28752f5a4f Undo spammy logging 2023-07-21 01:31:05 +01:00
Mattias Granlund
17da48886f Show filename first, then path 2023-07-21 01:17:24 +01:00
Mattias Granlund
4de1929264 Always preserve whitespace in hunks 2023-07-21 01:17:24 +01:00
Mattias Granlund
a1b682f5ff New branch drop zone should be h-full 2023-07-21 01:17:24 +01:00
Mattias Granlund
1e2c0d1c65 Double click file header to expand/collapse 2023-07-21 00:34:54 +01:00
Mattias Granlund
df91873521 Fix status offline indicator 
Also remove duplicate from settings page
 2023-07-21 00:34:54 +01:00