gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-02 07:53:55 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,656 Commits 148 Branches 1,032 Tags 66 MiB
d2f8610fb2
Commit Graph

352 Commits

Author SHA1 Message Date
Nikita Galaiko
f4f140afa5 new branch dropzone works again 2023-11-06 13:36:14 +01:00
Nikita Galaiko
6bcf1f90c6 fix dragable bug 2023-11-06 13:36:03 +01:00
Nikita Galaiko
7f6e391347 cherry picking works again 2023-11-06 13:13:16 +01:00
Nikita Galaiko
97cd2d4920 ammendable commit card 2023-11-06 12:53:47 +01:00
Nikita Galaiko
b31441b888 drag & amend works 2023-11-06 11:41:18 +01:00
Mattias Granlund
fff966a063 Fix event propagation for cherry picking 2023-11-03 15:01:40 +01:00
Nikita Galaiko
f00aa38677
Merge pull request #1508 from gitbutlerapp/add-test-for-dirty-function 
GB-626
 2023-11-03 14:47:38 +01:00
Nikita Galaiko
5581a476e9 refresh sessions on vbranch updates 2023-11-03 14:30:40 +01:00
Mattias Granlund
d2ba79a695 Prevent navigation on clicking refresh button 2023-11-03 13:28:48 +01:00
Mattias Granlund
58a74873fe Fix button that takes you back to integration branch 2023-11-03 12:37:27 +01:00
Mattias Granlund
91dd37e570 Make base branch popout into page 2023-11-03 12:06:20 +01:00
Kiril Videlov
232a0dcf01 feat: add ProjectHeader component to display project title and GitHub icon, update SVG components to spread props for reusability 2023-11-02 17:34:15 +01:00
Mattias Granlund
7a787f53eb chore: use correct BranchLane import name 2023-11-02 14:48:44 +01:00
Mattias Granlund
0513ccccdb Fix settings UI by refactoring layout structure 2023-11-02 12:52:29 +01:00
Kiril Videlov
85022032fe fix: mergeability check for remote branches is not suitable for eager execution because it's expensive and the results are not immediatelly needed 2023-11-02 12:08:03 +01:00
Mattias Granlund
4b51ebc565 Fix navigation after adding new project 2023-11-02 10:47:04 +01:00
Mattias Granlund
c5f53f003f Add back tauri dragger to top left corner 2023-11-01 17:20:22 +01:00
Mattias Granlund
c9ba804674 Fix imports and drop unused page file 2023-11-01 17:16:55 +01:00
Mattias Granlund
83b3df7315 Create new page for board in nested layout 2023-11-01 17:16:55 +01:00
Mattias Granlund
a3dc701a8f Create modules under $lib 2023-11-01 14:01:08 +01:00
Mattias Granlund
9c0e4bd427 Move sentry and posthog into analytics module 2023-11-01 14:01:08 +01:00
Mattias Granlund
72d59d1fa2 Rename lib/api -> lib/backend 2023-11-01 14:01:08 +01:00
Mattias Granlund
f2e609e791 Flatten the front end api folder 2023-11-01 14:01:08 +01:00
Mattias Granlund
f10a443606 Move svelte lib components into a flat directory 2023-11-01 11:47:00 +01:00
Mattias Granlund
84121b94f0 Move a few more files 2023-11-01 11:47:00 +01:00
Mattias Granlund
b8d163de89 Remove histoire since it's not useful 2023-11-01 11:47:00 +01:00
Mattias Granlund
5916d9ac82 Rearrange stuff in the [projectId] route 2023-11-01 11:47:00 +01:00
Mattias Granlund
01dd7972fb Rename projects route to 'old' 2023-11-01 11:07:05 +01:00
Mattias Granlund
b597cc5310 Remove more unused Svelte code 2023-11-01 10:48:23 +01:00
Mattias Granlund
a75abcef6c Remove unnecessary nesting of repo route 2023-11-01 10:37:46 +01:00
Mattias Granlund
986490fb37 Remove a bunch of unused front end code 2023-11-01 10:22:41 +01:00
Kiril Videlov
f594f2c762 chore: update modal title to clarify purpose of sharing data with GitButler team 2023-11-01 09:54:17 +01:00
Mattias Granlund
c48a0f40a3 Fix lint error 2023-10-31 17:21:08 +01:00
Mattias Granlund
cfd3b0d72b Add email button that was lost 2023-10-31 17:21:08 +01:00
Mattias Granlund
7dc7a2259b Remove header and footer in favor of left hand navigation 2023-10-31 16:55:41 +01:00
Nikita Galaiko
c54a8f283d ✨ feat: add support for caching and retrieving authenticated user information from GitHub API 
The changes include:
- Added a new function `getAuthenticatedWithCache` in `client/src/lib/github/user.ts` to retrieve authenticated user information from the GitHub API and cache it using `lscache`
- Added a new function `getAuthenticated` in `client/src/lib/github/user.ts` to retrieve authenticated user information from the GitHub API
- Updated the `userStore` in `client/src/lib/stores/user.ts` to include a new property `github_username` to store the GitHub username of the authenticated user
- Updated the `gitHubOauthCheckStatus` function in `client/src/routes/auth/github.ts` to set the `github_username` property of the `userStore` with the authenticated user's username
- Updated the `openURL` function in `client/src/cmd/login.go` to check for the presence of `DESKTOP_SESSION` or `XDG_CURRENT_DESKTOP`
 2023-10-31 13:25:21 +01:00
Nikita Galaiko
6c4e47f19f
Merge pull request #1473 from gitbutlerapp/add-drag-and-drop-support-for-commit-cards 
Add drag and drop support for commit cards
 2023-10-31 11:59:07 +01:00
Mattias Granlund
c5c5152bf2 Extract header and footer into their own components 2023-10-31 10:43:02 +01:00
Mattias Granlund
1d983516ed chore: fix formatting 2023-10-31 10:42:49 +01:00
dependabot[bot]
e92a87f65e chore(deps-dev): bump marked from 9.1.3 to 9.1.4 
Bumps [marked](https://github.com/markedjs/marked) from 9.1.3 to 9.1.4.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v9.1.3...v9.1.4)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:40:00 +01:00
Mattias Granlund
d41c2d1e7d Remove use of null from user store 2023-10-31 10:39:50 +01:00
dependabot[bot]
4c4327a3a0 chore(deps-dev): bump vite from 4.4.9 to 4.5.0 
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.4.9 to 4.5.0.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.5.0/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:39:37 +01:00
dependabot[bot]
080f10f4eb chore(deps-dev): bump marked from 9.0.3 to 9.1.3 
Bumps [marked](https://github.com/markedjs/marked) from 9.0.3 to 9.1.3.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v9.0.3...v9.1.3)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:36:14 +01:00
dependabot[bot]
595aae95c5 chore(deps-dev): bump svelte from 4.2.1 to 4.2.2 
Bumps [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/sveltejs/svelte/releases)
- [Changelog](https://github.com/sveltejs/svelte/blob/master/packages/svelte/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/svelte/commits/svelte@4.2.2/packages/svelte)

---
updated-dependencies:
- dependency-name: svelte
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:36:06 +01:00
dependabot[bot]
4da0edaf63 chore(deps-dev): bump autoprefixer from 10.4.15 to 10.4.16 
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.4.15 to 10.4.16.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/10.4.15...10.4.16)

---
updated-dependencies:
- dependency-name: autoprefixer
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:35:59 +01:00
dependabot[bot]
06498cdfbf chore(deps-dev): bump @codemirror/view from 6.18.0 to 6.21.4 
Bumps [@codemirror/view](https://github.com/codemirror/view) from 6.18.0 to 6.21.4.
- [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/view/compare/6.18.0...6.21.4)

---
updated-dependencies:
- dependency-name: "@codemirror/view"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:35:51 +01:00
Nikita Galaiko
8922c60ad9 gap between upstream commits 2023-10-31 09:55:17 +01:00
Nikita Galaiko
b773901683 cherry pick ui 2023-10-31 08:45:46 +01:00
dependabot[bot]
7586d6a233 Bump eslint from 8.50.0 to 8.52.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.50.0 to 8.52.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.50.0...v8.52.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 15:47:23 +01:00
dependabot[bot]
e7a88aead5 chore(deps-dev): bump @lezer/common from 1.0.4 to 1.1.0 
Bumps [@lezer/common](https://github.com/lezer-parser/common) from 1.0.4 to 1.1.0.
- [Changelog](https://github.com/lezer-parser/common/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lezer-parser/common/compare/1.0.4...1.1.0)

---
updated-dependencies:
- dependency-name: "@lezer/common"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 13:07:58 +01:00
dependabot[bot]
5a0d33cf95 chore(deps-dev): bump @typescript-eslint/parser from 6.7.3 to 6.9.0 
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.7.3 to 6.9.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/v6.9.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 13:06:57 +01:00
dependabot[bot]
e3b379e684 Bump posthog-js from 1.81.2 to 1.84.2 
Bumps [posthog-js](https://github.com/PostHog/posthog-js) from 1.81.2 to 1.84.2.
- [Release notes](https://github.com/PostHog/posthog-js/releases)
- [Changelog](https://github.com/PostHog/posthog-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-js/compare/v1.81.2...v1.84.2)

---
updated-dependencies:
- dependency-name: posthog-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 13:03:47 +01:00
dependabot[bot]
219f5e32bf chore(deps-dev): bump eslint-import-resolver-typescript 
Bumps [eslint-import-resolver-typescript](https://github.com/import-js/eslint-import-resolver-typescript) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/import-js/eslint-import-resolver-typescript/releases)
- [Changelog](https://github.com/import-js/eslint-import-resolver-typescript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-import-resolver-typescript/compare/v3.6.0...v3.6.1)

---
updated-dependencies:
- dependency-name: eslint-import-resolver-typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 13:03:33 +01:00
Kiril Videlov
19e933d713 feat: add filter functionality to pull requests listing in project view using the native context menu 2023-10-28 21:51:30 +02:00
Kiril Videlov
a9f1da75af chore: move expand/collapse to the left 2023-10-28 19:25:12 +02:00
Kiril Videlov
579807687c feat: add IconFilter component and its SVG markup 2023-10-28 19:24:03 +02:00
Kiril Videlov
3eba2c9bdb feat: add caching mechanism for pull requests list to improve performance and handle offline scenarios 2023-10-27 17:52:15 +03:00
Kiril Videlov
b0374e2f7a chore: remove duplicate RemoteBranches component 2023-10-25 22:24:38 +02:00
Kiril Videlov
8b5b37102e feat: add support for displaying and interacting with pull requests in the branch peek component 2023-10-25 22:24:38 +02:00
Nikita Galaiko
3d14551ed2 add validation error code 2023-10-23 09:37:54 +02:00
Nikita Galaiko
01180178fb rm search from ui 2023-10-20 13:07:18 +02:00
Nikita Galaiko
9f9d1e4149 dark mode: fix upstream commit bg 2023-10-20 09:07:14 +02:00
Nikita Galaiko
e1fcc5546f show force push when upstream commits present 2023-10-19 13:41:42 +02:00
Nikita Galaiko
f3decc57e0 return upstream name too 2023-10-19 10:29:33 +02:00
Nikita Galaiko
df098e8d57 fix local branch name serialization 2023-10-19 10:23:58 +02:00
Nikita Galaiko
36eea73e52 🔨 chore: update references to branch upstream and upstreamCommits in client code 
The changes in this commit update the references to the `branch.upstream` property and `branch.upstreamCommits` array in the client code. The code now uses the `branch.upstream.name` property instead of `branch.upstream` and `branch.upstream.commits` instead of `branch.upstreamCommits`. This change ensures that the code is compatible with the updated data structure.
 2023-10-19 09:30:31 +02:00
Kiril Videlov
0857b4483b 🔨 chore: add GitHub integration context to tray components 2023-10-18 14:50:37 +02:00
Kiril Videlov
1e23e77ffa 🔨 chore: move github context to page and inject into components 2023-10-18 14:50:37 +02:00
Kiril Videlov
3f74c66fb7 refactor: move remote branches out of tray and into their own component 2023-10-18 14:11:15 +02:00
Nikita Galaiko
e1a9ce1fba use prebuilt svelte-store dependency 2023-10-16 11:03:24 +02:00
Kiril Videlov
31ab4c6fca 🎨 style: update commit reset button appearance and add tooltip 2023-10-16 09:36:10 +02:00
Kiril Videlov
a2b699700b 🔨 chore: update commit reset button tooltip to remove warning about force push 
The tooltip breaks the layout here for some reason
 2023-10-16 09:27:56 +02:00
Kiril Videlov
f608758eae fix formatting 2023-10-13 15:20:32 +02:00
Kiril Videlov
8f7bcac403 ✨ feat: add support for creating pull requests and pushing commits with the option to create a pull request 2023-10-13 15:20:32 +02:00
Mattias Granlund
5dc19be8fe Fix the rewind functionality 
- Shift+Cmd+R when viewing virtual branches to switch to rewind
- Same combo to switch back to virtual branches
- Not everything is great, but it's a start
 2023-10-12 21:27:40 +02:00
Kiril Videlov
d338808518 🔨 chore: make placement configurable for floating actions component 2023-10-12 17:30:30 +02:00
Nikita Galaiko
90124acd1d update integrated separator copy 2023-10-12 13:57:30 +02:00
Mattias Granlund
b1008356ab Fix lang/punctuation in delete dialog 
- should have done this in the last commit
 2023-10-12 11:51:59 +02:00
Mattias Granlund
5501509671 Use right font-color for project name when deleting data 2023-10-12 11:23:53 +02:00
Nikita Galaiko
f65c5cad21 resetHeadCommit to handle single commit reset 2023-10-12 08:38:22 +02:00
Nikita Galaiko
17f83c5c0c add a warning tooltip 2023-10-11 15:16:00 +02:00
Nikita Galaiko
ce3bd1521c use force push when needed 2023-10-11 15:09:04 +02:00
Nikita Galaiko
b834a6ef01 say force push if it's going to happen 2023-10-11 14:46:00 +02:00
Nikita Galaiko
3b5005c865 ui for resetting remote commits 2023-10-11 14:41:33 +02:00
Nikita Galaiko
8d9145738b fix integrated not remote commits display 2023-10-11 12:40:17 +02:00
Nikita Galaiko
dbf2b2cacb add subtle button to reset head commit 2023-10-11 09:43:32 +02:00
Nikita Galaiko
116953fbf1 merged upstream 2023-10-11 08:38:46 +02:00
Kiril Videlov
698fb012e8 support for github device oauth flow 2023-10-10 19:18:44 +02:00
Nikita Galaiko
738d1bfceb add a test button 2023-10-10 14:52:16 +02:00
Nikita Galaiko
69e9d08501 feat: update set_user function to return the updated user object 
The `set_user` function in the client code has been updated to return the updated user object after setting it in the app. This change allows for better handling of the user object and enables further operations on it if needed. The updated function now returns a `Result<User, Error>` instead of `Result<(), Error>`.
 2023-10-10 10:31:20 +02:00
Nikita Galaiko
ea94ff2c1a more custom error types 2023-10-09 12:05:24 +02:00
Mattias Granlund
bd98ee0f36 Add a handler for unhandled rejections 
- this change gives us better stack traces when reactive things break
 2023-10-06 16:21:26 +02:00
Nikita Galaiko
73d5ebf823 extract projects controller 2023-10-05 15:44:34 +02:00
dependabot[bot]
885185e6e3 chore(deps-dev): bump svelte from 4.2.0 to 4.2.1 
Bumps [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/sveltejs/svelte/releases)
- [Changelog](https://github.com/sveltejs/svelte/blob/master/packages/svelte/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/svelte/commits/svelte@4.2.1/packages/svelte)

---
updated-dependencies:
- dependency-name: svelte
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-05 11:58:46 +02:00
dependabot[bot]
8fcaed68be chore(deps-dev): bump nanoid from 4.0.2 to 5.0.1 
Bumps [nanoid](https://github.com/ai/nanoid) from 4.0.2 to 5.0.1.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/4.0.2...5.0.1)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-05 11:54:52 +02:00
dependabot[bot]
94f4fb26db chore(deps-dev): bump @types/diff-match-patch from 1.0.32 to 1.0.34 
Bumps [@types/diff-match-patch](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/diff-match-patch) from 1.0.32 to 1.0.34.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/diff-match-patch)

---
updated-dependencies:
- dependency-name: "@types/diff-match-patch"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-05 11:54:41 +02:00
dependabot[bot]
3c0035370f chore(deps-dev): bump svelte-check from 3.5.1 to 3.5.2 
Bumps [svelte-check](https://github.com/sveltejs/language-tools) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/sveltejs/language-tools/releases)
- [Commits](https://github.com/sveltejs/language-tools/compare/svelte-check-3.5.1...svelte-check-3.5.2)

---
updated-dependencies:
- dependency-name: svelte-check
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-05 11:54:32 +02:00
dependabot[bot]
140f2b9bb4 chore(deps-dev): bump @sentry/sveltekit from 7.64.0 to 7.73.0 
Bumps [@sentry/sveltekit](https://github.com/getsentry/sentry-javascript) from 7.64.0 to 7.73.0.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/7.64.0...7.73.0)

---
updated-dependencies:
- dependency-name: "@sentry/sveltekit"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-05 11:54:05 +02:00
Mattias Granlund
3d74940111 Update Sentry DSN in Svelte code 
- changes data source desktop -> js-app
 2023-10-05 11:18:04 +02:00
Nikita Galaiko
7d245f6f59 chore: update versions of @tauri-apps/cli and related packages to 1.5.1 2023-10-05 10:31:51 +02:00
Mattias Granlund
175ee13c4e Fix sveltekit error handler 
- now prints the actual error to the console
 2023-10-05 10:11:00 +02:00
Nikita Galaiko
1df251baca chore: remove unused fileGroup function and related code 2023-10-04 16:44:30 +02:00
Nikita Galaiko
b86259b64c chore: remove unused Statuses component and git_status API endpoint 2023-10-04 16:35:06 +02:00
Nikita Galaiko
67de8de1e9 ui: rm git activity 2023-10-04 16:15:46 +02:00
Scott Chacon
e72ef03bc8
Merge pull request #1284 from gitbutlerapp/update-branch-with-upstream 
Change upstream branch name
 2023-10-04 15:33:53 +02:00
Scott Chacon
ccf6136b9a
✨ feat: add Remote Name panel to display and update remote branch name in UI 2023-10-04 13:16:33 +02:00
Mattias Granlund
3c16b6cd76 Add error handling and loading indicator to base branch selection 
- also puts base branch selection in its own component
 2023-10-04 11:54:47 +02:00
Mattias Granlund
834d227370 Make store dependencies explicit parameters 
This was feedback from Kiril a while back, that since all stores are
needed it would be clearer to have them as explicit parameters.
 2023-10-03 21:59:04 +02:00
Nikita Galaiko
636c6538b3 refactor: update file content handling to use new FileContent type instead of Contents 2023-10-03 11:55:02 +02:00
Nikita Galaiko
95304c1968 refactor: use content that is either utf8, large or binary 2023-10-03 10:04:30 +02:00
Mattias Granlund
a6c6c90757 Safely append sessions to session store 
- seen in the wild, but triggered by other error
 2023-10-02 23:38:19 +02:00
dependabot[bot]
4e3cb65313 chore(deps-dev): bump posthog-js from 1.77.2 to 1.81.2 
Bumps [posthog-js](https://github.com/PostHog/posthog-js) from 1.77.2 to 1.81.2.
- [Release notes](https://github.com/PostHog/posthog-js/releases)
- [Changelog](https://github.com/PostHog/posthog-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-js/compare/v1.77.2...v1.81.2)

---
updated-dependencies:
- dependency-name: posthog-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-02 19:13:41 +02:00
dependabot[bot]
4ec90f25de chore(deps-dev): bump @codemirror/lang-markdown from 6.2.0 to 6.2.1 
Bumps [@codemirror/lang-markdown](https://github.com/codemirror/lang-markdown) from 6.2.0 to 6.2.1.
- [Changelog](https://github.com/codemirror/lang-markdown/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/lang-markdown/compare/6.2.0...6.2.1)

---
updated-dependencies:
- dependency-name: "@codemirror/lang-markdown"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-02 19:10:05 +02:00
dependabot[bot]
58d6c32435 chore(deps-dev): bump eslint from 8.47.0 to 8.50.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.47.0 to 8.50.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.47.0...v8.50.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-02 19:09:41 +02:00
dependabot[bot]
5cfb6e1ba0 chore(deps-dev): bump postcss from 8.4.30 to 8.4.31 
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.30 to 8.4.31.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.30...8.4.31)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-02 19:07:39 +02:00
dependabot[bot]
bf371c6daf chore(deps-dev): bump @types/marked from 5.0.1 to 5.0.2 
Bumps [@types/marked](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/marked) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/marked)

---
updated-dependencies:
- dependency-name: "@types/marked"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-02 19:07:27 +02:00
Mattias Granlund
32da7d1200 Handle project errors nicely 
- show better message if error unknown along with back button
- eliminate no undefined or zero session errors
 2023-10-02 15:06:55 +02:00
Mattias Granlund
b64bb18eb3 Disable AI hunk summaries for binary files 2023-10-02 12:02:05 +02:00
Mattias Granlund
c5603d1685 Show custom message in FileCard for binary/large files 2023-10-02 12:02:05 +02:00
Mattias Granlund
2b976b2e6d Separate front and back end in sentry 
- front end now uses app-js
 2023-10-01 19:41:55 +03:00
Mattias Granlund
a851210c0a Destroy popup menues on component destruction 
- because menus are rendered manually targeting the document body
 2023-10-01 12:03:35 +03:00
Mattias Granlund
2d2d85d8ce Change some package imports to direct imports 2023-10-01 11:55:29 +03:00
Mattias Granlund
b2a9d2efcf Remove unnecessary console logging 
- removing since nightly users have access to devtools
 2023-10-01 11:50:51 +03:00
Mattias Granlund
6528fb7400 Fix lint warnings in ts code 2023-10-01 11:39:55 +03:00
Mattias Granlund
39835b7c27 Disable spell check in the commit message box 
- plus a couple of other places
 2023-10-01 01:47:50 +03:00
Mattias Granlund
5f25455d52 Do not shell open local links 
- error spotted in sentry
 2023-10-01 01:38:49 +03:00
Mattias Granlund
f4f59ee031 Nitpicking a couple of things 2023-09-30 23:19:03 +03:00
Mattias Granlund
98b5ed99a6 Express some store things more concisely 2023-09-30 23:19:03 +03:00
Mattias Granlund
3b63dff215 Refactor a few async stores to use start/stop signal 
- sessions, deltas, fetches, heads
- auto open/unsubscribe for streams
 2023-09-30 23:19:03 +03:00
Mattias Granlund
088ab5466b Bump version of forked svelte-store 
- contains added start/stop notifier for asyncWritable
 2023-09-30 21:32:06 +03:00
Mattias Granlund
544a35eea2 Fix lint error 2023-09-29 01:01:36 +03:00
Mattias Granlund
f1a9add4f7 Missed these props in the last commit 2023-09-29 01:01:36 +03:00
Mattias Granlund
48cd2ea296 Use actual types for tray store props 2023-09-29 01:01:36 +03:00
Mattias Granlund
88877e84eb Make some UI updates optimistic 
- apply
- unapply
- delete branch
- update notes
 2023-09-29 00:57:28 +03:00
Nikita Galaiko
80f43ffe32 chore: update build scripts to include separate build commands for nightly and development modes 2023-09-28 13:31:40 +02:00
Nikita Galaiko
3f35c564d2 chore: update dependencies 
- Update "@types/lscache" to version "^1.3.2"
- Update "@typescript-eslint/eslint-plugin" to version "^6.7.2"
- Update "@typescript-eslint/parser" to version "^6.7.2"
- Update "marked" to version "^9.0.3"
- Update "postcss" to version "^8.4.30"

These updates include bug fixes and performance improvements.
 2023-09-28 10:37:12 +02:00
Nikita Galaiko
919b334447 refactor: remove unnecessary prop 'isIntegrated' from CommitCard component in CommitList component 2023-09-28 10:32:31 +02:00
Nikita Galaiko
18ff457936 group integrated commits separately 2023-09-28 10:14:31 +02:00
Nikita Galaiko
53dd5a651d chore: update context menu in code editor component 
The context menu in the code editor component has been updated to include a new option to collapse sections. Additionally, the "Open in Visual Studio Code" option will now only be displayed if there is a specific line number associated with the item.
 2023-09-28 09:05:40 +02:00
Nikita Galaiko
21ab6a78ae chore: update lint and format scripts to use prettier and eslint without specifying plugin search directory 2023-09-27 10:24:51 +02:00
Nikita Galaiko
61544a003c feat: add ability to unapply ownership for a hunk in the client 
The changes in this commit add support for unapplying ownership for a hunk in the client. This allows users to discard changes made to a specific hunk and revert it back to its original state. The unapplyHunk method is added to the BranchController class, which sends a request to the server to unapply the ownership of the hunk. Upon successful unapplying, the virtual branch store is reloaded to reflect the changes.
 2023-09-27 10:23:53 +02:00
Nikita Galaiko
ef1f41d5ee fix: handle different formats of remoteUrl in BaseBranch class's repoBaseUrl method 2023-09-22 13:05:40 +02:00
Nikita Galaiko
9d99a4aad8 chore: use Partial<Record<..>> for better type checking 2023-09-21 13:39:47 +02:00
Scott Chacon
49dfcace64
Merge pull request #1228 from gitbutlerapp/add-merge-virtual-branch-function 
Detect and merge upstream branch changes
 2023-09-21 10:17:14 +02:00
Scott Chacon
661d111475
give branchCount a default 2023-09-21 10:09:12 +02:00
Nikita Galaiko
2e41cecbd3 fix: handle case when sessionFiles[file.path] is undefined in withFileContent function 2023-09-21 10:06:35 +02:00
Scott Chacon
43beb0f5d5
fix: update merge_virtual_branch_upstream function to accept optional keys_controller parameter 2023-09-21 10:05:23 +02:00
Scott Chacon
3130d5fd1a merged upstream 2023-09-21 09:32:34 +02:00
Kiril Videlov
682a25d179 🐛 fix: handle case when lastSection is undefined in HunkSection class 2023-09-20 22:25:06 +02:00
Nikita Galaiko
5c98330cc0 remove old commit page 2023-09-20 12:33:03 +02:00
Scott Chacon
b2833e2549 feat: add merge_virtual_branch_upstream function to merge upstream changes into branch 
The merge_virtual_branch_upstream function is added to merge the changes from the upstream branch into the current branch. This function checks if the project is in a conflicted state and if not, it proceeds with the merge. It finds the merge base between the upstream commit and the current branch's head commit, and then tries to merge the working directory tree with the remote tree. If the merge is successful, it commits the merge tree and updates the branch data.
 2023-09-20 10:23:32 +02:00
Kiril Videlov
3da2290744 🔨 chore: update condition for generating branch name in virtual branch scenario 2023-09-19 23:22:07 +02:00
Scott Chacon
bdbfee4cfa ui setting to sign commits 2023-09-19 16:08:42 +02:00
Nikita Galaiko
b5ebae4bed do not use link for updater 2023-09-19 10:49:40 +02:00
Kiril Videlov
364bdf417e ✨ feat: add functionality to generate branch name based on file diffs and update branch name if it doesn't match the generated name 2023-09-18 23:56:09 +02:00
Kiril Videlov
4792907b50 🐛 fix: handle broken diffs in parseHunkHeader function and add test case for it 2023-09-18 23:09:28 +02:00
Nikita Galaiko
0caf0366e3 commit files fetching async 2023-09-18 15:04:09 +02:00
Nikita Galaiko
f5a525d840 make isMergeable asyncronous 2023-09-18 10:39:48 +02:00
Nikita Galaiko
4e568420c8 fetch isMergeable asyncronously 2023-09-18 10:00:56 +02:00
Nikita Galaiko
5e27f9b8e9
fix link without href 2023-09-18 08:37:29 +02:00
Kiril Videlov
188892ff00 chore: update language parser usage and add support for Ruby language 
The code changes in this commit update the usage of language parsers in the codebase. Instead of using the `LanguageSupport` interface from `@codemirror/language`, the code now directly uses the `Parser` interface from `@lezer/common`. Additionally, support for the Ruby language has been added by importing the `ruby` mode from `@codemirror/legacy-modes/mode/ruby` and defining a parser for it using `StreamLanguage.define(ruby
 2023-09-16 00:09:53 +02:00
dependabot[bot]
1b20e735f0 Bump marked from 7.0.4 to 9.0.0 
Bumps [marked](https://github.com/markedjs/marked) from 7.0.4 to 9.0.0.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v7.0.4...v9.0.0)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-15 15:36:00 +02:00
dependabot[bot]
2341cb232f Bump eslint-plugin-svelte from 2.33.0 to 2.33.1 
Bumps [eslint-plugin-svelte](https://github.com/sveltejs/eslint-plugin-svelte) from 2.33.0 to 2.33.1.
- [Release notes](https://github.com/sveltejs/eslint-plugin-svelte/releases)
- [Changelog](https://github.com/sveltejs/eslint-plugin-svelte/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/eslint-plugin-svelte/compare/v2.33.0...v2.33.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-svelte
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-15 15:35:50 +02:00
dependabot[bot]
293897b523 Bump @histoire/plugin-svelte from 0.16.5 to 0.17.0 
Bumps [@histoire/plugin-svelte](https://github.com/Akryum/histoire/tree/HEAD/packages/histoire-plugin-svelte) from 0.16.5 to 0.17.0.
- [Release notes](https://github.com/Akryum/histoire/releases)
- [Changelog](https://github.com/histoire-dev/histoire/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Akryum/histoire/commits/v0.17.0/packages/histoire-plugin-svelte)

---
updated-dependencies:
- dependency-name: "@histoire/plugin-svelte"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-15 15:35:42 +02:00
Nikita Galaiko
46e97af7e8 pnpm format 2023-09-15 15:05:17 +02:00
Nikita Galaiko
0fb1df1ff8 fix commit timestamp 2023-09-15 15:04:03 +02:00
Nikita Galaiko
f5a24cf5e5 get rid of git_commit_diff call 2023-09-15 13:24:07 +02:00
Nikita Galaiko
2be120797b
Merge pull request #1209 from gitbutlerapp/define-remote-types 
get rid of virtual / remote confusion
 2023-09-15 12:51:09 +02:00
Nikita Galaiko
edbbe1f0a8 get rid of virtual / remote confusion 2023-09-15 12:46:25 +02:00
Kiril Videlov
f3666624f1 fix formatting 2023-09-15 11:30:35 +02:00
Kiril Videlov
45c9d1a5f6 chore: refactor commit message generation logic and add UI support for toggling options 
The commit message generation logic in the server.ts file has been refactored to improve readability and maintainability. The `trimNonLetters` function has been removed as it was not necessary. Additionally, UI support has been added to toggle options for generating commit messages. The options include "Extra concise" and "Use emojis", which can be enabled or disabled based on user preferences
 2023-09-15 11:30:35 +02:00
Nikita Galaiko
ae40f6abda do not send conflicts back 2023-09-15 10:11:45 +02:00
Nikita Galaiko
1cbb0e02ab
Merge pull request #1204 from gitbutlerapp/refactor 
Refactor
 2023-09-14 15:37:09 +02:00
Mattias Granlund
ebf9627132 Fix links nested within some stopPropagation 2023-09-14 15:35:17 +02:00
Mattias Granlund
5c6171b558 fix(branch-list): updates border color for stashed and remote branches 
The border color for stashed branches and remote branches in the branch list component was incorrect. This commit fixes the issue by updating the border color to match the design specifications
 2023-09-14 15:34:50 +02:00
Nikita Galaiko
b684c6266a add .ahead() 2023-09-14 15:26:13 +02:00
Nikita Galaiko
df97887f52 start removing fields 2023-09-14 15:24:52 +02:00
Mattias Granlund
3cd9bcb290 Various css color related UI fixes 2023-09-14 13:57:36 +02:00
Mattias Granlund
2152d3d638 Fix user/project settings page backgrounds 2023-09-14 13:57:36 +02:00
Nikita Galaiko
3c0d4acabe remove terminal 2023-09-14 08:16:26 +02:00
Mattias Granlund
ca3e4c2f72 Create new utility classes for border color 
- the colors need a bit of adjusting still, but commit is getting big
- doesn't seem like we need 4 border colors, but leaving in for now
 2023-09-13 22:28:35 +02:00
Mattias Granlund
a5526bb5dd Create new utility classes for setting bg and text color 
- choose from 5 bg colors
- choose from 4 text colors
- add text-color-[n] or bg-color-[n]
 2023-09-13 22:28:35 +02:00
Mattias Granlund
7ad43dfff7 Fix lint errors 2023-09-13 22:26:20 +02:00
Mattias Granlund
c353809869 Upgrade to prettier npm -> v3 2023-09-13 22:26:20 +02:00
Nikita Galaiko
3baa937129 one more fix 2023-09-13 10:37:45 +02:00
Nikita Galaiko
efb2364661 fix typescript 2023-09-13 10:36:19 +02:00
Nikita Galaiko
f3e51aa280 merged upstream 2023-09-13 10:30:07 +02:00
Nikita Galaiko
18e38e4d38 add hunk selection 2023-09-13 10:13:44 +02:00
Nikita Galaiko
e42f42a70c init hunk selection 2023-09-12 15:14:51 +02:00
Nikita Galaiko
64d2a6c40e minor fix 2023-09-12 13:01:10 +02:00
Nikita Galaiko
564471fb79 pnpm format 2023-09-12 11:02:08 +02:00
Mattias Granlund
1d8fb151fa Fix lint error from previous commit. 2023-09-11 22:13:01 +02:00
Mattias Granlund
c1659054cf Refactor file status computations 
The getSummary method should never have been added to the class def.
 2023-09-11 22:13:01 +02:00
Nikita Galaiko
2f9dd738cf partial commit ui 2023-09-11 15:24:47 +02:00
Nikita Galaiko
5209aea6e2 remeber node parent 2023-09-11 13:51:09 +02:00
Nikita Galaiko
9283e233c4 extract CommitDialog 2023-09-11 08:32:13 +02:00
Kiril Videlov
49cc5f95b4 format 2023-09-08 13:01:44 +02:00
Kiril Videlov
8ae35c5543 preview commit content in app instead of opening the browser 2023-09-08 13:01:44 +02:00
Nikita Galaiko
2b6fc23382 fix tinykeys import 2023-09-07 14:04:53 +02:00
Nikita Galaiko
ed2d126d8c bumps 2023-09-07 13:48:04 +02:00