gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-30 01:17:37 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,190 Commits 148 Branches 1,027 Tags 65 MiB
5646580183
Commit Graph

1199 Commits

Author SHA1 Message Date
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
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
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
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
Mattias Granlund
c3257691b9
Fix branch filtering 2023-12-13 16:09:58 +00:00
Mattias Granlund
be94eb6350 fix: update condition for hiding bots in branch filtering 2023-12-13 15:49:03 +00:00
Nikita Galaiko
38a733f1ca use backend branch update time 2023-12-13 16:42:28 +01:00
Nikita Galaiko
0cdf187115 ensure branch updated time is always up to date 2023-12-13 16:14:23 +01:00
Mattias Granlund
82b861758c Fix branch lane context menu 
- made it unclickable by mistake
 2023-12-13 15:10:42 +00:00
Mattias Granlund
dc6f23ccd3 Fix default state for filters 
- do not show little dot when checkboxes are checked, toggles are off
 2023-12-13 14:18:01 +00:00
Mattias Granlund
81c008c6e2 chore: remove console.log statement 2023-12-13 14:14:38 +00:00
Mattias Granlund
d60860267d feat: optimize update checking by reloading update store every 12 hours 2023-12-13 14:14:15 +00:00
Mattias Granlund
c23d1eb7e3 Refactor branch filter and apply new design 
- add toggle for hiding inactive
- choices persisted in localStorage
 2023-12-13 13:33:10 +00:00
Nikita Galaiko
483230b5c1
Merge pull request #2018 from gitbutlerapp/add-test-for-diff-correct-after-update 
Add test for diff correct after update
 2023-12-13 14:04:44 +01:00
Nikita Galaiko
fe1662d58a use target fetchedat time from backend 2023-12-13 13:50:29 +01:00
Nikita Galaiko
063e77c672 store last_fetched on target, not project 2023-12-13 13:40:41 +01:00
Nikita Galaiko
a93ac7a822
Merge pull request #2016 from gitbutlerapp/add-is-local-method 
do not shot "Open" for local commits
 2023-12-13 13:40:23 +01:00
Kiril Videlov
c8e63f24ba 🐛 fix: handle truncation when converting file metadata to u32 in git index entry 2023-12-13 12:45:24 +01:00
dependabot[bot]
e3796a1484
chore(deps): bump sentry from 0.31.8 to 0.32.0 
Bumps [sentry](https://github.com/getsentry/sentry-rust) from 0.31.8 to 0.32.0.
- [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.8...0.32.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 08:46:43 +00:00
Nikita Galaiko
f34f7ae20e
Merge pull request #1995 from gitbutlerapp/dependabot/cargo/sentry-tracing-0.32.0 
chore(deps): bump sentry-tracing from 0.31.8 to 0.32.0
 2023-12-13 09:42:24 +01:00