Commit Graph

584 Commits

Author SHA1 Message Date
ndom91
01236a5dfa
fix: cleanup 2024-06-06 15:19:36 +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
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
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
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
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
ndom91
7eef0bde4e
fix: simplify Modal rendering 2024-06-05 18:09:20 +02:00
ndom91
6c206a823f
fix: rm svelte-outclick 2024-06-05 18:09:20 +02:00
ndom91
026bfb783a
fix: use hunksection instead of individual lines 2024-06-05 17:48:15 +02:00
TheGB0077
0abe2c2c9f fix: absolute path joins with normalized vscodepath for Windows campatibility 2024-06-05 12:35:59 -03:00
Caleb Owens
5c5bda651a
Remove some logs 2024-06-05 17:23:41 +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
Kiril Videlov
fc77db72f3 fix import order bullshit 2024-06-05 15:11:28 +02:00
Scott Chacon
e941d367f5
good fucking god formatting 2024-06-05 13:40:06 +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
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
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
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
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
Kiril Videlov
65a22691ee
Merge pull request #3958 from TheGB0077/vscodium-patch
feat: Open with VS Code also opens VS Codium if available, partial fix for #3646
2024-06-04 16:28:55 +02:00
Pavel Laptev
bf1dbdfbe1
Replace Tag with the Button component (#3993)
* added "light" class for the light mode

* button style updated

* remove Tag component with Button

* fix missing button property
2024-06-04 16:27:14 +02:00
Kiril Videlov
d065bdd1fc
Merge pull request #3975 from gitbutlerapp/dependabot/npm_and_yarn/npm-updates-f68f9679bd
Bump the npm-updates group with 7 updates
2024-06-04 16:08:02 +02:00
Kiril Videlov
cee47b0e59 update ui to use GbConfig 2024-06-04 15:48:54 +02:00
ndom91
474a44b7ac
fix: restore most of showError function 2024-06-04 14:38:10 +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
aa7168d179
fix: revert usage back to svelte-french-toast 2024-06-04 14:14:40 +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
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
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
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
5fbdd86e5b add an informative toast message when signing fails 2024-06-03 21:49:12 +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
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
Caleb Owens
2658c37f87 Enable adding blank commit with no commits already made 2024-06-03 16:18:54 +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
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
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
Kiril Videlov
40cfc55309 support setting signCommits git config 2024-06-03 17:00:14 +02:00
Caleb Owens
1be0f43d7d
Merge pull request #3968 from gitbutlerapp/fix-There-is-no-default-target-error-on-adding-a-project
Services: Improved base branch handling
2024-06-03 14:42:24 +02:00
Caleb Owens
342159ddd4 Services: Improved base branch handling
Added a constant for the error message when no default target is set and updated the error handling to use this new message.
2024-06-03 13:31:38 +02:00
Mattias Granlund
416ba78e9e Simplify parameters 2024-06-03 12:12:44 +02:00
Mattias Granlund
bbd0afb556 Move a few things around 2024-06-03 12:12:44 +02:00
Mattias Granlund
2948428632 Remove commit from Avatar params 2024-06-03 12:12:44 +02:00
Mattias Granlund
6d2643eb32 Pass Avatar to Line components
- lets us pass fewer props
2024-06-03 12:12:44 +02:00
Pavel Laptev
05dbf02d63
Fix history appearance animation (#3962) 2024-06-02 22:41:30 +02:00
Pavel Laptev
1436e42ef6
Merge pull request #3961 from gitbutlerapp/UI-history-view-fixes
UI fixes
2024-06-02 22:34:11 +02:00
Pavel Laptev
01f99c5a65 gray out snapshots within restore points 2024-06-02 22:31:50 +02:00
TheGB0077
a77f3ad6e3 VSCodium basic setup 2024-06-02 14:53:37 -03:00
Caleb Owens
98f87a3800 Add a reordering dropzone 2024-06-02 17:51:54 +02:00
Caleb Owens
3c5b7f9829 Move Draggable type declaration 2024-06-02 17:51:41 +02:00
Caleb Owens
b54b2efa27 Implement class for calculating commit offsets 2024-06-02 17:38:27 +02:00
Caleb Owens
f32e45dc21
Merge pull request #3953 from gitbutlerapp/Rename-remote-upstream-to-remote
Rename "remote upstream" to "remote"
2024-06-02 17:36:15 +02:00
Kiril Videlov
24e56a141a feat: Disable temporary translation of sideview content 2024-06-02 17:27:45 +02:00
Kiril Videlov
623d9954cd remove auto detect flow from UI 2024-06-02 16:02:08 +02:00
Pavel Laptev
0ffbbee4e7 "Signed" commit icon update 2024-06-02 15:24:32 +02:00
Caleb Owens
91179111ef Rename "remote upstream" to "remote" 2024-06-02 15:16:11 +02:00
Pavel Laptev
d4b167fda0 remove console.log 2024-06-02 11:45:54 +02:00
Pavel Laptev
34a514c652 List item last-child double border fix 2024-06-02 11:29:02 +02:00
Pavel Laptev
18567d13db upstream line height fix 2024-06-02 11:21:43 +02:00
Pavel Laptev
28e8b60ed8 List item last-child style updated 2024-06-02 11:14:49 +02:00
Pavel Laptev
ae07c224ba Loading state appearance fix 2024-06-02 10:57:04 +02:00
Pavel Laptev
3adf248ba6 Fix history view animation 2024-06-02 10:50:46 +02:00
Kiril Videlov
bff8cf1ca5
Merge pull request #3898 from Byron/error-handling-pt2
error handling ergonomics
2024-06-01 17:04:02 +02:00
Pavel Laptev
6946d6ddeb
Refactor-Tailwind-remove (#3936)
* remove teilwind CSS imports

* remove Teilwind package

* remove unused CSS

* update from master

* file format changes

* update reset file

* Drop unused Differ file

* update hunk line highlight color
2024-06-01 16:27:36 +02:00
Sebastian Thiel
dedd721dc3
capitalize error message
Let's not assume, nor force, that the backend provides error messages
in a format that we want to present. Hence we capitalize ourselves
for consistency.
2024-06-01 15:56:02 +02:00
Sebastian Thiel
20d84247e9
Prune Code to only what's used by the UI
Also adjust the `Code` documentation to clarify this - otherwise
we will have more and more variants and nobody actually cares.

The frontend code is adjusted as well, as its `Code` counterpart
contained unsused variants which are now removed.
2024-06-01 14:32:27 +02:00
Kiril Videlov
39e157fac6
Merge pull request #3939 from gitbutlerapp/show-infobox-if-workspace-update-stashed-branches
show infobox if workspace update stashed branches
2024-06-01 14:04:34 +02:00
Mattias Granlund
a50fa6613b Scale branch icons when zooming 2024-06-01 13:59:23 +02:00
Mattias Granlund
24466c8f11 Fix inconsistencies in commit graph
- terrible code, needs immediate refactoring
2024-06-01 13:56:53 +02:00
Kiril Videlov
dc385b6a77 Shows infobox if update workspace stashes branches
In case branches were stashed due to a conflict we want to communicate what happened. Hopefully soon we wont need any of that with the new conflict resolution flow
2024-06-01 13:51:17 +02:00
Kiril Videlov
72799dacf1 feat: Add help text to Revert button on Snapshot Card. 2024-06-01 12:54:05 +02:00
Caleb Owens
76e3b3f164 removed tooltip and added a hover state to help indicate clickableness 2024-05-31 22:59:46 +02:00
Caleb Owens
3ac4a18c93 disable tooltip length limiter 2024-05-31 14:33:20 +02:00
Caleb Owens
07ed7c8a88 Remove non-advanced mode 2024-05-31 14:33:07 +02:00
Caleb Owens
9cde2babcb
Merge pull request #3818 from gitbutlerapp/customizable-ai-prompts
Leeerrrooyyyy jeeennnkkkininnsss
2024-05-31 22:02:31 +02:00
Caleb Owens
0b36e4bcc4 Fixed some stupid shit 2024-05-31 22:00:08 +02:00
Pavel Laptev
564830d8ff
remove console.log (#3934) 2024-05-31 16:56:45 +02:00
Pavel Laptev
e8b70859bd
Revert "Refactor: Tailwind remove (#3932)" (#3933)
This reverts commit 89d97d2017.
2024-05-31 16:20:17 +02:00
Pavel Laptev
89d97d2017
Refactor: Tailwind remove (#3932)
* remove teilwind CSS imports

* remove Teilwind package

* remove unused CSS
2024-05-31 16:05:47 +02:00
Caleb Owens
509b72409d Fix prompt selector 2024-05-31 15:38:35 +02:00
Pavel Laptev
2b131097ce copy updated 2024-05-31 15:00:33 +02:00
Pavel Laptev
bd365fd08a UI: Custom AI prompts layouts updated 2024-05-31 15:00:33 +02:00
Pavel Laptev
3991cea11f default prompts updated
In order to correctly display code snippets, the code was wrapped in special triple backticks.
2024-05-31 15:00:33 +02:00
Pavel Laptev
c69d3956df icon typo fix 2024-05-31 15:00:33 +02:00
Pavel Laptev
e2f37d884b fix removed --size-1 variable error 2024-05-31 15:00:33 +02:00
Pavel Laptev
690d96c818 markdown styles updated 2024-05-31 15:00:33 +02:00
Pavel Laptev
bcd89d5c4c TextArea: added autoresize 2024-05-31 15:00:33 +02:00
Caleb Owens
a936f89485 Go to a manual save step 2024-05-31 15:00:33 +02:00
Caleb Owens
53abdffb5c Better defaults if prompt becomes invalid 2024-05-31 15:00:33 +02:00
Caleb Owens
d80475e563 Introduce Customizable AI Prompts 2024-05-31 15:00:33 +02:00
Caleb Owens
78c4fedbbe Replace PromptMessage[] with Prompt type 2024-05-31 14:59:41 +02:00
Mattias Granlund
d0bf62cb37 Add upstream line from commit lines base 2024-05-30 22:09:10 +02:00
Mattias Granlund
f1fa43060b Fix criteria for showing shadow commit line column 2024-05-30 21:38:49 +02:00
Mattias Granlund
68a71570a2 Stop the pr card from refreshing all the time
- a derived store is clutch for this
2024-05-30 21:35:11 +02:00
Kiril Videlov
088eb23f8e feat: Show merge base of virtual branch in commit list 2024-05-30 18:41:40 +02:00
Mattias Granlund
60f289f92a Fix bug in commit lines
- handle case where only some commits have been rebased
2024-05-30 19:19:19 +02:00
Caleb Owens
d70b73b256 Improve copy for merge commit 2024-05-30 19:03:49 +02:00
Caleb Owens
8c887c73cc Components: Enhanced Commit List Display
Updated the Remote Branch Preview component to display commits with proper styling and highlighting of first and last commit in a list.
2024-05-30 18:43:54 +02:00
Kiril Videlov
83e4886a73 feat(Board.svelte): show history view on error 2024-05-30 18:20:38 +02:00
Caleb Owens
b7587ecafc
Merge pull request #3908 from gitbutlerapp/fix-branch-files-list
Fix shift clicking files
2024-05-30 18:12:31 +02:00
Caleb Owens
20f253c3c5 Fix shift clicking files 2024-05-30 18:06:34 +02:00
Mattias Granlund
d9c96e84db Fix bug in commit lines
- we can rely on change id's when establishing commit relationships
2024-05-30 17:47:05 +02:00
Caleb Owens
726ec5ade9 Don't allow moving hunks if commit is upstream 2024-05-30 17:37:20 +02:00
Caleb Owens
3ee9e2724d Improve maybe move selection 2024-05-30 17:32:05 +02:00