Commit Graph

5451 Commits

Author SHA1 Message Date
Mattias Granlund
684f57a1b0 Fix status comparison for disabling merege button 2024-03-06 14:19:49 +02:00
Kiril Videlov
54293176d5 style: fix typo in readme 2024-03-06 11:02:13 +01:00
Kiril Videlov
8aa0db409d
Merge pull request #3040 from gitbutlerapp/Filter-active-branches-by-flag
when locking hunks only consider commits from applied branches
2024-03-05 18:51:44 +01:00
Kiril Videlov
99df783a0a
when locking hunks only consider commits from applied branches 2024-03-05 18:32:59 +01:00
Josh Junon
82f102e106
Merge pull request #3038 from gitbutlerapp/try-from-part-1
move most `TryFrom`  initialization into main instead of initialization on demand
2024-03-05 18:08:10 +01:00
Josh Junon
c4f4b4cc75 move most TryFrom initialization into main instead of initialization on-demand 2024-03-05 17:54:27 +01:00
Pavel Laptev
1696629568
Merge pull request #3037 from gitbutlerapp/New-icon
feat: add new icon for logs in the icon library
2024-03-05 16:19:25 +01:00
Pavel Laptev
d34184c1da feat: add new icon for logs in the icon library 2024-03-05 16:15:16 +01:00
Pavel Laptev
204a30a847
Merge pull request #3036 from gitbutlerapp/Update-icons-1
icons small fixes
2024-03-05 14:55:44 +01:00
Pavel Laptev
18f9ae97bf icons small fixes
- sort icons alphabetically
- fix radius value for the spinner icon
2024-03-05 14:54:01 +01:00
Kiril Videlov
935465669b
Merge pull request #3023 from gitbutlerapp/dependabot/cargo/cargo-security-group-15c8ac57de
Bump the cargo group group with 4 updates
2024-03-05 10:54:40 +01:00
Mattias Granlund
3c86868d6f Fix file preview when draggin from file tree
- fixes #3029
2024-03-05 01:29:42 +02:00
Daniel Kranich
9fc20018b0 Improve new branch name detection
Improved the new branch name detection for auto generating branch names. Now uses a regex to match new branch names more explicitly and will avoid branch name generation loops when 'virtual branch' is a string used often in the diff. Fixes issue #3017
2024-03-05 01:22:39 +02:00
Mattias Granlund
6234549c0b Do more to prevent stuck busy.. indicator
- not sure why this was not addressed earlier
2024-03-05 00:49:54 +02:00
Mattias Granlund
5ad6db4e07 Set file selection on drag when necessary
- the behaviour was unexpected if another file was already open
2024-03-05 00:49:24 +02:00
Mattias Granlund
e4fab86085 Fix bg when dragging not selected files 2024-03-05 00:47:34 +02:00
Mattias Granlund
dcd0506999 Fix missing prop error for FileTree component
- project property was missing from svelte:self tags
2024-03-05 00:43:24 +02:00
Mattias Granlund
2691365474 Make UI faster with mousedown over click
- considered all on:click events but could have missed some
- actions that modify state still use on:click
2024-03-05 00:21:35 +02:00
dependabot[bot]
3d5e4d7ad1
Bump the cargo group group with 4 updates
Bumps the cargo group group with 4 updates: [h2](https://github.com/hyperium/h2), [mio](https://github.com/tokio-rs/mio), [openssl](https://github.com/sfackler/rust-openssl) and [rsa](https://github.com/RustCrypto/RSA).


Updates `h2` from 0.3.21 to 0.3.24
- [Release notes](https://github.com/hyperium/h2/releases)
- [Changelog](https://github.com/hyperium/h2/blob/v0.3.24/CHANGELOG.md)
- [Commits](https://github.com/hyperium/h2/compare/v0.3.21...v0.3.24)

Updates `mio` from 0.8.9 to 0.8.11
- [Release notes](https://github.com/tokio-rs/mio/releases)
- [Changelog](https://github.com/tokio-rs/mio/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tokio-rs/mio/compare/v0.8.9...v0.8.11)

Updates `openssl` from 0.10.57 to 0.10.64
- [Release notes](https://github.com/sfackler/rust-openssl/releases)
- [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.57...openssl-v0.10.64)

Updates `rsa` from 0.9.2 to 0.9.5
- [Changelog](https://github.com/RustCrypto/RSA/blob/master/CHANGELOG.md)
- [Commits](https://github.com/RustCrypto/RSA/compare/v0.9.2...v0.9.5)

---
updated-dependencies:
- dependency-name: h2
  dependency-type: indirect
  dependency-group: cargo-security-group
- dependency-name: mio
  dependency-type: indirect
  dependency-group: cargo-security-group
- dependency-name: openssl
  dependency-type: indirect
  dependency-group: cargo-security-group
- dependency-name: rsa
  dependency-type: indirect
  dependency-group: cargo-security-group
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-04 22:05:33 +00:00
Pavel Laptev
a720d4fcc9
Merge pull request #3021 from gitbutlerapp/Add-Thank-you-banner
Profile page updates
2024-03-04 22:51:23 +01:00
Pavel Laptev
86a999fbe8 non exisiting property remove 2024-03-04 22:49:03 +01:00
Pavel Laptev
2a1eb898a7 remove unused import and commented code 2024-03-04 22:41:11 +01:00
Pavel Laptev
7d80feb77c Profile page updated
- added "thank you" banner
- "Log out" button was moved to the profile section
- small CSS fixes
2024-03-04 22:36:11 +01:00
Pavel Laptev
d108788351 style: update success icon alignment in project setup component 2024-03-04 20:58:52 +01:00
Josh Junon
6dbd0b677e
Merge pull request #3014 from gitbutlerapp/fix-windows-warnings
fix warnings on non-macos systems
2024-03-04 17:49:34 +01:00
Josh Junon
8384648228
fix warnings on non-macos systems 2024-03-04 17:00:33 +01:00
Josh Junon
04b04dc5bd
Merge pull request #3013 from gitbutlerapp/windows-list-item-fix
fix list item overflow on windows
2024-03-04 16:54:43 +01:00
Josh Junon
84684a3f29 fix list item overflow on windows 2024-03-04 16:44:22 +01:00
Josh Junon
fd80158e21
Merge pull request #3010 from gitbutlerapp/set-prune-expire
set `gc.pruneExpire` to `never` when opening repositories
2024-03-04 14:15:50 +01:00
Josh Junon
c6e3477a86 set gc.pruneExpire to never when opening repositories 2024-03-04 14:03:11 +01:00
Josh Junon
13cf45accc
Merge pull request #3006 from gitbutlerapp/Virtual-branch-4
initial round of pedantic clippy lint fixes
2024-03-04 13:09:12 +01:00
Josh Junon
5215317a7d initial round of pedantic clippy lint fixes 2024-03-04 12:58:41 +01:00
Josh Junon
79a857bb84
Merge pull request #3005 from gitbutlerapp/Virtual-branch-4
eliminate unused variable
2024-03-04 12:25:46 +01:00
Josh Junon
0f4b195e56 eliminate unused variable 2024-03-04 12:09:11 +01:00
Pavel Laptev
3b6199e457
Merge pull request #3002 from gitbutlerapp/Add-resizer-dragging-state
feat: add support for tracking if the resizer is being dragged in the navigation component
2024-03-03 23:55:15 +01:00
Pavel Laptev
34ea782123 feat: add support for tracking if the resizer is being dragged in the navigation component 2024-03-03 23:53:42 +01:00
Pavel Laptev
28c80bb4f7
Merge pull request #3000 from gitbutlerapp/Styles-updates
Styles updates
2024-03-03 23:00:56 +01:00
Pavel Laptev
4ca8703fc6 Commit card styles updates
- Fix card styles for cases when there are no commits
- card `min-height` removed
2024-03-03 22:56:38 +01:00
Pavel Laptev
82a5e0267f Styles updates: Fold navigation button hover 2024-03-03 22:40:13 +01:00
Pavel Laptev
8f0536fdc8 Not render commits div if there are no commits 2024-03-03 22:40:13 +01:00
Pavel Laptev
ac376c1b03 document format to pass Lint checks 2024-03-03 22:40:13 +01:00
Pavel Laptev
a74b60e4da Branch icons styles update
- Branch icon code rafactor
- Virtual branch color changed
2024-03-03 22:40:13 +01:00
Kiril Videlov
28a91aef58
Merge pull request #2999 from gitbutlerapp/show-correct-number-of-context-lines-for-commits
fixes a bug where committed diffs may show additional context lines
2024-03-03 22:25:24 +01:00
Kiril Videlov
292a9e1128
fixes a bug where committed diffs may show additional context lines 2024-03-03 22:14:55 +01:00
Kiril Videlov
7504f72711
Merge pull request #2998 from gitbutlerapp/lower-trace-sample-rate
lower sentry performance sample rate
2024-03-03 21:12:48 +01:00
Kiril Videlov
113da1f752
lower sentry performance sample rate 2024-03-03 21:09:47 +01:00
Kiril Videlov
ef2150520f
Merge pull request #2997 from gitbutlerapp/support-the-new-posthog-endpoint
support the new posthog endpoint
2024-03-03 20:26:10 +01:00
Kiril Videlov
f0062516ea
support the new posthog endpoint 2024-03-03 20:16:29 +01:00
Kiril Videlov
d89ff487a2
Merge pull request #2928 from alabhyajindal/navigate
Added keyboard shortcuts for file navigation
2024-03-03 18:40:51 +01:00
Kiril Videlov
7fdb26b139 fixes an merge conflict resolution mistake 2024-03-03 18:39:16 +01:00