6695 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Caleb Owens	63ee99b647	Update the normalizeBranchName function to match rust ... Before, uppercase letters and hashes were missing from the regex. I've now coppied the regex from the rust code so they are now identical	2024-05-03 20:09:22 +01:00
Caleb Owens	fe30db9760	Change metric for "undoable" ... We have two types of commits "RemoteCommit" and "Commit". "RemoteCommit" are what we see in the "Upstream" section, and in branches. These commits can't be undone. Commits of type "Commit" appear in the "Local" and "Remote" sections and are undoable	2024-05-03 19:49:40 +01:00
Caleb Owens	601d6ba809	Grey out commit buttons when title isnt present	2024-05-03 19:41:45 +01:00
Caleb Owens	c4108dc22c	Only show edit title option when commit is undoable	2024-05-03 19:32:30 +01:00
Caleb Owens	6982909689	Use stop propagation to prevent card closing	2024-05-03 19:14:24 +01:00
Caleb Owens	f8109368f3	Improve UI of advanced commit options	2024-05-03 19:10:28 +01:00
Scott Chacon	aa9a775842	Merged origin/master into target-branch-selector-fix	2024-05-03 13:51:01 +02:00
Scott Chacon	6c7e07f325	move my cloud stuff to pavels branchswitch thing	2024-05-03 13:48:16 +02:00
Kiril Videlov	8db8ec5641	Merge pull request #3676 from gitbutlerapp/update-virtual-branches-toml-on-restore ... snapshots: use subtrees for virtual_branches.toml	2024-05-03 02:50:03 -07:00
Scott Chacon	ea08accec1	whoopsie	2024-05-03 11:39:54 +02:00
Scott Chacon	0442744c13	Merge branch 'master' into target-branch-selector-fix	2024-05-03 11:26:16 +02:00
Scott Chacon	5527d2b6e2	initial implementation of different push target	2024-05-03 11:20:47 +02:00
Kiril Videlov	8ef46ce42c	snapshots: use subtrees for virtual_branches.toml ... Instead of copying the file to the working directory, simply create a top level tree with a subtree for the workdir and a blob for the toml file	2024-05-03 11:13:55 +02:00
Mattias Granlund	5bb8c25aca	Fix bug in updating base branch ... - drop "double lock across branches" test because it can't happen - save correct tree when updating branch states - use correct integration commit when updating base branch	2024-05-02 17:39:52 +02:00
Kiril Videlov	2e5684a965	Merge pull request #3671 from gitbutlerapp/advanced-commit-operations ... puts advanced commit ops behind a feature flag	2024-05-02 05:59:03 -07:00
Kiril Videlov	c312e7a287	puts advanced commit ops behind a feature flag	2024-05-02 14:57:32 +02:00
Pavel Laptev	5ba8243fd7	Experimental features toggle card fix (#3670)	2024-05-02 14:16:27 +02:00
Pavel Laptev	a73089718d	Text case fix (#3669) ... * Text case fix	2024-05-02 13:58:34 +02:00
Josh Junon	e3263774f6	Merge pull request #3668 from gitbutlerapp/simplify-default-target ... simplify default target retrieval logic	2024-05-02 13:41:07 +02:00
Josh Junon	c9c3371ba2	Merge pull request #3665 from anaisbetts/better-npm-advice-2 ... Even Better npm advice	2024-05-02 13:33:01 +02:00
Josh Junon	c047e8bee4	Merge pull request #3667 from gitbutlerapp/remove-rust-init ... eliminate rust-init step in CI	2024-05-02 13:30:04 +02:00
Josh Junon	6747da6e50	simplify default target retrieval logic	2024-05-02 13:28:21 +02:00
Josh Junon	77fbe558cc	only build gitbutler-git bins if testing	2024-05-02 13:07:33 +02:00
Josh Junon	bce6e48de8	init the rust env on windows check, too	2024-05-02 13:03:29 +02:00
Josh Junon	4625189cb9	remove use of cache	2024-05-02 13:00:25 +02:00
Josh Junon	f5ef57e74d	Merge pull request #3666 from gitbutlerapp/unix-timestamp ... eliminate redundancy in unix timestamp retrieval	2024-05-02 12:56:48 +02:00
Josh Junon	6ae4f91ecc	eliminate rust-init step in CI	2024-05-02 12:52:44 +02:00
Josh Junon	664aadcd1c	eliminate redundancy in unix timestamp retrieval	2024-05-02 12:43:35 +02:00
Ani Betts	bcadd03b44	Fix a typo in our command	2024-05-02 12:22:51 +02:00
Ani Betts	ed15283c37	More notes, come correct with line lengths	2024-05-02 12:12:36 +02:00
Kiril Videlov	80d52153ae	Merge pull request #3664 from anaisbetts/better-npm-advice ... Improve advice for npm prefix on Windows	2024-05-02 03:08:33 -07:00
Ani Betts	bce2754525	Improve advice for npm prefix on Windows ... Instead of trouncing the Program Files permissions, let's set an npm prefix instead	2024-05-02 12:00:27 +02:00
Kiril Videlov	1fc12f0c78	Merge pull request #3663 from gitbutlerapp/add-telemetry-sidebar-menu-item ... add-telemetry-sidebar-menu-item	2024-05-02 02:59:55 -07:00
Kiril Videlov	3b7387a4b3	put base branch switching behind a feature flag	2024-05-02 11:58:31 +02:00
Kiril Videlov	3326ae6b81	feat: a place in the settings for feature flags	2024-05-02 11:51:06 +02:00
Scott Chacon	ac4188819a	Merge pull request #3661 from gitbutlerapp/base-branch-commit-card-fix ... Base branch commit cards should not be editable	2024-05-02 11:36:37 +02:00
Pavel Laptev	d7d4d0fef9	Switch base branch move to project settings (#3662) ... * Remove scrollIntoView from select - It cause the whole page scroll. For now I deleted this, but it's a nice feature, so planning to fix ti later * Return `branch` in `setTargetBranch` Because the result of this async function was `undefined` * Updated `TextBox` and `SelectItem` styles * Move base branch switcher to the `Setting` page	2024-05-02 11:29:37 +02:00
Scott Chacon	5f1559aff6	Base branch commit cards should not be editable	2024-05-02 11:12:16 +02:00
Kiril Videlov	a7a37e5c91	Merge pull request #3659 from gitbutlerapp/update-windows-latest ... revert changes to windows version in ci	2024-05-02 02:05:54 -07:00
Kiril Videlov	ab4fae2c27	revert changes to windows version in ci	2024-05-02 10:47:28 +02:00
Kiril Videlov	e115c69042	Merge pull request #3657 from DrBarnabus/fix-branch-switcher-styling ... fix: `.branch-switcher` styling in dark mode	2024-05-02 01:31:52 -07:00
Kiril Videlov	a7ed2eb695	Merge pull request #3658 from gitbutlerapp/update-macos-and-windows-platforms ... update CI runners	2024-05-02 01:12:16 -07:00
Kiril Videlov	59ade99566	update CI runners ... macos-latest is no longer x86, specifying 13 in order to have x86 builds back	2024-05-02 09:59:08 +02:00
Daniel Woodward	0dfdaa5f79	fix: .branch-switcher styling in dark mode	2024-05-01 22:15:44 +01:00
Kiril Videlov	c6b05d3ffb	Merge pull request #3655 from gitbutlerapp/dependabot/cargo/tauri-plugin-window-state-5e3900e ... Bump tauri-plugin-window-state from `773b498` to `5e3900e`	2024-05-01 10:51:13 -07:00
Kiril Videlov	31797d1f61	Merge pull request #3654 from gitbutlerapp/dependabot/cargo/tauri-plugin-single-instance-5e3900e ... Bump tauri-plugin-single-instance from `773b498` to `5e3900e`	2024-05-01 10:51:07 -07:00
Kiril Videlov	026723eb87	Merge pull request #3653 from gitbutlerapp/dependabot/cargo/tauri-plugin-store-5e3900e ... Bump tauri-plugin-store from `773b498` to `5e3900e`	2024-05-01 10:51:02 -07:00
Kiril Videlov	6c0f4c0946	Merge pull request #3652 from gitbutlerapp/dependabot/cargo/tauri-plugin-log-5e3900e ... Bump tauri-plugin-log from `773b498` to `5e3900e`	2024-05-01 10:50:58 -07:00
Kiril Videlov	80050fe230	Merge pull request #3651 from gitbutlerapp/dependabot/cargo/rust-updates-fd4bde4357 ... Bump the rust-updates group with 10 updates	2024-05-01 10:50:51 -07:00
dependabot[bot]	751db87188	Bump tauri-plugin-window-state from 773b498 to 5e3900e ... Bumps [tauri-plugin-window-state](https://github.com/tauri-apps/plugins-workspace) from `773b498` to `5e3900e`. - [Release notes](https://github.com/tauri-apps/plugins-workspace/releases) - [Commits](773b498392...5e3900e682) --- updated-dependencies: - dependency-name: tauri-plugin-window-state dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-05-01 15:14:03 +00:00