Commit Graph

2210 Commits

Author SHA1 Message Date
Nikita Galaiko
0b1809cb5d more tests 2023-08-03 12:31:05 +00:00
Nikita Galaiko
9b7c3eea7f do not cache linux deps 2023-08-03 12:31:05 +00:00
Nikita Galaiko
b35e54f144 run test env 2023-08-03 12:31:05 +00:00
Nikita Galaiko
95611577d6 fix condition 2023-08-03 12:31:05 +00:00
Nikita Galaiko
a1c5c6e1dd uninstall homebrew from github runners 2023-08-03 12:31:05 +00:00
Mattias Granlund
77e6fbdf6a Actually fix the vbranch name truncation problem 2023-08-03 11:51:27 +01:00
Kiril Videlov
edea94e85b Refined UI aesthetics with CSS class adjustments
The modification to the codebase primarily included updates to CSS classes associated with various UI elements. Changes appeared to address various aspects of the UI such as spacing, colors, and fonts to improve visual consistency and aesthetics. 

Key updates encompass:
- Altered CSS classes for "div" elements to amplify color contrasts in both light and dark modes.
- Reduced left padding and margins in several sections to enhance alignment and space utilization.
- Downscaled the text size and minimized padding in certain areas to augments space use and maintain clean visuals.
- Amended spacing between flex items and reduced padding within div elements to improve overall layout structure. 

With these adjustments, the finalized UI should result in a cleaner and more streamlined user experience
2023-08-03 12:21:39 +02:00
Scott Chacon
1d4ed6e628
Merge pull request #925 from gitbutlerapp/ui-updates
fix the disabled button state, less whitespace padding, fix login text
2023-08-03 10:42:22 +02:00
Scott Chacon
59df672bd2 fix the disabled button state, less whitespace padding, fix login text 2023-08-03 10:39:35 +02:00
Nikita Galaiko
25ebce2270 move all deps to lib.rs 2023-08-03 07:21:17 +00:00
dependabot[bot]
f2282b5751 Bump tauri-plugin-websocket from d272bde to cdb77c4 in /src-tauri
Bumps [tauri-plugin-websocket](https://github.com/tauri-apps/plugins-workspace) from `d272bde` to `cdb77c4`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](d272bde2bb...cdb77c4b65)

---
updated-dependencies:
- dependency-name: tauri-plugin-websocket
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-03 07:15:44 +00:00
dependabot[bot]
c6be885b49 Bump sentry-rust-minidump from 0.5.1 to 0.6.4 in /src-tauri
Bumps [sentry-rust-minidump](https://github.com/timfish/sentry-rust-minidump) from 0.5.1 to 0.6.4.
- [Commits](https://github.com/timfish/sentry-rust-minidump/commits)

---
updated-dependencies:
- dependency-name: sentry-rust-minidump
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-03 07:15:38 +00:00
Mattias Granlund
df80d0ee30 This fixes the dynamic width vbranch name truncation problem 2023-08-03 08:09:43 +01:00
Nikita Galaiko
65396ce379 show both expand / collapse all 2023-08-03 07:05:49 +00:00
dependabot[bot]
2f40e62dbe Bump serde_json from 1.0.97 to 1.0.104 in /src-tauri
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.97 to 1.0.104.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.97...v1.0.104)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-03 06:53:59 +00:00
dependabot[bot]
02c72d6acd Bump tauri-plugin-window-state from c4d2c8c to d272bde in /src-tauri
Bumps [tauri-plugin-window-state](https://github.com/tauri-apps/plugins-workspace) from `c4d2c8c` to `d272bde`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](c4d2c8c693...d272bde2bb)

---
updated-dependencies:
- dependency-name: tauri-plugin-window-state
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-03 06:53:38 +00:00
dependabot[bot]
5cf241d8a3 Bump sentry from 0.31.4 to 0.31.5 in /src-tauri
Bumps [sentry](https://github.com/getsentry/sentry-rust) from 0.31.4 to 0.31.5.
- [Release notes](https://github.com/getsentry/sentry-rust/releases)
- [Changelog](https://github.com/getsentry/sentry-rust/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-rust/compare/0.31.4...0.31.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-03 06:53:14 +00:00
Nikita Galaiko
b64bffa45e use github for ubuntu x86 2023-08-03 06:52:38 +00:00
Nikita Galaiko
6634bd2937 fix arch test 2023-08-03 06:52:38 +00:00
Nikita Galaiko
94febd6c6b do not apt on selfhosted arm64 2023-08-03 06:52:38 +00:00
Nikita Galaiko
2ece0c32c1 more specific runners description 2023-08-03 06:52:38 +00:00
Scott Chacon
20da88c531
Merge pull request #917 from gitbutlerapp/more-blah-blah
More blah blah
2023-08-03 08:41:29 +02:00
Nikita Galaiko
eb24408cd3 fix test 2023-08-03 06:40:57 +00:00
Nikita Galaiko
bed60f544f do spawn a separate runtime 2023-08-03 06:40:57 +00:00
Nikita Galaiko
e56bbcc6e8 do not spawn a separate runtime 2023-08-03 06:40:57 +00:00
Nikita Galaiko
fdb86ba9ca spawn up level up 2023-08-03 06:40:57 +00:00
Nikita Galaiko
eff1d8762c run handlers in a task 2023-08-03 06:40:57 +00:00
Nikita Galaiko
6e011dae92 use unbound channel on top 2023-08-03 06:40:57 +00:00
Nikita Galaiko
b362073c08 test more straight forward watcher 2023-08-03 06:40:57 +00:00
Scott Chacon
0078eeac5d take out the keydown events 2023-08-03 08:40:06 +02:00
Scott Chacon
f760857e8b merge upstream 2023-08-03 08:28:31 +02:00
Scott Chacon
43a44dbfa6 cheating 2023-08-03 08:24:20 +02:00
Mattias Granlund
6f0b01d048 Start removing index.ts exports
These are unnecessary and we should prefer to use straightforward
imports that point directly to the module/function/variable.

- Default exports are also removed, see reasoning here: https://google.github.io/styleguide/tsguide.html#exports
- A couple of namespaces were also removed, see reasoning here: https://google.github.io/styleguide/tsguide.html#namespaces-vs-modules
- Functions that were incorrectly named and capitalised as classes have been renamed, e.g. Sessions()
2023-08-02 16:30:25 +01:00
Scott Chacon
abb0d94543 Add UI enhancements and refactor components
In this commit, a series of UI enhancements and changes have been made on some components. The modifications help to improve the user interaction experience and the organization of the code by refactoring some of the elements, improving their visibility and adding new interactive elements.

Changes include:

- Improved opacity state for the 'isFileLocked' feature. 
- Added and integrated new Tooltip and IconLock classes.
- Refactored color configurations in the color config section.
- Introduced the creation of an SVG file for Icon elements rendering.
- Modified text to "No uncommitted changes on this branch" for better clarity.
- Added options to maximize and minimize in the PopupMenu. 
- Changed modal title from "Update target" to "Merge Upstream Work", and expanded the explanation of the work's impact.
- Removed some redundant conditions in the checkbox state in the branches component. 
- Added help icon library. 
- Changed the modal confirmation button from "Update" to "Merge Upstream
2023-08-02 17:27:32 +02:00
Scott Chacon
77a5356266 Add new badge and enhance UI messaging
This commit brings a significant update to the user interface text and includes a new badge icon. Changes mainly occur on how the app communicates with the users, especially when there are no commits or changes in their repository.

Changes:
- Added a new SVG badge icon to be displayed when there are no commits.
- Enhanced the messaging when no commits are made yet on the branch by replacing the 'No uncommitted changes' message with a more interactive message.
- Included a descriptive tooltip message for the 'Fetch' button.
- Adjusted the fetch button hover effect to change background color based on the `expanded` state.
- Added an indicator showing the number of unmerged upstream commits.
- Expanded the range of some color shades in the color configuration.
- Updated the code to handle singular or plural form of 'commit' based on the length of the array of commits.
- Corrected a typo: 'uncomitted' has been changed to 'uncommitted
2023-08-02 16:23:34 +02:00
Scott Chacon
64cec294cf add some descriptions of stuff when there isn’t much to show 2023-08-02 13:38:41 +02:00
Mattias Granlund
d1edfbd227 Fix min-height issue in tray
The problem with "your branches" being too small will disappear when we
add the ability to resize sections. This solution should be considered
temporary until then.
2023-08-02 12:00:33 +01:00
Scott Chacon
5cd8d75b5f after linking a project, go directly to it 2023-08-02 09:29:39 +02:00
Kiril Videlov
ca04d6daa8 Clear commit message after commit action
This commit introduces the feature to clear the commit message input field after the commit action is performed. Previously, the message input field retained the previous commit message, which was not ideal for future commits.

Detailing changes:
- A line of code is added that sets `commitMessage` variable to an empty string. This ensures that the message input field is cleared and ready for next commit message
2023-08-02 09:23:18 +02:00
Kiril Videlov
da1e04701f branch statistics - include committed lines 2023-08-01 17:39:15 +02:00
Nikita Galaiko
95f590a68b use an older ubuntu image 2023-08-01 11:38:01 +00:00
Nikita Galaiko
6586083e13 upload appimage updater too 2023-08-01 11:38:01 +00:00
Nikita Galaiko
4a1e0dab5a enable updater back 2023-08-01 11:38:01 +00:00
Nikita Galaiko
b2d33ead6c fix find 2023-08-01 11:38:01 +00:00
Nikita Galaiko
502c0aaacd fix variable name 2023-08-01 11:38:01 +00:00
Nikita Galaiko
283aedb1a5 tmp disable updater 2023-08-01 11:38:01 +00:00
Nikita Galaiko
885f587372 verbose 2023-08-01 11:38:01 +00:00
Nikita Galaiko
dc885c20b5 fix paths 2023-08-01 11:38:01 +00:00
Nikita Galaiko
2cbe91e227 fix script 2023-08-01 11:38:01 +00:00
Nikita Galaiko
c4e49dbbd9 fix args parsing 2023-08-01 11:38:01 +00:00