Commit Graph

2105 Commits

Author SHA1 Message Date
Nikita Galaiko
1ee516fa3c drop chrono 2023-07-25 15:04:35 +02:00
Nikita Galaiko
46dd73c189 smarter remote branch name 2023-07-25 15:04:35 +02:00
Nikita Galaiko
c335f3e60d smarter defautl branch name 2023-07-25 15:04:35 +02:00
Mattias Granlund
49df76fd0e Persist commit message a bit longer
- the big problem is we were binding it to an empty variable
2023-07-25 13:17:06 +01:00
dependabot[bot]
e4df830014 Bump tauri from 1.4.0 to 1.4.1 in /src-tauri
Bumps [tauri](https://github.com/tauri-apps/tauri) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/tauri-v1.4...tauri-v1.4.1)

---
updated-dependencies:
- dependency-name: tauri
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-25 13:34:26 +02:00
dependabot[bot]
99242688ea Bump uuid from 1.3.4 to 1.4.1 in /src-tauri
Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.3.4 to 1.4.1.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.3.4...1.4.1)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-25 13:34:18 +02:00
dependabot[bot]
00f8ef069b Bump scopeguard from 1.1.0 to 1.2.0 in /src-tauri
Bumps [scopeguard](https://github.com/bluss/scopeguard) from 1.1.0 to 1.2.0.
- [Commits](https://github.com/bluss/scopeguard/compare/v1.1.0...v1.2.0)

---
updated-dependencies:
- dependency-name: scopeguard
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-25 13:34:12 +02:00
dependabot[bot]
b7db1d4c43 Bump thiserror from 1.0.40 to 1.0.44 in /src-tauri
Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.40 to 1.0.44.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.40...1.0.44)

---
updated-dependencies:
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-25 13:33:56 +02:00
dependabot[bot]
0add2a05e7 Bump notify from 5.2.0 to 6.0.1 in /src-tauri
Bumps [notify](https://github.com/notify-rs/notify) from 5.2.0 to 6.0.1.
- [Release notes](https://github.com/notify-rs/notify/releases)
- [Changelog](https://github.com/notify-rs/notify/blob/main/CHANGELOG.md)
- [Commits](https://github.com/notify-rs/notify/commits/notify-6.0.1)

---
updated-dependencies:
- dependency-name: notify
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-25 13:33:36 +02:00
Nikita Galaiko
b6e3159b52 append timestamp to branch name if it already exists 2023-07-25 10:44:47 +02:00
Mattias Granlund
e929ed6d66 Replace posthog cookie with localstorage
Trying to work around: https://github.com/tauri-apps/wry/issues/444
2023-07-25 09:32:56 +01:00
Kiril Videlov
813d05d940 use non secure posthog cookie
context https://github.com/tauri-apps/tauri/issues/2490#issuecomment-979488222
2023-07-25 09:51:09 +02:00
Nikita Galaiko
56eb18f17c tmp bring back frontend sorting 2023-07-25 09:50:09 +02:00
Nikita Galaiko
3afdacb934 sort non-commited hunks 2023-07-25 09:50:09 +02:00
Nikita Galaiko
166e99e0cd do not sort hunks on the frontend 2023-07-25 09:50:09 +02:00
Mattias Granlund
4e2e5b6f9c
Make vbranch instruction container correctly scrollable (#857) 2023-07-24 19:54:59 +02:00
Mattias Granlund
92fb1ea473 Add tauri: to csp, and mirror in release config 2023-07-24 18:15:06 +01:00
Mattias Granlund
4e0d236cdb Change wording 2023-07-24 17:11:50 +01:00
Mattias Granlund
c7d89bbc19 Fixes styling on "enable gitbutler cloud" 2023-07-24 16:59:16 +01:00
Scott Chacon
3426deac8e
rename ‘base-branch’ help link to “Butler Flow" (#848) 2023-07-24 17:34:49 +02:00
Mattias Granlund
f0a0fb76cb Remove a few things that make noise, e.g. console.log 2023-07-24 16:30:35 +01:00
Kiril Videlov
22a3f61ff6 Refined tooltip message for summary generation feature
The tooltip message for the summary generation feature has been enhanced. It now clearly mentions the need for the user to be logged in and have cloud sync enabled specifically for the project.

Changes:
- Tooltip message for the summary generation feature now reads "Summary generation requres that you are logged in and have cloud sync enabled for the project", making it context-specific and more informative.
2023-07-24 17:25:44 +02:00
Kiril Videlov
0ca70362fa Fixed context menu triggering for null line numbers
This commit ensures the context menu triggers even when 'line.afterLineNumber' is null. It does this by checking if 'line.afterLineNumber' is not null, and if it is, it uses 'line.beforeLineNumber' instead.

Details:
- Replaced direct usage of 'line.afterLineNumber' with a conditional operator checking the value.
- If 'line.afterLineNumber' is not null, it will be used.
- If 'line.afterLineNumber' is null, 'line.beforeLineNumber' will be used instead.
2023-07-24 17:25:27 +02:00
Kiril Videlov
a3afd47790 sometimes we get some junk prepended to the message 2023-07-24 17:25:15 +02:00
Mattias Granlund
2994bc256d Use yellow for merge conflict instead of blue 2023-07-24 16:20:33 +01:00
Mattias Granlund
cf115e8cc3 Add tooltip to mergeability indicator 2023-07-24 16:20:33 +01:00
Mattias Granlund
70ae1a7de1 Link from commmit cards to Github
This commit goes a bit beyond the scope of the title, it also
renames a few targets to base.
2023-07-24 15:56:07 +01:00
Kiril Videlov
20946bf12e Updated UI and streamlined user interactions
This commit brings several notable changes which majorly include updating the SVG sizes and dynamic UI updates based on user inputs. Some unnecessary lines of code have also been removed to enhance the code's efficiency.

Detailed Changes:
- The SVG width and height have been changed from 14 to 20 for better visibility.
- Svelte contexts and event handlers have been added to respond to user interactions such as mouse events and fetch operations.
- The import line including `{ base } from '$app/paths'` in the second part of the diff has been removed.
- HTML classes have been manipulated for a streamlined experience making the UI responsive.
- Introduces a refreshing icon that spins while fetching is in progress.
- Several changes inside the div tags for a better UX by enriching user feedback on hover and click actions.
- Removed lines setting the behind variable within the script block.
- Other changes include updating dynamic variables used in the DOM, tweaking UI colors and backgrounds.
2023-07-24 16:10:25 +02:00
Kiril Videlov
8a7cb858b6 test commit 2023-07-24 16:10:25 +02:00
Mattias Granlund
e0718ff89a Make the conflict headers a bit better
Not sure how we should do this, but at least this is now cleaner.
2023-07-24 14:31:28 +01:00
Nikita Galaiko
3d7a632938 prevent files jumping when commited 2023-07-24 15:15:30 +02:00
Mattias Granlund
02c25078e9 Set the right theme without stored preference 2023-07-24 14:00:01 +01:00
Mattias Granlund
ebd042cd5d Make the set base page respond better to viewport width 2023-07-24 13:35:03 +01:00
Nikita Galaiko
5ecadc9c30 visually hint if a hunk of file is locked 2023-07-24 14:34:02 +02:00
Scott Chacon
b534bf3140
Merge pull request #829 from gitbutlerapp/better-base-branch-chooser
better base branch chooser
2023-07-24 13:08:36 +02:00
Mattias Granlund
e4e44947e9 Restore AI hunk summarization 2023-07-24 11:38:08 +01:00
Mattias Granlund
4bca896717 Remove open in GitButler cloud link 2023-07-24 11:23:27 +01:00
Nikita Galaiko
c01c5aec8c fix colors 2023-07-24 12:16:25 +02:00
Nikita Galaiko
d43b10a8f6 link project: update copy 2023-07-24 12:16:25 +02:00
Mattias Granlund
249c367ff2 Replace top theme bar with Meta+T shortcut 2023-07-24 10:59:51 +01:00
Mattias Granlund
dcce083b02 Align items and adjust sizes in toolbar 2023-07-24 10:40:54 +01:00
Scott Chacon
08c61143b3 improve the base branch chooser to introduce virtual branches a bit and explain the base branch 2023-07-24 11:31:07 +02:00
Kiril Videlov
067f8a0b2f Ensure changes are returned even if file content is absent
The revised code now allows the function parseFileSections to return hunkSections even if there is no file content. This appears to have resolved an issue where the function would return an empty array if the content was missing, hence potentially ignoring changes that have been stored in hunkSections.

Changes include:
- An early return statement has been moved further down in the code in the parseFileSections function.
- Now, even if file content does not exist, hunkSections are returned to the caller, ensuring that the changes are not missed.
2023-07-24 09:48:07 +02:00
Nikita Galaiko
6c9f225221 Refactor code for concurrency and error handling
This code change refactors the functions `git_remote_branches_data` and `get_base_branch_data` for improved concurrency and error handling. It primarily uses the `join_all` method from the Futures crate to effectively manage concurrent tasks.

Summary of changes:
- User avatars are now fetched concurrently rather than sequentially. This will improve performance when dealing with large numbers of authors.
- Introduced error handling when a proxy request for the gravatar image fails. A failure to retrieve the image will now default to the use of the original image url, instead of breaking the function.
- Removed redundant construction and use of a HashMap for managing proxies.
- Streamlined the `get_base_branch_data` function for better readability by eliminating the mutable `proxy_map` and directly calling the proxy in the async block. 
- Optimized the creation of `virtual_branches::BaseBranch` and `virtual_branches::RemoteBranch` instances by directly embedding the changes within the `join_all` function calls, reducing the complexity of the code.
2023-07-24 09:43:37 +02:00
Kiril Videlov
e9bc1f02d7 Refactor to use full name instead of first and last name
Redesigned the user profile page to receive Full Name instead of First and Last name. The user update method was adjusted to handle this change. Inputs in the UI that took the first and last name as separate inputs have also been modified to only accept a single name input.

Here's a summary of what was changed:
- The First Name and Last Name fields were replaced with a Full Name field in the form.
- The functions that submitted or processed first and last name data have been simplified to process full name data.
- The client-side and server-side code handling the user update has also been updated to handle only full name.
- Any relevant variable names were also updated to reflect this change.
- The user object now only checks and assigns the `name` property, instead of `given_name` and `family_name`. 

As a note, this simplifies the form and the process but some user's may find the change limiting if they typically prefer to provide their names separately for their first and last names.
2023-07-24 09:37:59 +02:00
Scott Chacon
38cf33d7c6
Merge pull request #825 from gitbutlerapp/docs-in-integration-branch
add docs link to integration branch
2023-07-24 08:51:33 +02:00
Scott Chacon
890f200b73 we need to be more aggressive about our unapply checkout now. stop depending on the index, people! also format. 2023-07-24 08:46:00 +02:00
Scott Chacon
169e2986fd turns out we need to write this back 2023-07-24 08:33:37 +02:00
Scott Chacon
99dbf834cc make the integration commit tree the index, so our git status works properly 2023-07-24 08:28:48 +02:00
Scott Chacon
3cc168d063 add docs link to integration branch 2023-07-24 08:22:39 +02:00