gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-12 16:43:03 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,305 Commits 155 Branches 1,052 Tags 58 MiB
b0aac0d3dc
Commit Graph

3305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Galaiko
b0aac0d3dc
Merge pull request #1492 from gitbutlerapp/add-amend-virtual-branch-command 
Add amend virtual branch command
 2023-11-02 10:47:11 +01:00
Mattias Granlund
4b51ebc565 Fix navigation after adding new project 2023-11-02 10:47:04 +01:00
Nikita Galaiko
911f884552 ensure can amend only to the same branch 2023-11-02 10:25:54 +01:00
Nikita Galaiko
67fce382d9 merged upstream 2023-11-02 09:45:45 +01:00
Nikita Galaiko
52089f8ab1
Merge pull request #1494 from gitbutlerapp/symlinks 
symlinks
 2023-11-02 09:45:36 +01:00
Nikita Galaiko
531bff3061 satisfy cranky 2023-11-02 09:21:05 +01:00
Nikita Galaiko
3ebd071e9e do not unwrap 2023-11-02 09:19:28 +01:00
Nikita Galaiko
ede64d3501 recursive link test 2023-11-02 09:00:07 +01:00
Nikita Galaiko
0edbfc1a54 fix: handle symlinks correctly when adding and flushing files in the repository 2023-11-02 08:43:25 +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
Nikita Galaiko
b221254257 to_same_branch working 2023-11-01 14:44:47 +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
Nikita Galaiko
693e92119d add tests 2023-11-01 13:45:13 +01:00
Nikita Galaiko
ad7d0d6f62 feat: allow amending hunks to the branch top commit 2023-11-01 13:42:58 +01:00
Nikita Galaiko
2f4e26475e
Merge pull request #1491 from gitbutlerapp/lock-hunks-on-commit 
Lock hunks on commit
 2023-11-01 13:34:05 +01:00
Nikita Galaiko
ba0069e6ae fix hunk locking 2023-11-01 13:27:12 +01:00
Nikita Galaiko
78c179389b
Merge pull request #1487 from gitbutlerapp/refactor-get-applied-status-function 
Refactor get applied status function
 2023-11-01 12:17:05 +01:00
Nikita Galaiko
65b1d7ed38 simplify virtual branch types conversion 2023-11-01 11:54:59 +01:00
Mattias Granlund
f10a443606 Move svelte lib components into a flat directory 2023-11-01 11:47:00 +01:00
Mattias Granlund
fb7a327cef Remove stories from github actions and readme 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
extrawurst
e1a13b4cd1 cleanup to be more idiomatic rust by warpping the shared resource inside a Mutex 2023-10-31 20:16:40 +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
Kiril Videlov
5ee808410d Lets have some shared VSCode settings 2023-10-31 17:16:30 +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
ecca2b0489
Merge pull request #1478 from gitbutlerapp/persist-github-username 
GB-625 persist github username
 2023-10-31 13:33:36 +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
1720fb098f
Merge pull request #1446 from gitbutlerapp/dependabot/cargo/async-trait-0.1.74 
Bump async-trait from 0.1.73 to 0.1.74
 2023-10-31 12:04:49 +01:00
Nikita Galaiko
5b2e87c003
Merge pull request #1448 from gitbutlerapp/dependabot/cargo/ssh-key-0.6.2 
Bump ssh-key from 0.6.1 to 0.6.2
 2023-10-31 12:04:42 +01:00
Nikita Galaiko
181c83e792
Merge pull request #1449 from gitbutlerapp/dependabot/cargo/tokio-1.33.0 
Bump tokio from 1.32.0 to 1.33.0
 2023-10-31 12:04:35 +01:00
Nikita Galaiko
d1a04b281f
Merge pull request #1471 from gitbutlerapp/dependabot/cargo/tauri-plugin-single-instance-f595684 
chore(deps): bump tauri-plugin-single-instance from `44df772` to `f595684`
 2023-10-31 12:04:28 +01:00
Nikita Galaiko
0e596662b6
Merge pull request #1472 from gitbutlerapp/dependabot/cargo/serde_json-1.0.108 
chore(deps): bump serde_json from 1.0.105 to 1.0.108
 2023-10-31 12:04:22 +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
Nikita Galaiko
7dcdd959ed fix cherry pick conflict resolution 2023-10-31 11:52:11 +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