Kiril Videlov
9f318626f8
Merge pull request #3737 from anaisbetts/flushable-debounce
...
Avoid file locks by being smarter about when we try to rebuild our information
2024-05-21 13:47:54 +02:00
Kiril Videlov
c7401cc790
Merge pull request #3794 from gitbutlerapp/dependabot/github_actions/pnpm/action-setup-4
...
Bump pnpm/action-setup from 3 to 4
2024-05-21 13:43:58 +02:00
Caleb Owens
0085c0901d
Merge pull request #3802 from anaisbetts/disallow-unc-paths
...
Disallow UNC paths
2024-05-21 12:27:34 +01:00
Ani Betts
532715fd96
Shell Scripts can't have CRLF
2024-05-21 13:02:32 +02:00
Ani Betts
eece290edd
Stop users from adding project paths that won't work
2024-05-21 12:44:10 +02:00
Ani Betts
4e68e593e5
Stop trashing every file on Prettier
2024-05-21 12:37:39 +02:00
Ani Betts
a47ebbc22d
Don't show command prompt when commit signing is enabled
2024-05-21 12:04:41 +02:00
Mattias Granlund
21e98fd9f2
Simplify getting default target
...
- remove try function in favor of returning error
- drop unused function
2024-05-21 12:02:38 +02:00
Caleb Owens
e2c88d87cf
Merge pull request #3781 from gitbutlerapp/improve-lazy-file-list
...
Use ScrollableContainer's bottomReached event to load more
2024-05-21 10:58:44 +01:00
Caleb Owens
b061537952
Use ScrollableContainer's bottomReached event to load more
...
Bit of a refactor over my async/await based gradual rendering.
It was still struggling if you had in the neigherbourhood of 9000 files, so this will only render as the user scrolls down.
There is still the issue of scrolling taking quite a long time, but it feels like the solution would need to be a floating commit button.
2024-05-21 10:38:22 +01:00
Ani Betts
f54c12fd55
Halve the dead air time
2024-05-21 11:03:18 +02:00
Anaïs Betts
d23ca10028
Bring back tempfile moves
2024-05-21 10:36:22 +02:00
Ani Betts
8e65ed6be8
Merge remote-tracking branch 'upstream/master' into flushable-debounce
...
* upstream/master:
Fix shadow line height in commits section
2024-05-21 10:39:07 +02:00
Ani Betts
12143b0a54
Embrace your Chill, cargo
2024-05-21 10:39:00 +02:00
Mattias Granlund
b1cf9b4e10
Fix shadow line height in commits section
2024-05-21 10:32:31 +02:00
Ani Betts
b4b0de6a3c
Merge remote-tracking branch 'upstream/master' into flushable-debounce
...
* upstream/master: (85 commits)
History and minor UI fixes (#3797 )
History fixes (#3796 )
make GitGuardian happy
bump playwright version
add vitest exclude for node_modules
Remove unused exports from ipc
Update auth.ts to use absolute import
Use correct invoke function
setup for async tasks on oplog update
formatting
save and restore the gitbutler/integration branch
remove unneccessary CSPs
Fix ollama request security
fix: forgot the port
feat: Set default snapshot lines threshold to 20 when undefined
fix: Updated connect-src to allow local connections for ollama
Minor tweaks to CSS and use real branch name
Unmount history component when hidden
Fix bug leaving PR button visible
Small refactor of history component
...
2024-05-21 10:29:42 +02:00
Pavel Laptev
6e6272983b
History and minor UI fixes ( #3797 )
...
* Convert Capital case to Uper case "History menu"
* UI updates: target branch styles
* Remove console.log
* CSS: space between "Trunk" and the timer
* UI: reversed chevron arrows fix
* remove commented console.log
* UX: toggle file preview in History
* UI: target branch set animation fix
2024-05-21 01:07:22 +02:00
Pavel Laptev
8c78395ca3
History fixes ( #3796 )
...
* History fixes
- fix footrer button
- added a method to listed if there are no snapshots to load
- style fixes
* formatting
2024-05-20 19:28:03 +02:00
dependabot[bot]
35abc044c0
Bump pnpm/action-setup from 3 to 4
...
Bumps [pnpm/action-setup](https://github.com/pnpm/action-setup ) from 3 to 4.
- [Release notes](https://github.com/pnpm/action-setup/releases )
- [Commits](https://github.com/pnpm/action-setup/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: pnpm/action-setup
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-05-20 15:17:52 +00:00
Kiril Videlov
e3cb98d1ee
Merge pull request #3790 from gitbutlerapp/update-ipc-code
...
Update IPC imports and remove old logic
2024-05-19 23:16:47 +02:00
Kiril Videlov
f768221b09
Merge pull request #3791 from gitbutlerapp/Virtual-branch
...
make GitGuardian happy
2024-05-19 19:03:05 +02:00
Kiril Videlov
330b48003b
make GitGuardian happy
2024-05-19 19:01:43 +02:00
Kiril Videlov
d7578f19c9
Merge pull request #3702 from ndom91/ndom91/add-playwright-test
...
feat: add `@playwright/test` e2e test setup
2024-05-19 19:00:10 +02:00
Kiril Videlov
89295f8933
bump playwright version
2024-05-19 17:30:37 +02:00
Kiril Videlov
60fcfde2fb
add vitest exclude for node_modules
2024-05-19 16:53:36 +02:00
Caleb Owens
fa973fd8f1
Remove unused exports from ipc
2024-05-19 15:43:07 +01:00
Caleb Owens
87a10e2bd3
Update auth.ts to use absolute import
2024-05-19 15:43:07 +01:00
Caleb Owens
c1f295f6f4
Use correct invoke function
2024-05-19 15:43:07 +01:00
Kiril Videlov
9875dff1d7
Merge branch 'master' into ndom91/add-playwright-test
2024-05-19 16:28:47 +02:00
Kiril Videlov
bb1b5ce0e5
Merge pull request #3789 from gitbutlerapp/gitbutler-tracked-data-files-implementation
...
setup for async tasks on oplog update
2024-05-19 16:07:40 +02:00
Kiril Videlov
662a62c2f2
setup for async tasks on oplog update
...
As we start building out code collaboration we wanna have the ability to push gitbutler state to, when enabled
2024-05-19 15:53:27 +02:00
Scott Chacon
070a88beb9
Merge pull request #3787 from gitbutlerapp/save-and-restore-the-gitbutler/integration-branch
...
save and restore the gitbutler/integration branch
2024-05-19 07:36:52 +02:00
Scott Chacon
18de60740b
formatting
2024-05-19 07:24:15 +02:00
Scott Chacon
2a89fa6b93
save and restore the gitbutler/integration branch
...
when we save the snapshots, save and restore the integration branch commit properly so we don't get in a weird state after restore
2024-05-19 07:07:55 +02:00
Kiril Videlov
b3a1699cbf
Merge pull request #3786 from gitbutlerapp/Virtual-branch-1
...
remove unneccessary CSPs
2024-05-18 18:26:51 +02:00
Kiril Videlov
7e070ac0f5
remove unneccessary CSPs
2024-05-18 18:13:24 +02:00
Kiril Videlov
07b863731f
Merge pull request #3785 from gitbutlerapp/fix-ollama-request-security
...
Fix ollama request security
2024-05-18 18:08:39 +02:00
Kiril Videlov
c5450c47df
Merge pull request #3784 from gitbutlerapp/Virtual-branch
...
fix: forgot the port
2024-05-18 18:02:20 +02:00
Caleb Owens
6ae9b7ff6e
Fix ollama request security
2024-05-18 16:51:20 +01:00
Kiril Videlov
a9316492c9
fix: forgot the port
2024-05-18 17:49:05 +02:00
Kiril Videlov
a9e991c627
Merge pull request #3783 from gitbutlerapp/update-snapshot-threshold-logic-branch
...
feat: Set default snapshot lines threshold to 20 when undefined
2024-05-18 16:50:55 +02:00
Kiril Videlov
92951b504e
feat: Set default snapshot lines threshold to 20 when undefined
2024-05-18 16:49:20 +02:00
Kiril Videlov
ead482d4e5
Merge pull request #3782 from gitbutlerapp/Virtual-branch
...
fix: Updated connect-src to allow local connections for ollama
2024-05-18 16:41:02 +02:00
Kiril Videlov
8c291cdadf
Merge pull request #3780 from gitbutlerapp/minor-commit-card-tweaks
...
Minor tweaks to CSS and use real branch name
2024-05-18 16:40:47 +02:00
Kiril Videlov
8fa8cbfe6d
fix: Updated connect-src to allow local connections for ollama
2024-05-18 16:28:19 +02:00
Caleb Owens
c1840b5b75
Minor tweaks to CSS and use real branch name
2024-05-18 00:16:58 +01:00
Mattias Granlund
425289e10a
Unmount history component when hidden
...
- history service resets as history component is unmounted
- restores functionality I changed in my previous commit
2024-05-17 20:04:22 +02:00
Mattias Granlund
ec24ffe979
Fix bug leaving PR button visible
2024-05-17 20:03:41 +02:00
Mattias Granlund
c699ad4dfa
Small refactor of history component
2024-05-17 18:51:47 +02:00
Scott Chacon
076ff9beed
Merge pull request #3768 from gitbutlerapp/oplog-tree-creation-and-insertions
...
first pass at new oplog tree builder
2024-05-17 15:41:23 +02:00
