gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-26 12:24:26 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,203 Commits 149 Branches 1,019 Tags 64 MiB
257d61bec8
Commit Graph

4203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavel Laptev
257d61bec8
Merge pull request #2062 from gitbutlerapp/new-icon-ai-small 
new icon "ai-small"
 2023-12-15 14:08:16 +01:00
Mattias Granlund
cd0e209f12 feat: add remote branch display in branch card header 
The changes in this commit add the ability to display the name of the remote branch in the branch card header. This provides better visibility and context for users when working with branches.
 2023-12-15 12:58:53 +00:00
Pavel Laptev
73d171eafd chore: new ai icon 2023-12-15 13:56:42 +01:00
Pavel Laptev
52fa3e3a62
Merge pull request #2060 from gitbutlerapp/space-between-branches 
Space between branches
 2023-12-15 13:08:33 +01:00
Pavel Laptev
c955f1f417 updated space between branches 2023-12-15 13:06:51 +01:00
Nikita Galaiko
2b1c7d21c1
Merge pull request #2059 from gitbutlerapp/virtual-branch-3 
Virtual branch
 2023-12-15 13:00:20 +01:00
Nikita Galaiko
7874e60bbd only verify ssh url hosts 2023-12-15 12:55:13 +01:00
Nikita Galaiko
ed44b4e521
Merge pull request #2058 from gitbutlerapp/handle-fetch-project-error 
Handle fetch project error
 2023-12-15 12:42:59 +01:00
Nikita Galaiko
587826ef7f handle fetch errors in the watcher 2023-12-15 12:31:11 +01:00
Kiril Videlov
94f476eeb7 🔧 fix: improve UI text and options for Git authentication configuration 2023-12-15 12:02:27 +01:00
Mattias Granlund
eb6f224949 Fix generate message button 
- regressed when removing square/svelte-store
 2023-12-15 10:58:51 +00:00
Nikita Galaiko
cede6734b0
Merge pull request #2055 from gitbutlerapp/update-projects-and-apply-branch 
Update projects and apply branch
 2023-12-15 11:07:58 +01:00
Nikita Galaiko
2544e48216 consider force push preference when applying branches 2023-12-15 10:56:38 +01:00
Nikita Galaiko
5646580183
Merge pull request #2052 from gitbutlerapp/create-virtual-branch-from-branch 
Create virtual branch from branch
 2023-12-15 10:54:55 +01:00
Nikita Galaiko
135b78a2bf use vbranch time over remote branch time 2023-12-15 10:46:36 +01:00
Kiril Videlov
0938c82793 🐛 fix: prevent duplicate authors from being added when remoteBranch is present but pr is not 2023-12-15 10:43:52 +01:00
Mattias Granlund
0d008ff74b Prevent branch list item overflow 
- truncate long name field with ellipsis
 2023-12-15 09:43:38 +00:00
Nikita Galaiko
b2430a6f15 add tests and fix implementation for creating virtual branch from branch 2023-12-15 10:27:39 +01:00
extrawurst
f645077c6f
GB-727: Add commit msg hook (#2045) 2023-12-14 19:03:49 +01:00
Nikita Galaiko
6287021f9a
Merge pull request #2050 from gitbutlerapp/handle-default-authentication-flows 
Handle default authentication flows
 2023-12-14 18:28:39 +01:00
Nikita Galaiko
5006cd2e05 fallback to default after generated 2023-12-14 18:24:22 +01:00
Mattias Granlund
183e044700 Fix lint errors required by new version of prettier 2023-12-14 17:02:11 +00:00
Mattias Granlund
19a27b0712 chore: update posthog-js to version 1.95.1 and prettier to version 3.1.1 2023-12-14 17:02:11 +00:00
Qix
6a9abff31f
Merge pull request #2048 from gitbutlerapp/feature-gate-unix-imports 
Feature-gate unix imports
 2023-12-14 17:13:15 +01:00
josh@gitbutler.com
686189f9ee Feature-gate unix imports 2023-12-14 17:08:11 +01:00
Qix
81e2989b75
Merge pull request #1987 from gitbutlerapp/errors-v2 
add new error types
 2023-12-14 16:25:54 +01:00
Mattias Granlund
53dba74be8 Filter out remote branches that aren't ahead 2023-12-14 15:24:51 +00:00
josh@gitbutler.com
4dcbcf5540 add new error types 2023-12-14 16:20:04 +01:00
Mattias Granlund
0503c803e8 style: add padding to empty message in project list 2023-12-14 15:19:30 +00:00
Nikita Galaiko
9257381769
Merge pull request #2039 from gitbutlerapp/update-key-preferences-gb-742 
update key preferences GB-742
 2023-12-14 16:13:56 +01:00
Nikita Galaiko
4ddc970747 feat: add support for default and git credentials helper as preferred SSH key options in the UI 2023-12-14 15:22:00 +01:00
extrawurst
9b00b5fe7d
GB-728: run post commit hook (#2042) 2023-12-14 13:47:45 +01:00
Mattias Granlund
31802477eb Fix project selection bug 
- branches in branch list were not being updated
 2023-12-14 12:04:34 +00:00
Mattias Granlund
072721c034 style: update width and min-width of .hunk__inner_inner class to ensure proper layout on different screen sizes 2023-12-14 11:20:08 +00:00
Mattias Granlund
35b02d7e5f Hide pr filter if not signed into github 2023-12-14 10:51:52 +00:00
Mattias Granlund
b031c50989 Fix hunk dragging style bug 
- draggable elements need unstyeld containers
 2023-12-14 10:41:06 +00:00
Mattias Granlund
bd2beac459 Fix hunk menu by using new context menu 2023-12-14 10:01:08 +00:00
Nikita Galaiko
9e8a3e57c9
Merge pull request #2037 from gitbutlerapp/fix-merge-tree-index-variable 
Fix merge tree index variable
 2023-12-14 10:12:27 +01:00
Nikita Galaiko
bfb264f93f more tests 2023-12-14 10:07:27 +01:00
Nikita Galaiko
845f9c3862
Merge pull request #2036 from gitbutlerapp/update-modifiedat-and-updated-at 
Update modifiedat and updated_at
 2023-12-14 09:43:35 +01:00
Nikita Galaiko
3b86f4cf05 updatedTimestampMs => updatedAt 2023-12-14 09:38:53 +01:00
Mattias Granlund
d320beec33 Allow row click in branch filter 2023-12-13 23:38:55 +00:00
Mattias Granlund
2ef023d4f6 Fix branch deletion 
- modal disappeared after menu auto closes
 2023-12-13 23:28:17 +00:00
Mattias Granlund
0df859366c Show filtered branch count in sidebar rather than total 2023-12-13 23:23:27 +00:00
Mattias Granlund
ecf229a018 Get rid of square/svelte-store 
- rewrite simplified version of persisted store
- replace all usages with new version
- convert updater store to AppUpdate
 2023-12-13 23:08:55 +00:00
Pavel Laptev
faf93442e4
Merge pull request #2030 from gitbutlerapp/update-context-menu-checkboxes 
Update context menu checkboxes
 2023-12-13 21:00:47 +01:00
Pavel Laptev
522e0546f5 Filter popup menu checkbox and toggle size updated 2023-12-13 20:59:01 +01:00
Kiril Videlov
e3c257cb26 🔧 fix: disable action button when branch has no files or is not active 2023-12-13 20:41:32 +01:00
Kiril Videlov
69e15844d9 🔨 chore: add check to prevent reloading when inactive 2023-12-13 19:25:57 +01:00
Mattias Granlund
26eafe27ae Move spacer component to $lib 2023-12-13 16:10:16 +00:00