gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-25 02:26:14 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,879 Commits 157 Branches 1,067 Tags 61 MiB
901aed1afe
Commit Graph

856 Commits

Author SHA1 Message Date
Pavel Laptev
2412962384
Merge pull request #3082 from gitbutlerapp/authentication-methods-style-fixes 
authentication-methods-style-fixes
 2024-03-09 00:34:51 +01:00
Pavel Laptev
96fc88beb9 CSS fixes 
- fixed vertical scroll for DecorativeSplitView in order to respect the selector pop up behaviour
- added `…` to `remove project` which means there will be an aditional action after click
- small CSS fixes to `Selector`
 2024-03-09 00:33:25 +01:00
Mattias Granlund
5477c2dd5f Fix navigating to new project after deleting another 2024-03-08 22:40:01 +01:00
Kiril Videlov
cb128df06b feat: Add last commit timestamp and author to RemoteBranch struct and use it in CombinedBranch for display purposes. 2024-03-08 22:22:40 +01:00
Pavel Laptev
a9f1900f19 versical scroll for credentials onboarding screen 2024-03-08 22:06:02 +01:00
Pavel Laptev
8f36bd2f99 refactor: Improve button styling and readability 
- Changed the "Back" button to have a neutral color.
- Updated the disclaimer text to include a link for more information on authentication methods.
- Fixed background color for disclamer.
- Updated "preferred_key" section style.
 2024-03-08 22:05:07 +01:00
Matías Fuentes
c69ca25cbd fix: added draggable="false" to file-icon and created a class in styles ".file-icon". 
formated file
fix: width space on file icon
fix: format
 2024-03-08 22:02:06 +01:00
Mattias Granlund
acb25f3d98 Fix new project redirect 
- needs to be improved in the future
 2024-03-08 21:21:41 +01:00
Mattias Granlund
efb8f77543 Integrated credential checker into settings and setup flow 
- adds new [projectId]/setup route
 2024-03-08 19:26:34 +01:00
Mattias Granlund
7e3049d179 Add git credential checker to project setup 
This is meant to help with the most frequent support requests, problems
with pulling and pushing from a git remote.
 2024-03-08 19:26:34 +01:00
Pavel Laptev
ded41d7728 removed non existing attr 2024-03-08 11:44:20 +01:00
Pavel Laptev
0d3c33b821 section card updates 
- added `clickable` and non `clickable` styles
- added hover state if it's clickable
- added `labelFor` where it was missing and removed where the card is not clickable
 2024-03-08 11:03:22 +01:00
Mattias Granlund
6bbf7a8310 Fix settings page refactor regressions 
- fixes click on some missing elements
- load ssh key in onMount
- happened with removal of clickable card
- fixes missed prop renames
 2024-03-08 02:47:32 +01:00
Mattias Granlund
645e076a78 Use SectionCard instead of ClickableCard 
- commit grew a bit in scope
- lots of refactoring to settings pages
- clickable card dropped
 2024-03-08 00:19:11 +01:00
Mattias Granlund
0311052f24 Add back push success/failure telemetry 
- accidentally dropped when removing duplicate function
 2024-03-07 21:45:43 +01:00
Matías Fuentes
ccd8417626 fix: runned format command 2024-03-07 21:16:51 +01:00
Matías Fuentes
ac7adbedae fix: branches filter checkboxes and toggle behavior 2024-03-07 21:16:51 +01:00
Pavel Laptev
f4fc6b1b1d
Merge pull request #3066 from gitbutlerapp/Copy-update 
Info message updates
 2024-03-07 14:54:48 +01:00
Pavel Laptev
1df2d69445 fixed button color in InfoMessage 2024-03-07 14:52:47 +01:00
Pavel Laptev
8791b58cd8 feat: Added a new "test" icon 2024-03-07 14:44:12 +01:00
Pavel Laptev
4128a404b3 Info message updates 
- added new `success` style
- added two propes `filled` and `outlined` with which you can modify the look and switch on or off these props separatly
 2024-03-07 14:38:29 +01:00
Pavel Laptev
93abbf85c8
Merge pull request #3050 from gitbutlerapp/Copy-update 
Update button text from "Authenticate" to "Authorize" in GitHub authentication workflow
 2024-03-07 14:35:12 +01:00
Pavel Laptev
467f4a1379 Added Forget button 
- added forget button to the card
- removed conditional `Forget` button from the `minimal` mode, because we don't use it
 2024-03-07 00:23:09 +01:00
Mattias Granlund
45846117e2 Update merge button labels 
- corrects language to say e.g. "rebase and squash" instead of "rebase"
 2024-03-06 23:18:19 +02:00
Mattias Granlund
e092358453 Remove unnecessary css from app.html 
- they were added a long time ago and have no effect
 2024-03-06 23:16:00 +02:00
Mattias Granlund
74a906618e Fix problem with user-select: none in root element 
- webkit bug related to draggable=true
- left descendants without ability to set user-select: text
- unclear why it only affected draggable lanes and not e.g. hunks
 2024-03-06 23:16:00 +02:00
Mattias Granlund
bcc2cd721f Change "discard file" to "discard changes" 2024-03-06 19:18:33 +02:00
Mattias Granlund
5c64a0ea90 Rename a couple of ts files from snake_case to camelCase 2024-03-06 16:47:57 +02:00
Pavel Laptev
02d7a183b4 style: updated design tokens 2024-03-06 15:17:27 +01:00
Pavel Laptev
72dd125056 feat: Update button text from "Authenticate" to "Authorize" in GitHub authentication workflow 
Changed the button text from "Authenticate" to "Authorize" for better clarity.
 2024-03-06 14:31:03 +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
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
Pavel Laptev
d34184c1da feat: add new icon for logs in the icon library 2024-03-05 16:15:16 +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
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
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
Josh Junon
84684a3f29 fix list item overflow on windows 2024-03-04 16:44:22 +01:00
Pavel Laptev
34ea782123 feat: add support for tracking if the resizer is being dragged in the navigation component 2024-03-03 23:53:42 +01:00
Pavel Laptev
4ca8703fc6 Commit card styles updates 
- Fix card styles for cases when there are no commits
- card `min-height` removed
 2024-03-03 22:56:38 +01:00
Pavel Laptev
82a5e0267f Styles updates: Fold navigation button hover 2024-03-03 22:40:13 +01:00
Pavel Laptev
8f0536fdc8 Not render commits div if there are no commits 2024-03-03 22:40:13 +01:00
Pavel Laptev
ac376c1b03 document format to pass Lint checks 2024-03-03 22:40:13 +01:00
Pavel Laptev
a74b60e4da Branch icons styles update 
- Branch icon code rafactor
- Virtual branch color changed
 2024-03-03 22:40:13 +01:00
Kiril Videlov
113da1f752
lower sentry performance sample rate 2024-03-03 21:09:47 +01:00
Kiril Videlov
7fdb26b139 fixes an merge conflict resolution mistake 2024-03-03 18:39:16 +01:00
Kiril Videlov
dbcc24c19d
Merge branch 'master' into navigate 2024-03-03 18:33:42 +01:00
Kiril Videlov
45fa02eeb0
feat: add check for deleted files to disable "Open in VSCode" option in context menu 2024-03-03 18:28:49 +01:00
Kiril Videlov
78968e5e5d
chore: update console logs to use console.error for error messages 2024-03-03 18:03:30 +01:00
Kiril Videlov
767c1daded
Merge pull request #2959 from Pranav2612000/feat/2950-file-context-menu-improvements 
File context menu improvements
 2024-03-03 17:59:42 +01:00
Kiril Videlov
aab694df48
Merge pull request #2946 from gitbutlerapp/Update-unapply-files-function 
✨ feat: adds reset_files command to revert files
 2024-03-03 17:56:50 +01:00
Kiril Videlov
19e586dbb2 feat(UI): handle list vbranches returning an object 2024-03-03 17:34:02 +01:00
Pranav2612000
ba726070f2 feat file_context: add items to copy absolute_path, copy relative_path 
and open in vscode
 2024-03-03 16:56:09 +05:30
Mattias Granlund
44b705697b Add keyboard nav to FileTree as well 2024-03-03 12:15:41 +01:00
Pranav2612000
b1798ab79f fix: show Discard files (plural) if more than 1 file selected 2024-03-03 16:38:56 +05:30
Alabhya Jindal
bd9c12f486 Fix lint issues 2024-03-03 15:36:27 +05:30
Alabhya Jindal
c93efa1986 Add comments 2024-03-03 15:29:48 +05:30
Alabhya Jindal
a1c5137aa6 Improve keydown function 2024-03-03 15:22:08 +05:30
Mattias Granlund
20d50e17e3 Update text: discard file -> discard changes 2024-03-03 10:46:20 +02:00
Alabhya Jindal
4a19332092 Passed files as FileTree 2024-03-03 14:15:24 +05:30
Pavel Laptev
9bd3e89430 fix SVG spinner radius 2024-03-02 22:20:30 +01:00
Pavel Laptev
a74947764a PR card tweak 
- check is `status` tag `filled` or not
- added `no checks` label
- removed `border` on status tags
 2024-03-02 22:16:38 +01:00
Pavel Laptev
5058ca253a - restrickted pinter events for Tooltip 2024-03-02 21:25:27 +01:00
Pavel Laptev
1b1435c1c6 Spinner animation time changed 2024-03-02 21:25:27 +01:00
Pavel Laptev
32d4b026a0 Refactor: Button and Dropdown 
- removed `:global` rule
- removed `class` prop from `Button` as not used
- removed `joinClassNames` function as not efficient and almost not used
- added `isDropdownChild` to `Button`
 2024-03-02 21:25:27 +01:00
Pavel Laptev
a30a5083cd updated Spinner animation and styles 2024-03-02 21:25:27 +01:00
Pavel Laptev
fddf37a95d styles: Tag spinner style updated 2024-03-02 21:25:27 +01:00
AbhishekThorat
010e2166ea - Address review comment. - Used openExternalUrl instead of open method directly 2024-03-02 21:23:50 +02:00
AbhishekThorat
eeb1336445 - lint fix 2024-03-02 21:23:50 +02:00
AbhishekThorat
c25f1976f2 - Add missing import for open tauri api 2024-03-02 21:23:50 +02:00
Mattias Granlund
e5cdd0fa4d Use external url opener on login page 
- provides a toast with feedback on error
 2024-03-02 17:39:05 +02:00
Mattias Granlund
24bf86a1bf Fix top level page loading indicator 
- the previous method would render to the page as undefined
 2024-03-02 17:16:08 +02:00
Mattias Granlund
47e54e5bbb Use filled tag when github checks have passed 2024-03-02 16:16:57 +02:00
Mattias Granlund
cd879ab014 Create new pull request card 2024-03-02 12:13:06 +02:00
Scott Chacon
d4f89e8588 Merged origin/master into Update unapply files function 2024-03-01 22:15:03 +01:00
dependabot[bot]
c3592ea526 Bump the npm-updates group with 15 updates 
Bumps the npm-updates group with 15 updates:

| Package | From | To |
| --- | --- | --- |
| [@tauri-apps/cli](https://github.com/tauri-apps/tauri) | `1.5.9` | `1.5.10` |
| [@codemirror/lang-javascript](https://github.com/codemirror/lang-javascript) | `6.2.1` | `6.2.2` |
| [@codemirror/state](https://github.com/codemirror/state) | `6.4.0` | `6.4.1` |
| [@codemirror/view](https://github.com/codemirror/view) | `6.23.1` | `6.24.1` |
| [@sentry/sveltekit](https://github.com/getsentry/sentry-javascript) | `7.100.1` | `7.104.0` |
| [@sveltejs/kit](https://github.com/sveltejs/kit/tree/HEAD/packages/kit) | `1.30.3` | `1.30.4` |
| [eslint](https://github.com/eslint/eslint) | `8.56.0` | `8.57.0` |
| [inter-ui](https://github.com/philipbelesky/inter-ui) | `4.0.1` | `4.0.2` |
| [nanoid](https://github.com/ai/nanoid) | `5.0.5` | `5.0.6` |
| [postcss](https://github.com/postcss/postcss) | `8.4.34` | `8.4.35` |
| [postcss-load-config](https://github.com/postcss/postcss-load-config) | `5.0.2` | `5.0.3` |
| [posthog-js](https://github.com/PostHog/posthog-js) | `1.105.1` | `1.110.0` |
| [prettier-plugin-svelte](https://github.com/sveltejs/prettier-plugin-svelte) | `3.1.2` | `3.2.2` |
| [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte) | `4.2.10` | `4.2.12` |
| [svelte-check](https://github.com/sveltejs/language-tools) | `3.6.3` | `3.6.6` |


Updates `@tauri-apps/cli` from 1.5.9 to 1.5.10
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/@tauri-apps/cli-v1.5.9...@tauri-apps/cli-v1.5.10)

Updates `@codemirror/lang-javascript` from 6.2.1 to 6.2.2
- [Changelog](https://github.com/codemirror/lang-javascript/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/lang-javascript/compare/6.2.1...6.2.2)

Updates `@codemirror/state` from 6.4.0 to 6.4.1
- [Changelog](https://github.com/codemirror/state/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/state/compare/6.4.0...6.4.1)

Updates `@codemirror/view` from 6.23.1 to 6.24.1
- [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/view/compare/6.23.1...6.24.1)

Updates `@sentry/sveltekit` from 7.100.1 to 7.104.0
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/7.104.0/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/7.100.1...7.104.0)

Updates `@sveltejs/kit` from 1.30.3 to 1.30.4
- [Release notes](https://github.com/sveltejs/kit/releases)
- [Changelog](https://github.com/sveltejs/kit/blob/@sveltejs/kit@1.30.4/packages/kit/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/kit/commits/@sveltejs/kit@1.30.4/packages/kit)

Updates `eslint` from 8.56.0 to 8.57.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.56.0...v8.57.0)

Updates `inter-ui` from 4.0.1 to 4.0.2
- [Changelog](https://github.com/philipbelesky/inter-ui/blob/main/CHANGELOG.md)
- [Commits](https://github.com/philipbelesky/inter-ui/commits)

Updates `nanoid` from 5.0.5 to 5.0.6
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/5.0.5...5.0.6)

Updates `postcss` from 8.4.34 to 8.4.35
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.34...8.4.35)

Updates `postcss-load-config` from 5.0.2 to 5.0.3
- [Release notes](https://github.com/postcss/postcss-load-config/releases)
- [Changelog](https://github.com/postcss/postcss-load-config/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss-load-config/compare/5.0.2...v5.0.3)

Updates `posthog-js` from 1.105.1 to 1.110.0
- [Release notes](https://github.com/PostHog/posthog-js/releases)
- [Changelog](https://github.com/PostHog/posthog-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-js/commits/v1.110.0)

Updates `prettier-plugin-svelte` from 3.1.2 to 3.2.2
- [Changelog](https://github.com/sveltejs/prettier-plugin-svelte/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/prettier-plugin-svelte/compare/v3.1.2...v3.2.2)

Updates `svelte` from 4.2.10 to 4.2.12
- [Release notes](https://github.com/sveltejs/svelte/releases)
- [Changelog](https://github.com/sveltejs/svelte/blob/svelte@4.2.12/packages/svelte/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/svelte/commits/svelte@4.2.12/packages/svelte)

Updates `svelte-check` from 3.6.3 to 3.6.6
- [Release notes](https://github.com/sveltejs/language-tools/releases)
- [Commits](https://github.com/sveltejs/language-tools/compare/svelte-check-3.6.3...svelte-check-3.6.6)

---
updated-dependencies:
- dependency-name: "@tauri-apps/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: "@codemirror/lang-javascript"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: "@codemirror/state"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: "@codemirror/view"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: "@sentry/sveltekit"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: "@sveltejs/kit"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: inter-ui
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: nanoid
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: postcss-load-config
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: posthog-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: prettier-plugin-svelte
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: svelte
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: svelte-check
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-01 22:13:20 +02:00
Mattias Granlund
dd577b62c5 fix problem with stuck "busy..." state 2024-03-01 21:56:45 +02:00
Scott Chacon
99d95e01c6 lol, prettier 2024-03-01 15:29:37 +01:00
Pavel Laptev
2bdf11d1a4 Moved no-drag CSS prop to the image component 2024-03-01 14:48:35 +01:00
Pavel Laptev
a746e2d5c5 Merge branch 'master' into pr/2936 2024-03-01 14:46:33 +01:00
Scott Chacon
740e0477da Merged origin/master into Update unapply files function 2024-03-01 13:11:24 +01:00
Mattias Granlund
d26c92bea4 Remove outdated comment 
- the container div is now added programatically
 2024-03-01 11:56:05 +02:00
Pavel Laptev
50512c79ba fix:change the place where the tooltip should appear 2024-03-01 01:47:28 +01:00
Mattias Granlund
7eabc10e4f Fix right click on file double menu 
- add preventdefault modifier to event handlers
 2024-03-01 00:37:12 +02:00
Mattias Granlund
34bafe3d35 Drop commented out css line 2024-02-29 21:51:39 +02:00
Mattias Granlund
c6aca14a71 Nitpick some variable names and function declarations 2024-02-29 21:51:39 +02:00
Pavel Laptev
6adfd6883c hotkey added to hide the sidebar added 2024-02-29 21:51:39 +02:00
Pavel Laptev
7192c1f17f UI: small badge for the folded trunk menu item 2024-02-29 21:51:39 +02:00
Pavel Laptev
e20d5cdc1c UI: tooltip styles update, tooltips for sidebar 2024-02-29 21:51:39 +02:00
Pavel Laptev
9a0ccdc1f2 styles fixes and remove unused class 2024-02-29 21:51:39 +02:00
Daniel Kranich
4dd441ccd0 formatting fixes to pass CI 2024-02-29 21:51:39 +02:00
Daniel Kranich
65fd9eabce Remove unused navCollapsed function 2024-02-29 21:51:39 +02:00
Daniel Kranich
4b34694cb6 Simplify collapsing nav state management 
Simplified the state management for setting and reading the nav collapsed state
 2024-02-29 21:51:39 +02:00
Daniel Kranich
5b00eed576 AccountLink isNavCollapsed export defaults to false 
This means it only needs to be specified if it matters
 2024-02-29 21:51:39 +02:00
Pavel Laptev
2062d31cb8 paddings fixes 2024-02-29 21:51:39 +02:00
Pavel Laptev
92c6012cc5 folded navigation updates 
- Added `overflowValue` event to handle folding the navbar when resizing reaches the minimum value.
- Updated navbar paddings.
- The `IconButton` component now includes a new property `width`.
 2024-02-29 21:51:39 +02:00
Pavel Laptev
5561f055b3 removed unused resizer property 2024-02-29 21:51:39 +02:00
Pavel Laptev
88b3058dd0 Navigation bar folded state update 
-  updated folded state
- Inline SVG images moved to assets folder as images
- added new bigger size for `ButtonIcon`
 2024-02-29 21:51:39 +02:00
Pavel Laptev
5b467d5261 remove branches list resizer 2024-02-29 21:51:39 +02:00
Pavel Laptev
40cc56db9b Added project avatar 2024-02-29 21:51:39 +02:00
Pavel Laptev
ada64ac160 UI: folding button styles 2024-02-29 21:51:39 +02:00
Pavel Laptev
e58356bd14 detect OS 
in order to remove/add sidebar padding on the Sidebar
 2024-02-29 21:51:39 +02:00
Pavel Laptev
7b1499e797 rezizer styles updated 
- updated resizer styles
- removed Tailwind classes (we will remove it in the future)
- updated components styles that use `Resize` in order to support its update
 2024-02-29 21:51:39 +02:00
Daniel Kranich
0404a3a0bd Fix code formatting and linting errors 2024-02-29 21:51:39 +02:00
Daniel Kranich
e069b5aeef fix: pass isNavCollapsed prop to AccountLink component to ensure proper functionality 2024-02-29 21:51:39 +02:00
Daniel Kranich
064c1a0765 Move collapse functionality into a single function to toggle the collapsed state. 2024-02-29 21:51:39 +02:00
Daniel Kranich
8518820935 Pass collapsed state as normal boolean rather than persisted storage boolean to other components. 2024-02-29 21:51:39 +02:00
Daniel Kranich
8b387a306a chore: update navigation component to support collapsing and expanding the navigation menu 2024-02-29 21:51:39 +02:00
Kiril Videlov
e8c7f53685
adds file logging of UI errors 2024-02-29 19:28:45 +01:00
Scott Chacon
c2571fd715 ✨ feat: adds reset_files command to revert files 
The "Revert File" function cheated a bit by undoing all the hunks, but that doesn't work for added or removed files. 

Added files are not removed, just contents cleared. Removed files are not restored.

This changes the implementation to just pass file paths and have git2 run the equivalent to `git checkout -- path` from the index.
 2024-02-29 13:19:16 +01:00
Mattias Granlund
8ba697482e Fix app updater error analytics 
Error payload must be an object, otherwise it gets converted to an array of characters.
 2024-02-29 12:22:14 +02:00
Kiril Videlov
0cbea7fa7c fix: prevent overwriting github_access_token with null when updating user profile 2024-02-29 10:47:35 +01:00
Mattias Granlund
a2f469bb0a Fix app updater bug 
- move `distinctUntilChanged` before combining with status
- add appropriate async to install function
- small reformatting
 2024-02-28 15:20:24 +02:00
Pouya Kary ✨
ee9afa9082
Making the image in empty board not draggable. 2024-02-28 13:46:10 +03:30
Kiril Videlov
b0796a0bb3 fixes an issue where project settings were not saved correctly 2024-02-27 21:38:29 +01:00
Alabhya Jindal
f0a248e74b Add comments 2024-02-28 00:44:34 +05:30
Alabhya Jindal
cf448848d0 Setting focus using element ids 2024-02-28 00:41:07 +05:30
Alabhya Jindal
e3d6146281 Move repeated check for commitMessage inside function 2024-02-27 17:58:14 +02:00
Alabhya Jindal
c80e48d814 Fix variable typo 2024-02-27 17:58:14 +02:00
Alabhya Jindal
c07192f81e Add commit shortcut 2024-02-27 17:58:14 +02:00
Alabhya Jindal
060ccbb40a Declared sortedFiles reactive declaration to use in function and markup 2024-02-27 19:28:04 +05:30
Alabhya Jindal
1f6589d709 Change selected file on ArrowUp 2024-02-27 18:50:44 +05:30
Mattias Granlund
feab3be9b1 Rename UpdateButton -> AppUpdater 2024-02-27 12:08:26 +02:00
Scott Chacon
04e087db81 The commit URL link in bitbucket is 'commits/', not 'commit/'. In gitlab, there is a '-'. 
Interestingly, GitHub appears to support both 'commit/' and 'commits/' and GitLab will correct a missing '-'.
 2024-02-26 23:46:28 +01:00
Mattias Granlund
5c9fc86ff1 Dismiss app updater once per version 
- sets `dismiss = false` when new version is available
 2024-02-27 00:23:08 +02:00
Pavel Laptev
0bc417f6cb style: update padding in header component for better alignment and spacing 2024-02-26 21:50:52 +01:00
Pavel Laptev
8dbeadd5ea style: update font size and class names for textbox and textarea elements 2024-02-26 21:39:45 +01:00
Pavel Laptev
929af8a03d style: update padding and spacing in various components 
The padding and spacing in various components have been updated to improve the visual layout and alignment. This includes changes to the commit box, text inputs, commit list, branch files, and other related elements. The padding values have been adjusted to ensure consistent spacing and improve overall readability and usability.
 2024-02-26 21:39:28 +01:00
Pavel Laptev
78ebcfd0ba add cursor pointer to Select comp 2024-02-26 20:46:47 +01:00
Pavel Laptev
03852120e1 changed interactive elements cursor to pointer 2024-02-26 20:40:09 +01:00
Pavel Laptev
992a988fb7 Merge branch 'master' into pr/2899 2024-02-26 20:17:22 +01:00
Mattias Granlund
804041765e Remove duplicate toasts based on id 
- also renames ToastMessage interface to Toast
- release notes given static id to prevent duplicates
 2024-02-26 17:16:16 +02:00
Mattias Granlund
72779bd481 Update delete project text in project settings 2024-02-26 14:50:41 +02:00
Mattias Granlund
cc155dd1c0 Fix incorrect error when adding new project 
- base branch observable now starts with undefined
- simplifies fetch interval setup
- use correct string for catching auth error
 2024-02-26 14:47:09 +02:00
Mattias Granlund
0862d766bf Add back custom app updater 
- native one doesn't work on all platforms
 2024-02-26 13:03:23 +02:00
Pavel Laptev
84f04532a8 New projects setting page and components UI 
- settings page components updated with new settings components
- added new `eye` icons
- `SectionCard` component updated in order to handle radio-groups
- `TextArea` added label
- New util function in order to convert px to rem
- new component to handle fullscreen spener loading
-
 2024-02-26 00:13:02 +01:00
Kiril Videlov
000ddeff91 chore: remove user-facing config for using diff contexts infavor of automatic migration 2024-02-25 23:24:58 +01:00
Kiril Videlov
91885eac6b adds a config for using diffs with context lines internallyl 2024-02-25 23:24:58 +01:00
Kiril Videlov
ceb81c6589 feat: add option to hide large numbers of diffs to improve UI performance 2024-02-24 14:20:32 +01:00
Caleb Owens
2949c89f32
Add pointer cursor to buttons 2024-02-24 12:35:53 +00:00
Pavel Laptev
d32b9deba7 UI fix: divider color updated 2024-02-23 23:46:14 +01:00
Pavel Laptev
c59d899e26 UX fix: added draggable areas on the empry sides in the content vew 2024-02-23 23:41:24 +01:00
Pavel Laptev
3f6e659c64 UI fix: switched the content background and the sidebar background colors 2024-02-23 23:40:13 +01:00
Pavel Laptev
f3f4e55016 CSS fix: updated theme card radius and border-width 2024-02-23 23:39:17 +01:00
Mattias Granlund
d1318cc28c Show better error messages on push failure 
- new style toast with link to documentation
- removes duplicate push function
 2024-02-23 13:37:43 +02:00
Pavel Laptev
07b9cb46a8 CSS fixes: pofile sidebar 2024-02-22 20:53:34 +01:00
Pavel Laptev
58a652a30f
- Appearance section design updated 
- code review fixes
 2024-02-22 19:44:46 +01:00
Pavel Laptev
96f7f8e3c6 Profile page redesign 
- new icons
- icon size could be adjusted with `size` prop
- new focus color for focus states
- `Spacer` component updated
- new `Profile settings` page layout
 2024-02-22 19:44:40 +01:00
Mattias Granlund
22c9d2eb05 Include error in commit failure report 2024-02-22 17:57:28 +02:00
Mattias Granlund
6fe2f324ab Improve github service error handling 
- fix copy pasted error message
- add error variation
 2024-02-22 16:13:59 +02:00
Mattias Granlund
3ef6ab85a8 fix: only report failed pr creation once 2024-02-22 16:05:09 +02:00
Mattias Granlund
624df62430 Fix pr creation bug related to sentry 
- startTransaction returns undefined if error reporting turned off
 2024-02-22 13:42:55 +02:00
Mattias Granlund
c6c20030ba Fix GitHub error mapping 
- correctly parses the error response
 2024-02-22 01:37:40 +02:00
Mattias Granlund
dd1c8866c3 Fix GitHub error mapping 
- correctly parses the error response
 2024-02-22 01:03:19 +02:00
Mattias Granlund
ba922bf76d Show upstream commits only to butlers 
- pending work on the merge function
 2024-02-21 23:16:40 +02:00
Mattias Granlund
295f38aad9 Update upstream commtis UI 
- just makes it look more like other components
 2024-02-21 23:16:28 +02:00
Mattias Granlund
337dd42982 Use same function for opening all external urls 
- gives us a better toast in case url fails to open
 2024-02-21 22:33:18 +02:00
Mattias Granlund
00157968ed Show upstream commits if such exist 
- component was lost in a refactor, bringing it back
- needs a new design, but landing to unblock users
 2024-02-21 22:17:37 +02:00
Pranav2612000
3cc0c90cc5 feat: generate PR title and body from commit 
If the branch contains only 1 commit, we use the first
line to generate the PR title and the remaining commit
body to generate the PR body

Co-Author: @eyalch
 2024-02-21 22:13:32 +02:00
Mattias Granlund
6100f31f58 Show toast with richer content on GitHub errors 
- move error handling from createPr call site to service
- showToast still uses global store, consider refactor
- toast content will be updated shortly
 2024-02-21 13:01:00 +02:00
Caleb Owens
0fb074a7a1 Update to react to changes in pr URL 2024-02-20 16:16:43 +02:00
Caleb Owens
6a741c22cc Add the context menu to unapplied PRs 2024-02-20 16:16:43 +02:00
Caleb Owens
a247f08802 Add option to copy PR URL to clipboard 2024-02-20 16:16:43 +02:00
Caleb Owens
8b35614188 Add word wrap to commit body 2024-02-20 14:56:45 +01:00
Kiril Videlov
fb56cad857
Merge pull request #2750 from gitbutlerapp/Move-commit-to-vbranch-tests 
move commit functionality
 2024-02-20 14:55:40 +01:00
Kiril Videlov
5976477a29
Merge pull request #2829 from gitbutlerapp/fixex-project-auto-fetch 
fixex-project-auto-fetch
 2024-02-20 10:49:47 +01:00
Kiril Videlov
663dcf1115
fix: only fetch poject when navigation goes to a new project 2024-02-20 10:37:33 +01:00
Mattias Granlund
52560922cd Allow front end periods in branch names 
Noticed a PR changing the branch name regex in the rust code, this pr fixes the same thing
in the typescript code.

https://github.com/gitbutlerapp/gitbutler/pull/2766/files
 2024-02-20 10:56:45 +02:00
Pavel Laptev
1786a38cf3
Merge pull request #2810 from Caleb-T-Owens/Add-tooltip-to-show-full-commit-message 
Add tooltip to show full commit message
 2024-02-20 02:07:31 +01:00
Pavel Laptev
1bdc4eb322 ui: buttons align changed 2024-02-20 02:05:47 +01:00
Pavel Laptev
376cee414a lint fix: unused component removed 2024-02-20 01:52:58 +01:00
Pavel Laptev
dba7ebf89a ui: commit card styles update 2024-02-20 01:49:52 +01:00
Kiril Videlov
3bc56d6c1f
chore: replace app internal scheduled fetching with UI triggered fetching on per-project basis 2024-02-20 00:52:30 +01:00
Caleb Owens
7e2ef922dd Handle commit descriptions that start with just one new line rather than 2 2024-02-19 22:14:39 +00:00
Caleb Owens
5b340f1301 Update icon alignment, and author-name 
Fix linting errors
 2024-02-19 22:14:39 +00:00
Caleb Owens
adbebb93fd Updated styles and now pull title and body from commit methods 
Update styles
Update title class
Updated styles
Refactor conditions
 2024-02-19 22:14:39 +00:00
Caleb Owens
95b18f8806 More changes 
With more lines
 2024-02-19 22:14:39 +00:00
Caleb Owens
6c0603813b Add tooltip to show full commit message 2024-02-19 22:14:39 +00:00
Pavel Laptev
44cb3d5b42 small UI tweaks 2024-02-19 21:47:21 +01:00
Pavel Laptev
9a5fe102a7 NotOnGitButlerBranch refactor 
- fixed screen flickering
- page layout updated
 2024-02-19 21:43:51 +01:00
Pavel Laptev
7227d7acf6 small copy change 
in order to make the button shorter
 2024-02-19 21:42:27 +01:00
AbhishekThorat
48ea49f323 - Lint fix 2024-02-20 01:20:14 +05:30
AbhishekThorat
dea2b64b6f - Minor variable name change 2024-02-20 01:16:56 +05:30
Abhishek Thorat
7acfd2a8a9
Merge branch 'master' into support/remove-project-from-not-on-git-butler-branch 2024-02-20 01:01:13 +05:30
AbhishekThorat
411f85b783 - Fix project not found issue after deleting project from non-git-butler-branch screen 2024-02-19 23:47:48 +05:30
Kiril Videlov
fde55c81ac
Merge pull request #2816 from Meesayen/add-file-discard-menu-in-tree-view 
chore: applied context menu to discard file to the tree view
 2024-02-19 18:51:43 +01:00
AbhishekThorat
016d79928c - lint fix 2024-02-19 21:30:48 +05:30
AbhishekThorat
abf4f9d16e Merge branch 'master' of https://github.com/AbhishekThorat/gitbutler into support/remove-project-from-not-on-git-butler-branch 2024-02-19 21:27:51 +05:30
AbhishekThorat
19495250e0 - Add Remove this project ... button with not on git butler branch screen 2024-02-19 21:23:09 +05:30
Pavel Laptev
9c52e18d39 UI fix: replaced textarea element with TextArea component 2024-02-19 15:30:57 +01:00
Pavel Laptev
aa20f30f4d CSS fix: trancate long virtual branch names 2024-02-19 15:27:00 +01:00
Pavel Laptev
673e6c1a42 project setup card feature style fix 2024-02-19 15:26:22 +01:00
Meesayen
a8e1c7bc7d chore: applied context menu to discard file to the tree view 2024-02-19 14:59:27 +01:00
Meesayen
0fddf1bc5b chore: consider "contextmenu" event as a click outside event too 2024-02-19 15:46:16 +02:00
Nikita Galaiko
658a1ab1be connect ui to move_commit 2024-02-19 14:43:20 +01:00
AbhishekThorat
52607dfb75 - Add default branch check before deleting virtual branch directly 2024-02-19 15:35:10 +02:00
AbhishekThorat
fa8386552c fix - Avoid showing delete branch modal for empty virtual branch. 2024-02-19 15:35:10 +02:00
Meesayen
de7d869411 fix: hunk and file context menu now correctly dismiss 2024-02-19 15:27:09 +02:00
Meesayen
f36ba52b27 fix: the branch card's options menu is truncated by a recently added overflow:hidden 2024-02-19 15:14:59 +02:00
Dino Lindlau
16f834fc08 Add a custom renderer for links, same as in ToastControlelr 2024-02-19 13:08:18 +02:00
Pavel Laptev
21d11c84c5 refactor: TextBox component refactor, select component updated 2024-02-19 01:29:01 +01:00
Pavel Laptev
54a5e4eef9 UI: card style update 2024-02-19 01:27:40 +01:00
Pavel Laptev
ae0c24ffaa shadow design tokens update 2024-02-19 00:24:14 +01:00
Pavel Laptev
2959840c3f discard file copy update 2024-02-19 00:22:52 +01:00
Meesayen
d133f21b30 chore: fix linting issue 2024-02-18 20:53:35 +01:00
Federico Giovagnoli
bbdb24973c
Merge branch 'master' into discard-entire-file-via-contextmenu 2024-02-18 20:51:37 +01:00
Pavel Laptev
564ea365f1 resizer position bug fixed 2024-02-18 20:12:36 +01:00
Kiril Videlov
4797efd663
Merge branch 'master' into discard-entire-file-via-contextmenu 2024-02-18 15:48:17 +01:00
Pavel Laptev
bd01a2d88d small css fixes, color theme tweaking 2024-02-18 15:27:56 +01:00
Pavel Laptev
ccaa380b36 light color for intaractive states updated 2024-02-18 15:23:03 +01:00
Meesayen
8ba3ad3fe1 chore: fix linting issue 2024-02-18 14:22:50 +01:00
Federico Giovagnoli
10ae89202d
Merge branch 'master' into discard-entire-file-via-contextmenu 2024-02-18 14:18:26 +01:00
Pavel Laptev
e2b42d5778 input focus bacground updated 2024-02-18 00:33:04 +01:00
Pavel Laptev
ad492d0c77 updated color theme, postcss files renamed to css, input classes refactoring 2024-02-18 00:23:14 +01:00
Pavel Laptev
a2a4df45de removed unused CSS, added role="button in order to handle button-like elements 2024-02-17 23:53:23 +01:00
Pavel Laptev
962addd140 comented css removed 2024-02-17 23:53:23 +01:00
Pavel Laptev
8681f1438d commit textarea border-radius fix 2024-02-17 23:53:23 +01:00
Kiril Videlov
64ee34e0a9 feat: update projectCurrentCommitMessage function to include branchId parameter and use it in relevant places 2024-02-17 21:25:00 +01:00
Kiril Videlov
029377be06 feat: when a commit is undone, the commit message box will be pre-filled with the last message 2024-02-17 20:32:24 +01:00
Kiril Videlov
2a48b7f072 feat: the commit message will no longer be lost during navigation 2024-02-17 20:32:24 +01:00
Kiril Videlov
f252d0c8f0 fix: dont automatically show large diffs 2024-02-17 19:54:02 +01:00
Caleb Owens
9af53324d3 Fix linting issues 2024-02-17 18:58:09 +01:00
Caleb Owens
088cf5a4bb Only show "Force push to remote" when pushing zero commits to a branch 2024-02-17 18:58:09 +01:00
Pavel Laptev
af907c2902 remove code duplication, readonly state for file list tree fixed 2024-02-17 18:22:21 +01:00
Caleb Owens
3a4fb738c8 Add loading state to PushButton when in "pr" state 2024-02-17 14:36:52 +01:00
Meesayen
f477d8d277 chore: disable discard button for binary files for now 2024-02-17 13:23:13 +01:00
Meesayen
7023e43806 chore: added confirmation moda & handled multi selection of files 2024-02-17 13:13:12 +01:00
Meesayen
548bd2c3c0 fix: missing branchController input in some components 2024-02-17 12:16:11 +01:00
Meesayen
25e26b28aa chore: lint fixes 2024-02-17 12:16:11 +01:00
Meesayen
bd7bf3b8a9 chore: DRYer approach 2024-02-17 12:16:11 +01:00