Commit Graph

2193 Commits

Author SHA1 Message Date
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
Nikita Galaiko
4ccf148035 support Linux 2023-08-01 11:38:01 +00:00
Nikita Galaiko
1fcd246011 supprt gnu grep 2023-08-01 11:38:01 +00:00
Nikita Galaiko
c4b7112f5b sign appimage 2023-08-01 11:38:01 +00:00
Nikita Galaiko
cd621e6653 enable app image builds 2023-07-31 15:34:04 +02:00
Mattias Granlund
930abe4e48 Fix ts/svelte linting 2023-07-31 13:13:52 +01:00
Mattias Granlund
0754c44128 Fix frontend lint errors 2023-07-31 13:07:21 +01:00
Nikita Galaiko
de9c969e40 sort remote branches by name 2023-07-31 13:53:31 +02:00
Kiril Videlov
20f9abf68c Add line change summary to each branch
Added a new feature that summarizes the number of lines added and removed in each branch. This update will provide coders with a quicker and concise overview of the branch's changes.

Detailed changes:
- Added a "sumBranchLinesAddedRemoved" method to count the number of added and removed lines for each branch.
- The result of the method is displayed in monospace font, with green for added lines and red for removed lines
2023-07-31 13:44:25 +02:00
Nikita Galaiko
00c702b5f2 only emit interesting file changes 2023-07-31 13:42:06 +02:00
Nikita Galaiko
94387b41d8 verify order of all branches every time 2023-07-31 12:43:41 +02:00
Scott Chacon
2db0f65b21
First vbranch based on HEAD (#880)
* don’t create a branch in a conflicted state
* take the branch we’re on and make it the first virtual branch
* fix the tests
2023-07-31 12:08:25 +02:00
Mattias Granlund
5cbbdb41f5 Fix warnings in editor with .js -> .ts 2023-07-31 10:10:11 +01:00
Mattias Granlund
5354a53cfb Limit modal height so it can't touch the nav bar
I saw in posthog that the modal can be squished and become too big.

Locally I was not fully able to reproduce, but this commit at least limits
the height so it can't overlay the nav bar.

The transition that I drop is not (and has not been) working, let's add
this back later.
2023-07-31 09:50:27 +01:00
Nikita Galaiko
267d081bf9 enable time 2023-07-31 10:33:34 +02:00
Nikita Galaiko
2b1b8cd9eb use a completely separate runtime for watcher 2023-07-31 10:33:34 +02:00
Mattias Granlund
891c57781a Add empty state for tray branch lists 2023-07-31 09:19:51 +01:00
Nikita Galaiko
2d23b2af16 rm extra console.log 2023-07-31 10:16:54 +02:00