Commit Graph

7420 Commits

Author SHA1 Message Date
Kiril Videlov
9c56a5f040 remove proxy core::git::Oid 2024-06-05 22:56:03 +02:00
Pavel Laptev
2feb18b29c
Add the section card disclaimer as a component (#4013)
* Add the section card disclaimer as a component

* foramtting fix
2024-06-06 00:12:46 +02:00
Caleb Owens
68a2293ae6
Merge pull request #4011 from gitbutlerapp/reimplement-hunk-locking-code-1
Filter out unapplied branches
2024-06-05 22:34:36 +02:00
Caleb Owens
67aad4e597
Filter out unapplied branches
We don't have any unstaged changes for unapplied branches, so there is
nothing there to lock.
2024-06-05 22:21:50 +02:00
Caleb Owens
8aebcb4164
Merge pull request #4008 from gitbutlerapp/reimplement-hunk-locking-code-1
reimplement-hunk-locking-code
2024-06-05 17:44:14 +02:00
Caleb Owens
d61879c2a1
Rust... just... please.... 😢 2024-06-05 17:31:37 +02:00
Caleb Owens
5c5bda651a
Remove some logs 2024-06-05 17:23:41 +02:00
Caleb Owens
ed3294a692
Make clippy a happy clippy 2024-06-05 17:23:11 +02:00
Caleb Owens
31b240265b
Undo all extra refactoring 2024-06-05 17:22:22 +02:00
Caleb Owens
9d93bd8d9d
Defactor workdir 2024-06-05 17:19:26 +02:00
Caleb Owens
c3e9a22454
Put new implementation behind a feature flag 2024-06-05 17:18:12 +02:00
Caleb Owens
d9822be161
Reimplement compute_locks 2024-06-05 17:17:36 +02:00
Scott Chacon
3358e0ebf3
Merge pull request #4002 from gitbutlerapp/commit-signing-settings
Commit Signing Settings
2024-06-05 15:23:41 +02:00
Kiril Videlov
fc77db72f3 fix import order bullshit 2024-06-05 15:11:28 +02:00
Kiril Videlov
f915304e34 Merged origin/master into commit-signing-settings 2024-06-05 15:10:06 +02:00
Kiril Videlov
65471f3cc6
Merge pull request #4006 from gitbutlerapp/find-branch-refname-failure-handling
fix a bug in handling the case of remote refname being none
2024-06-05 14:54:06 +02:00
Kiril Videlov
665ab4952a rm some accidentally duplicated code 2024-06-05 14:41:09 +02:00
Kiril Videlov
f4ec31f81b fix a bug in handling the case of remote refname being none 2024-06-05 14:31:26 +02:00
Scott Chacon
df06c469c2
Merge branch 'master' into commit-signing-settings 2024-06-05 14:13:53 +02:00
Scott Chacon
b8f897e3ae
gotta love rust 2024-06-05 13:41:58 +02:00
Scott Chacon
e941d367f5
good fucking god formatting 2024-06-05 13:40:06 +02:00
Kiril Videlov
9760cee950
Merge pull request #4004 from gitbutlerapp/sign-commits-preference-form
fix a bug in toggling commit signing
2024-06-05 13:23:57 +02:00
Kiril Videlov
b19c368842 fix a bug in toggling commit signing 2024-06-05 13:22:26 +02:00
Scott Chacon
60ebb07f91
fix import order. because thats important 2024-06-05 13:07:16 +02:00
Scott Chacon
ecff9e5b3a
formatting 2024-06-05 13:04:23 +02:00
Scott Chacon
82edcab1a6
Merge remote-tracking branch 'origin/master' into commit-signing-settings 2024-06-05 13:03:28 +02:00
Nico Domino
9f51fa8732
Merge pull request #3974 from gitbutlerapp/ndom91/cleanup-telemetry-toggles 2024-06-05 10:55:17 +02:00
ndom91
ca3a7655f0 chore: prettier 2024-06-05 10:47:35 +02:00
ndom91
81ae913606 fix: rm unnecessary preventDefaults 2024-06-05 10:47:35 +02:00
ndom91
e6167b376a fix: cast number to boolean 2024-06-05 10:47:35 +02:00
ndom91
407c60ded2 fix: Toggle on:click handler and section double event handling 2024-06-05 10:47:35 +02:00
ndom91
aab2047d45 fix: telemetry card toggles 2024-06-05 10:47:35 +02:00
Nico Domino
bfa4f1793d
Merge pull request #3988 from gitbutlerapp/ndom91/cleanup-toast-invocations 2024-06-05 10:47:23 +02:00
Nico Domino
c670ff5f25
Merge branch 'master' into ndom91/cleanup-toast-invocations 2024-06-05 10:45:13 +02:00
ndom91
a116f51cb5
chore: revert unnecessary changes 2024-06-05 10:38:30 +02:00
Scott Chacon
b60a66452d
merge upstream 2024-06-05 10:17:03 +02:00
Scott Chacon
a6e5abb620
can check commit signing 2024-06-05 10:14:49 +02:00
Caleb Owens
a44e9c6c84
Merge pull request #3996 from gitbutlerapp/Performance-improvements-of-file-watcher
Memoize derive calls
2024-06-05 07:30:51 +02:00
Pavel Laptev
fb4f118e23
Minor CSS fixes (#4001)
* Notification message padding fix

* dropdown position fix

* "dropdownPosition" renamed to "menuPosition"
2024-06-05 03:15:16 +02:00
Pavel Laptev
eddee86719
bug fixes of the px2rem refactoring (#4000)
* bug fixes of the px2rem refactoring

* formatting fixes

* formatting fixes
2024-06-05 02:47:32 +02:00
Pavel Laptev
1451534b51
Replace px with rem (#3998)
* add the plugin

* replace size variables with px

* formatting

* remove px + px from calc functions

* replaced rem with px

* update rem calculation in functions

* Update Button.svelte

* replace string with number values

* scrollbar appearance bug

* formatting fix
2024-06-05 02:32:49 +02:00
Kiril Videlov
961edf52c4
Merge pull request #3999 from gitbutlerapp/refactor-diff-workdir
refactor-diff-workdir
2024-06-05 01:33:04 +02:00
Kiril Videlov
4a54f74aa2 remove field access 2024-06-05 01:19:23 +02:00
Kiril Videlov
e63081c69d remove core::git::Repository shell type 2024-06-05 01:11:10 +02:00
Caleb Owens
4c7a8ce9b9
Merge pull request #3997 from gitbutlerapp/Add-nowrap-to-tag-buttons
Add nowrap to tag buttons
2024-06-04 20:51:44 +02:00
Caleb Owens
85fecc1faf
Add nowrap to tag buttons 2024-06-04 20:32:40 +02:00
Caleb Owens
d89281fdcc
Memoize derive calls
If we call files() 90 odd times, it will create 90 different derived stores. This means that we're going to do an awful lot of extra work as each update to the selected ids will trigger 90 jobs.

By memoizing the store, we will only ever create one derived object and as such eliminate the dupilcate work.
2024-06-04 19:59:30 +02:00
Caleb Owens
95eca10174
Merge pull request #3995 from gitbutlerapp/Use-tripple-equality
Use triple equals
2024-06-04 17:43:08 +02:00
Caleb Owens
4ef6b30255
GLORY BE TO THE TRIPPLE EQUAL 2024-06-04 17:38:57 +02:00
Mattias Granlund
7978c67e6a Convert parent/children into prev/next for commit traversal
- used in creating commit graphs
2024-06-04 17:01:13 +02:00