gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-20 16:11:46 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,477 Commits 155 Branches 1,064 Tags 61 MiB
bcc2cd721f
Commit Graph

5477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mattias Granlund
bcc2cd721f Change "discard file" to "discard changes" 2024-03-06 19:18:33 +02:00
Josh Junon
06c2231f24
Merge pull request #3055 from gitbutlerapp/Virtual-branch-4 
refactor remaining low-hanging-fruit `TryFrom` implementations
 2024-03-06 16:12:06 +01:00
Mattias Granlund
5c64a0ea90 Rename a couple of ts files from snake_case to camelCase 2024-03-06 16:47:57 +02:00
Josh Junon
df3944106f refactor remaining low-hanging-fruit TryFrom implementations 2024-03-06 15:47:08 +01:00
Josh Junon
83582e24e9
Merge pull request #3053 from gitbutlerapp/Virtual-branch-5 
more refactors of TryFrom
 2024-03-06 15:29:55 +01:00
Pavel Laptev
8dcf20cd15
Merge pull request #3052 from gitbutlerapp/Design-tokens-update 
style: updated design tokens
 2024-03-06 15:20:14 +01:00
Josh Junon
7905903c5d more refactors of TryFrom 2024-03-06 15:19:51 +01:00
Josh Junon
62081de9cf
Merge pull request #3051 from gitbutlerapp/Virtual-branch-4 
remove several TryFrom cases for initializing type with path
 2024-03-06 15:18:48 +01:00
Pavel Laptev
02d7a183b4 style: updated design tokens 2024-03-06 15:17:27 +01:00
Josh Junon
d72002c7f5 remove several TryFrom cases for initializing type with path 2024-03-06 14:44:08 +01:00
Josh Junon
d8b8c0f78d
Merge pull request #3049 from gitbutlerapp/Virtual-branch-4 
first set of TryFrom impl removals
 2024-03-06 14:35:44 +01:00
Josh Junon
f8ad417c04 first set of TryFrom impl removals 2024-03-06 14:21:13 +01:00
Kiril Videlov
f2b13e5632 chore: add serde attribute to rename fields to camelCase in VirtualBranches struct 2024-03-06 13:51:04 +01:00
Kiril Videlov
ce23bda4ba
Merge pull request #3041 from Caleb-T-Owens/Add-evaluate-prompt-api-endpoint 
Move over to evaluatePrompt endpoint for AI integration
 2024-03-06 13:50:42 +01:00
Mattias Granlund
684f57a1b0 Fix status comparison for disabling merege button 2024-03-06 14:19:49 +02:00
Kiril Videlov
54293176d5 style: fix typo in readme 2024-03-06 11:02:13 +01:00
Caleb Owens
377b56e74d refactor: Move AIProvider and Summarizer classes to separate files 
asdf
 2024-03-05 22:59:25 +00:00
Caleb Owens
4c96d002a4 Formatting! 
Formatting!
 2024-03-05 22:36:29 +00:00
Caleb Owens
c5af3e2b20 Remove unused branch method from cloud.ts 
Refactor
 2024-03-05 22:31:24 +00:00
Caleb Owens
e4f5807205
Refactor style options 2024-03-05 22:27:12 +00:00
Caleb Owens
78f604a9a4
refactor: Update commit and branch templates 
Refactored the commit and branch templates to allow for customizable templates. The commit method now accepts a commit template parameter, and the branch method now accepts a branch template parameter. This change provides flexibility in defining commit and branch templates for different scenarios.
 2024-03-05 22:24:35 +00:00
Caleb Owens
01ed3c2151 feat: Implement diff length limit and use AIProvider interface 
Change the diffLengthLimit constant to 20000 to limit the length of diffs in the code changes. 
Implemented AIProvider interface in ButlerAIProvider class to ensure consistency and adherence to the AIProvider contract for evaluating prompts.
 2024-03-05 22:19:34 +00:00
Caleb Owens
9f8afcfd1d feat: Integrate ButlerAiProvider for AI summarization 
Added ButlerAiProvider to handle AI summarization functionality instead of directly using Summarizer. This change improves modularity and separates the AI functionality into a dedicated provider. Updated the Summarizer class to utilize the new AIProvider interface for handling AI evaluations. This enhances code readability and maintainability.
 2024-03-05 22:07:45 +00:00
Caleb Owens
34c13cc254 feat(backend): Add functionality to generate branch names based on diff 
Added a new method in the Summarizer class to generate branch names based on the changes in the diff. The branch names are now automatically created by replacing whitespace with dashes and limiting to a maximum of 5 words. This will help in creating meaningful branches for better organization and tracking of changes.
 2024-03-05 22:07:45 +00:00
Caleb Owens
56decefb3f refactor: Removed unused summarize commit and hunk functions 
The summarize commit and hunk functions were no longer being used in the codebase, so they were removed to clean up the code and improve readability. This change simplifies the codebase and removes unnecessary functions.
 2024-03-05 22:07:45 +00:00
Caleb Owens
d24bef3f32 Generate commit messages through evaluatePrompt API 2024-03-05 22:07:45 +00:00
Caleb Owens
312541b7f7 Updated lib to "ES2021" in tsconfig.json 2024-03-05 22:07:45 +00:00
Caleb Owens
83d5acee88 Add evaluatePrompt method to Cloud API client to handle prompt evaluation 2024-03-05 22:07:45 +00:00
Kiril Videlov
8aa0db409d
Merge pull request #3040 from gitbutlerapp/Filter-active-branches-by-flag 
when locking hunks only consider commits from applied branches
 2024-03-05 18:51:44 +01:00
Kiril Videlov
99df783a0a
when locking hunks only consider commits from applied branches 2024-03-05 18:32:59 +01:00
Josh Junon
82f102e106
Merge pull request #3038 from gitbutlerapp/try-from-part-1 
move most `TryFrom`  initialization into main instead of initialization on demand
 2024-03-05 18:08:10 +01:00
Josh Junon
c4f4b4cc75 move most TryFrom initialization into main instead of initialization on-demand 2024-03-05 17:54:27 +01:00
Pavel Laptev
1696629568
Merge pull request #3037 from gitbutlerapp/New-icon 
feat: add new icon for logs in the icon library
 2024-03-05 16:19:25 +01:00
Pavel Laptev
d34184c1da feat: add new icon for logs in the icon library 2024-03-05 16:15:16 +01:00
Pavel Laptev
204a30a847
Merge pull request #3036 from gitbutlerapp/Update-icons-1 
icons small fixes
 2024-03-05 14:55:44 +01:00
Pavel Laptev
18f9ae97bf icons small fixes 
- sort icons alphabetically
- fix radius value for the spinner icon
 2024-03-05 14:54:01 +01:00
Kiril Videlov
935465669b
Merge pull request #3023 from gitbutlerapp/dependabot/cargo/cargo-security-group-15c8ac57de 
Bump the cargo group group with 4 updates
 2024-03-05 10:54:40 +01:00
Mattias Granlund
3c86868d6f Fix file preview when draggin from file tree 
- fixes #3029
 2024-03-05 01:29:42 +02:00
Daniel Kranich
9fc20018b0 Improve new branch name detection 
Improved the new branch name detection for auto generating branch names. Now uses a regex to match new branch names more explicitly and will avoid branch name generation loops when 'virtual branch' is a string used often in the diff. Fixes issue #3017
 2024-03-05 01:22:39 +02:00
Mattias Granlund
6234549c0b Do more to prevent stuck busy.. indicator 
- not sure why this was not addressed earlier
 2024-03-05 00:49:54 +02:00
Mattias Granlund
5ad6db4e07 Set file selection on drag when necessary 
- the behaviour was unexpected if another file was already open
 2024-03-05 00:49:24 +02:00
Mattias Granlund
e4fab86085 Fix bg when dragging not selected files 2024-03-05 00:47:34 +02:00
Mattias Granlund
dcd0506999 Fix missing prop error for FileTree component 
- project property was missing from svelte:self tags
 2024-03-05 00:43:24 +02:00
Mattias Granlund
2691365474 Make UI faster with mousedown over click 
- considered all on:click events but could have missed some
- actions that modify state still use on:click
 2024-03-05 00:21:35 +02:00
dependabot[bot]
3d5e4d7ad1
Bump the cargo group group with 4 updates 
Bumps the cargo group group with 4 updates: [h2](https://github.com/hyperium/h2), [mio](https://github.com/tokio-rs/mio), [openssl](https://github.com/sfackler/rust-openssl) and [rsa](https://github.com/RustCrypto/RSA).


Updates `h2` from 0.3.21 to 0.3.24
- [Release notes](https://github.com/hyperium/h2/releases)
- [Changelog](https://github.com/hyperium/h2/blob/v0.3.24/CHANGELOG.md)
- [Commits](https://github.com/hyperium/h2/compare/v0.3.21...v0.3.24)

Updates `mio` from 0.8.9 to 0.8.11
- [Release notes](https://github.com/tokio-rs/mio/releases)
- [Changelog](https://github.com/tokio-rs/mio/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tokio-rs/mio/compare/v0.8.9...v0.8.11)

Updates `openssl` from 0.10.57 to 0.10.64
- [Release notes](https://github.com/sfackler/rust-openssl/releases)
- [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.57...openssl-v0.10.64)

Updates `rsa` from 0.9.2 to 0.9.5
- [Changelog](https://github.com/RustCrypto/RSA/blob/master/CHANGELOG.md)
- [Commits](https://github.com/RustCrypto/RSA/compare/v0.9.2...v0.9.5)

---
updated-dependencies:
- dependency-name: h2
  dependency-type: indirect
  dependency-group: cargo-security-group
- dependency-name: mio
  dependency-type: indirect
  dependency-group: cargo-security-group
- dependency-name: openssl
  dependency-type: indirect
  dependency-group: cargo-security-group
- dependency-name: rsa
  dependency-type: indirect
  dependency-group: cargo-security-group
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-04 22:05:33 +00:00
Pavel Laptev
a720d4fcc9
Merge pull request #3021 from gitbutlerapp/Add-Thank-you-banner 
Profile page updates
 2024-03-04 22:51:23 +01:00
Pavel Laptev
86a999fbe8 non exisiting property remove 2024-03-04 22:49:03 +01:00
Pavel Laptev
2a1eb898a7 remove unused import and commented code 2024-03-04 22:41:11 +01:00
Pavel Laptev
7d80feb77c Profile page updated 
- added "thank you" banner
- "Log out" button was moved to the profile section
- small CSS fixes
 2024-03-04 22:36:11 +01:00
Pavel Laptev
d108788351 style: update success icon alignment in project setup component 2024-03-04 20:58:52 +01:00