gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-17 05:51:36 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,620 Commits 152 Branches 1,061 Tags 60 MiB
1dd904b8a6
Commit Graph

7620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nico Domino
fde990294c
Merge branch 'master' into ndom91/modal-cleanup 2024-06-06 17:01:32 +02:00
Kiril Videlov
85065d9c3a
Merge pull request #4024 from gitbutlerapp/clean-up-core-git-Error 
remove unused variants of core::git::Error
 2024-06-06 17:01:16 +02:00
ndom91
ea70514b98
fix: avoid handling if no modalForm 2024-06-06 16:59:59 +02:00
Kiril Videlov
5922ed7459 remove error type core::git::Error 2024-06-06 16:49:33 +02:00
Nico Domino
268f8ab521
Merge branch 'master' into ndom91/add-corepack 2024-06-06 16:47:09 +02:00
Kiril Videlov
113d238753 cleanup config.rs unused functions 2024-06-06 16:41:19 +02:00
Kiril Videlov
462a98e5d1 remove unused variants of core::git::Error 2024-06-06 16:38:02 +02:00
ndom91
228fc6e462
fix: use the same version of pnpm across everything 2024-06-06 16:14:57 +02:00
Kiril Videlov
3f32e659e5
Merge pull request #4022 from gitbutlerapp/add-log-for-sign-commits-setting 
fix a bug where the "sign commits" toggle did not work
 2024-06-06 16:12:19 +02:00
ndom91
a0fb6060f0
feat: add packageManager package.json option and bump lock file to v9 2024-06-06 16:11:50 +02:00
Kiril Videlov
59abae2a04 fix a bug where the "sign commits" toggle did not work 2024-06-06 16:09:33 +02:00
Caleb Owens
d2d02eee7e
Merge pull request #4021 from gitbutlerapp/update-node-version-20.14 
Introduce a strict node version
 2024-06-06 16:06:04 +02:00
Caleb Owens
f3464a0136
Introduce a strict node version 2024-06-06 16:03:13 +02:00
Caleb Owens
452ae8fe7d
Merge pull request #4020 from gitbutlerapp/update-vscode-settings 
Add in some vscode settings
 2024-06-06 15:45:52 +02:00
Caleb Owens
50b5b88593
Add in some vscode settings 2024-06-06 15:43:21 +02:00
ndom91
ec9c4c0b68
Merge branch 'ndom91/hunk-viewer' of github.com:gitbutlerapp/gitbutler into ndom91/hunk-viewer 2024-06-06 15:36:27 +02:00
ndom91
6abbf581a8
fix: prettier 2024-06-06 15:36:18 +02:00
Nico Domino
8d7d23c5b6
Merge branch 'master' into ndom91/hunk-viewer 2024-06-06 15:32:30 +02:00
ndom91
347c53b9f7
fix: prettier 2024-06-06 15:26:33 +02:00
ndom91
01236a5dfa
fix: cleanup 2024-06-06 15:19:36 +02:00
Kiril Videlov
cdd596f8bc
Merge pull request #4018 from gitbutlerapp/sign-commit-if-configured 
sign-commit-if-configured
 2024-06-06 15:18:31 +02:00
Kiril Videlov
13f580dfbd signing error toast now happens on more requests 2024-06-06 15:02:57 +02:00
Kiril Videlov
307e055f5c update signing failure toast 2024-06-06 14:55:19 +02:00
Kiril Videlov
61dd48f915 on commit sign failure, set signing to false 
This way, subsequent attempts will succeed
 2024-06-06 14:52:25 +02:00
Nico Domino
3c7fcadbcf
Merge branch 'master' into ndom91/hunk-viewer 2024-06-06 14:47:01 +02:00
Pavel Laptev
6ee2bee101
text case updated to the Sentance case (#4016) 
* text case updated to the Sentance case

* text case update continue
 2024-06-06 14:38:11 +02:00
Nico Domino
ea3ff78a4f
Merge branch 'master' into ndom91/hunk-viewer 2024-06-06 14:32:14 +02:00
ndom91
c07bbbbdbd
chore: HunkLines.svelte prettier 2024-06-06 14:31:52 +02:00
ndom91
dac1af917b
fix: cleanup dispatching contextMenu events 2024-06-06 14:11:46 +02:00
Nico Domino
5a6d99c1ab
Merge pull request #4009 from TheGB0077/fix-windows-open-vscode 2024-06-06 13:58:34 +02:00
Nico Domino
e0e813399a
Merge branch 'master' into fix-windows-open-vscode 2024-06-06 13:56:57 +02:00
ndom91
e062573c9f
fix: rm need for clsx 2024-06-06 13:56:38 +02:00
Mattias Granlund
3a24886013 Fix a couple of bugs in commit lines component 
- rebased upstream without shadowed commits
- removed small 1px gap near the base
- base dashed upstream line
 2024-06-06 13:46:41 +02:00
ndom91
8f3a7873d5
fix: cleanup loading of HunkViewer/HunkSection 2024-06-06 13:37:23 +02:00
ndom91
b123f12b28
Merge branch 'master' into ndom91/hunk-viewer 2024-06-06 10:29:40 +02:00
Nico Domino
e00e54af7f
Merge pull request #4014 from gitbutlerapp/ndom91/enable-localdev-chrome 2024-06-06 10:28:23 +02:00
Nico Domino
6271fe5560
Merge branch 'master' into ndom91/modal-cleanup 2024-06-06 10:26:15 +02:00
ndom91
a9e3c22258
fix: update e2e test 2024-06-06 10:25:26 +02:00
ndom91
0b545a152a
fix: enable frontend without tauri 2024-06-06 10:16:22 +02:00
Kiril Videlov
f289ed7b6e
Merge pull request #4012 from gitbutlerapp/update-pnpm-lock-file-and-dependencieds 
remove proxy core::git::Oid
 2024-06-06 09:39:19 +02:00
Sebastian Thiel
d7c8586159
fix serde and some find-replace errors 
The first problem was that serde needed to see an extra annotation
for deserialzation of Options to work - maybe not the most optimal,
but it works.

The second and bigger issue was a find-replace error where `branch.tree`
was replaced with `branch.head`.
 2024-06-06 09:24:53 +02:00
Kiril Videlov
4d2798a1fd remove unused oid file 2024-06-06 00:45:41 +02:00
Kiril Videlov
0e694c7823 use serde with 2024-06-06 00:43:44 +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
Kiril Videlov
9c56a5f040 remove proxy core::git::Oid 2024-06-05 22:56:03 +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
ndom91
d471ab3e09
Merge branch 'ndom91/modal-cleanup' of github.com:gitbutlerapp/gitbutler into ndom91/modal-cleanup 2024-06-05 18:09:34 +02:00
ndom91
039e2eaedb
fix: simplify Modal rendering 2024-06-05 18:09:34 +02:00
ndom91
3f9fed6ed2
fix: rm svelte-outclick 2024-06-05 18:09:33 +02:00