gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-18 14:31:30 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,515 Commits 151 Branches 1,064 Tags 60 MiB
a4f548e411
Commit Graph

7515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kiril Videlov
802e3419bd introduce a convinience GbConfig type 2024-06-04 15:35:29 +02:00
ndom91
5fa584f7d5
Merge branch 'ndom91/cleanup-toast-invocations' of github.com:gitbutlerapp/gitbutler into ndom91/cleanup-toast-invocations 2024-06-04 14:38:52 +02:00
ndom91
474a44b7ac
fix: restore most of showError function 2024-06-04 14:38:10 +02:00
ndom91
a245d06022
fix: restore most of showError function 2024-06-04 14:36:14 +02:00
ndom91
9c65a57146
Merge branch 'ndom91/cleanup-toast-invocations' of github.com:gitbutlerapp/gitbutler into ndom91/cleanup-toast-invocations 2024-06-04 14:24:27 +02:00
ndom91
3add7b41e6
fix: use toasts error method instead of vanilla svelte-french-toast 2024-06-04 14:23:54 +02:00
ndom91
ea5489f6c2 fix: revert usage back to svelte-french-toast 2024-06-04 14:15:32 +02:00
ndom91
4ec3a11221 fix: revert usage back to svelte-french-toast 2024-06-04 14:15:32 +02:00
ndom91
1ae74fdff6 chore: more TS cleanup 2024-06-04 14:15:32 +02:00
ndom91
4fe948c1f0 fix: showError TS 2024-06-04 14:15:32 +02:00
ndom91
f692d85b57 chore: prettier 2024-06-04 14:15:32 +02:00
ndom91
14abc11061 fix: cleanup toast showError method 2024-06-04 14:15:32 +02:00
ndom91
c87ca9d1f3 fix: rm unnecessary svelte-french-toast imports 2024-06-04 14:15:32 +02:00
ndom91
5c4131a060
Merge branch 'ndom91/cleanup-toast-invocations' of github.com:gitbutlerapp/gitbutler into ndom91/cleanup-toast-invocations 2024-06-04 14:14:51 +02:00
ndom91
aa7168d179
fix: revert usage back to svelte-french-toast 2024-06-04 14:14:40 +02:00
ndom91
95bbe6f18b
fix: revert usage back to svelte-french-toast 2024-06-04 14:12:09 +02:00
ndom91
abb40f4b9a
chore: more TS cleanup 2024-06-04 14:00:28 +02:00
ndom91
c49c696ade
fix: showError TS 2024-06-04 13:57:50 +02:00
Mattias Granlund
8d0c97dc09 Exclude pull requests when getting branch modifiedAt timestamp 2024-06-04 13:52:58 +02:00
Mattias Granlund
d0993b8acd Update updated_at timestamp after mutations 
- also drops unnecessary `.context()` from most `vb_state.set_branch(...)` calls
 2024-06-04 13:52:58 +02:00
ndom91
c0f014f76e
chore: prettier 2024-06-04 11:53:21 +02:00
ndom91
8fdf268557
fix: cleanup toast showError method 2024-06-04 10:55:17 +02:00
ndom91
71463b91c8
fix: rm unnecessary svelte-french-toast imports 2024-06-04 10:49:44 +02:00
Kiril Videlov
7cd1920d80
Merge pull request #3986 from gitbutlerapp/apply-branch-fix 
when the branch being applied has a merge commit do merge only
 2024-06-04 10:22:08 +02:00
Kiril Videlov
76284b0620 when the branch being applied has a merge commit do merge only 2024-06-04 10:10:32 +02:00
TheGB0077
848e33ac45 revert back to any 2024-06-04 04:27:51 -03:00
Mattias Granlund
bd77da52a9 Fix integrated commit lines in commit graph 2024-06-04 01:56:38 +02:00
Mattias Granlund
a4b2476e52 Fix rebase detection in commit graph 
- uses new fork points
 2024-06-04 00:52:09 +02:00
Mattias Granlund
30c1370140 Include fork point when getting remote branch data 2024-06-04 00:52:09 +02:00
Mattias Granlund
e68dc45359 Show fork point instead of merge base 2024-06-04 00:52:09 +02:00
Mattias Granlund
71aeb9a285 Fix another remote line bug in the commit graph 2024-06-03 23:12:48 +02:00
Mattias Granlund
850c8119e4 Suppress offline errors from octokit.js 2024-06-03 23:01:42 +02:00
Kiril Videlov
49af6f502a
Merge pull request #3969 from gitbutlerapp/handle-sign-failure 
handle sign failure
 2024-06-03 22:17:14 +02:00
Kiril Videlov
828bd31a4a add some additional context to the logs when this fails 2024-06-03 22:05:10 +02:00
Kiril Videlov
5fbdd86e5b add an informative toast message when signing fails 2024-06-03 21:49:12 +02:00
Kiril Videlov
28b49be9ae fail when signing enabled for GitButler but with error code 2024-06-03 21:31:14 +02:00
Kiril Videlov
0b57a44d63
Merge pull request #3978 from gitbutlerapp/add-git-config-module 
support setting signCommits git config
 2024-06-03 21:15:14 +02:00
TheGB0077
b39f7de921 fix import order lint 2024-06-03 15:58:41 -03:00
TheGB0077
9b791cc986 adjusted remaining handlers 2024-06-03 15:33:48 -03:00
TheGB0077
908c6cdff7 editor singleton added 2024-06-03 15:20:29 -03:00
TheGB0077
21d59b5e05 logic simplified 2024-06-03 14:28:04 -03:00
Mattias Granlund
a62567d22f Show avatar for integrated commit lines 2024-06-03 19:25:39 +02:00
Mattias Granlund
fbc43d45bb Fix one more commit lines bug 2024-06-03 18:07:48 +02:00
dependabot[bot]
0eb9702eaf
Bump the npm-updates group with 7 updates 
Bumps the npm-updates group with 7 updates:

| Package | From | To |
| --- | --- | --- |
| [openai](https://github.com/openai/openai-node) | `4.47.1` | `4.47.3` |
| [@codemirror/language](https://github.com/codemirror/language) | `6.10.1` | `6.10.2` |
| [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `7.10.0` | `7.11.0` |
| [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `7.10.0` | `7.11.0` |
| [posthog-js](https://github.com/PostHog/posthog-js) | `1.135.2` | `1.136.4` |
| [prettier](https://github.com/prettier/prettier) | `3.2.5` | `3.3.0` |
| [svelte-check](https://github.com/sveltejs/language-tools) | `3.7.1` | `3.8.0` |


Updates `openai` from 4.47.1 to 4.47.3
- [Release notes](https://github.com/openai/openai-node/releases)
- [Changelog](https://github.com/openai/openai-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openai/openai-node/compare/v4.47.1...v4.47.3)

Updates `@codemirror/language` from 6.10.1 to 6.10.2
- [Changelog](https://github.com/codemirror/language/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/language/compare/6.10.1...6.10.2)

Updates `@typescript-eslint/eslint-plugin` from 7.10.0 to 7.11.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.11.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 7.10.0 to 7.11.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.11.0/packages/parser)

Updates `posthog-js` from 1.135.2 to 1.136.4
- [Release notes](https://github.com/PostHog/posthog-js/releases)
- [Changelog](https://github.com/PostHog/posthog-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-js/compare/v1.135.2...v1.136.4)

Updates `prettier` from 3.2.5 to 3.3.0
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/3.2.5...3.3.0)

Updates `svelte-check` from 3.7.1 to 3.8.0
- [Release notes](https://github.com/sveltejs/language-tools/releases)
- [Commits](https://github.com/sveltejs/language-tools/compare/svelte-check-3.7.1...svelte-check-3.8.0)

---
updated-dependencies:
- dependency-name: openai
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: "@codemirror/language"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: posthog-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: svelte-check
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-03 15:44:10 +00:00
Mattias Granlund
0a10661de9 Bugfixes for commit lines 
- use correct shadow marker color on shadow line
- correctly calculate remote type
- fix shadow tooltip
 2024-06-03 17:25:00 +02:00
Kiril Videlov
40cfc55309 support setting signCommits git config 2024-06-03 17:00:14 +02:00
Caleb Owens
b1409b61a4
Merge pull request #3971 from gitbutlerapp/Introduce-quick-action-menu-for-creating-empty-commits 
Introduce quick action menu for creating empty commits
 2024-06-03 16:22:36 +02:00
Caleb Owens
2658c37f87 Enable adding blank commit with no commits already made 2024-06-03 16:18:54 +02:00
Caleb Owens
f8c8955613
Merge pull request #3970 from gitbutlerapp/Introduce-quick-action-menu-for-creating-empty-commits 
Feat: Add commit editing capabilities
 2024-06-03 16:13:27 +02:00
Caleb Owens
1771d8dcd2 Feat: Add commit editing capabilities 
going through the commit card, adding a blank commit before or after the current one
 2024-06-03 16:03:54 +02:00