Commit Graph

548 Commits

Author SHA1 Message Date
ndom91
15f5bdefac
fix: limit hunk viewer to 2500 lines 2024-06-07 09:37:53 +02:00
Kiril Videlov
61226358b4
Revert "fix: simplify Modal logic" 2024-06-06 22:52:26 +02:00
Mattias Granlund
81feed64d7 More fixes for commit lines 2024-06-06 18:39:49 +02:00
Nico Domino
ce5dced72f
Merge branch 'master' into ndom91/hunk-viewer 2024-06-06 17:32:45 +02:00
ndom91
5595ac1398
fix: cleanup extra squirrely brace 2024-06-06 17:32:19 +02:00
Nico Domino
fde990294c
Merge branch 'master' into ndom91/modal-cleanup 2024-06-06 17:01:32 +02:00
ndom91
ea70514b98
fix: avoid handling if no modalForm 2024-06-06 16:59:59 +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
Kiril Videlov
59abae2a04 fix a bug where the "sign commits" toggle did not work 2024-06-06 16:09:33 +02:00
Caleb Owens
f3464a0136
Introduce a strict node version 2024-06-06 16:03:13 +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
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