Commit Graph

872 Commits

Author SHA1 Message Date
Kiril Videlov
151d2df4f6 Revert "Fix branch change detection"
This reverts commit 527ccddba6.
Breaks nightly
2024-01-10 01:14:48 +01:00
Mattias Granlund
527ccddba6 Fix branch change detection
- used to detect error response to listing
- now just observes wether or not branch is gitbutler/integration
2024-01-09 23:33:52 +01:00
Mattias Granlund
412b7c738b Fix file list text clipping
- line height often needs to be 120% to prevent clipping
2024-01-09 23:33:10 +01:00
dependabot[bot]
1c7a203444
chore(deps-dev): bump nanoid from 5.0.3 to 5.0.4
Bumps [nanoid](https://github.com/ai/nanoid) from 5.0.3 to 5.0.4.
- [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.3...5.0.4)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-09 22:31:56 +00:00
dependabot[bot]
8eeadb1da0 chore(deps-dev): bump @codemirror/lang-vue from 0.1.2 to 0.1.3
Bumps [@codemirror/lang-vue](https://github.com/codemirror/lang-vue) from 0.1.2 to 0.1.3.
- [Changelog](https://github.com/codemirror/lang-vue/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/lang-vue/compare/0.1.2...0.1.3)

---
updated-dependencies:
- dependency-name: "@codemirror/lang-vue"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-09 23:31:12 +01:00
dependabot[bot]
8d4a41892b chore(deps-dev): bump @codemirror/lang-html from 6.4.6 to 6.4.7
Bumps [@codemirror/lang-html](https://github.com/codemirror/lang-html) from 6.4.6 to 6.4.7.
- [Changelog](https://github.com/codemirror/lang-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/lang-html/compare/6.4.6...6.4.7)

---
updated-dependencies:
- dependency-name: "@codemirror/lang-html"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-09 23:31:01 +01:00
dependabot[bot]
2dbb52128d chore(deps-dev): bump posthog-js from 1.95.1 to 1.96.1
Bumps [posthog-js](https://github.com/PostHog/posthog-js) from 1.95.1 to 1.96.1.
- [Release notes](https://github.com/PostHog/posthog-js/releases)
- [Changelog](https://github.com/PostHog/posthog-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-js/compare/v1.95.1...v1.96.1)

---
updated-dependencies:
- dependency-name: posthog-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-09 23:30:43 +01:00
Pavel Laptev
19f32249ee removed unused code 2024-01-09 21:47:04 +01:00
Pavel Laptev
451d9da8ed update info message styles 2024-01-09 21:44:26 +01:00
Mattias Granlund
f5042ceada Rename DropDown -> DropDownButton 2024-01-09 15:29:05 +01:00
Pavel Laptev
6e35a9fa71 tag non existing color removed 2024-01-09 15:14:29 +01:00
Pavel Laptev
273f189709 - removed unused tokens
- some tokens renamed
2024-01-09 15:14:29 +01:00
Nikita Galaiko
ffa40422d9
Merge pull request #2203 from gitbutlerapp/fix-draggable-file-function
Fix draggable file function
2024-01-09 15:12:04 +01:00
Nikita Galaiko
8ab6b09a32 fix: amend file ownership calculation 2024-01-09 15:02:33 +01:00
Nikita Galaiko
f2514ef4c2 Merged origin/master into refactor-reader-writer 2024-01-09 10:17:19 +01:00
Nikita Galaiko
4417510d55 remove sentry api key from source code 2024-01-09 09:59:19 +01:00
Mattias Granlund
392bc45383 Fix UI recovery when switching back to gitbutler branch 2024-01-08 17:17:48 +01:00
Mattias Granlund
f481ba5311 Increase line-height of new/empty branch message 2024-01-08 17:16:45 +01:00
Nikita Galaiko
4a92abdd9e
Merge pull request #2191 from gitbutlerapp/unapply-ownership-hunks
GB-776: Unapply ownership hunks
2024-01-08 16:02:20 +01:00
Nikita Galaiko
a68064723d allow unapplying locked ownerships 2024-01-08 15:39:31 +01:00
Mattias Granlund
2fcc03e939 Fix branch change copy
- shoud say you've switched _away_ from gitbutler/integration
2024-01-08 14:19:56 +01:00
Mattias Granlund
a19939ea39 Fix zoom shortcuts on Linux 2024-01-08 10:24:45 +01:00
Mattias Granlund
f3a84e42dd Show button spinner while committing 2024-01-07 21:47:22 +01:00
Mattias Granlund
29bacad3d9 Bugfix for context menu item disabled state 2024-01-07 15:02:57 +01:00
Mattias Granlund
f7c062eb7d Disable branch rename when it has integrated commits 2024-01-07 14:03:33 +01:00
Mattias Granlund
4381bdc196 Show gap between selected files in tree view 2024-01-06 13:28:08 +01:00
Mattias Granlund
f1a8617c92 Enabme shift + click for multiple drag & drop
- utilises .selected css class for knowing what elements are being dragged
- deselects list if dragging not selected item
2024-01-06 12:57:34 +01:00
Pavel Laptev
2862dce977 updated assets 2024-01-05 16:30:27 +01:00
Pavel Laptev
59d9039119 a few CSS updates to the Branch header 2024-01-05 15:32:08 +01:00
Pavel Laptev
1cc0787983 - branch header fixes 2024-01-05 15:23:34 +01:00
Pavel Laptev
46f093fdba - dragzone updates
- dialog cancel button style updates
2024-01-05 15:11:13 +01:00
Pavel Laptev
8d762f88d0 Merged origin/master into Update new branch styling 2024-01-05 14:34:17 +01:00
Pavel Laptev
ab0a19338e - new icons
- dropzone overlay component added
2024-01-05 14:34:13 +01:00
Mattias Granlund
f09563061e Add branch and pr links to header 2024-01-05 14:14:43 +02:00
Mattias Granlund
55ae30f62f Fix duplicate list_remote_branches call
- give head and fetches streams an initial value
2024-01-05 13:25:46 +02:00
Pavel Laptev
2c9270eee9 Merged origin/master into Update new branch styling 2024-01-05 12:00:29 +01:00
Pavel Laptev
4858d41606 changed the illustration images 2024-01-05 12:00:24 +01:00
Mattias Granlund
0fcf6877f7 Fix file status determination
- this broke when we stopped loading full file contents
2024-01-05 12:32:27 +02:00
Pavel Laptev
2cf90b2218 empty state - approach with svelte components 2024-01-05 00:08:53 +01:00
Mattias Granlund
1b02c240b1 Show deleted instead of pending if branch has integrated commit(s) 2024-01-04 19:24:25 +02:00
Mattias Granlund
54773d0bfe Enable remote branch naming 2024-01-04 19:13:00 +02:00
Pavel Laptev
b731d19c69 - Line height fixes
- branch header button size update
2024-01-04 12:29:19 +01:00
Pavel Laptev
b377f37d29 removed console.log() 2024-01-04 11:53:06 +01:00
Mattias Granlund
7a3ba7324d Add new type of toast along with controller
- not hooked up to anything yet
- we need to catch specific errors and provide copy (plus action)
2024-01-04 11:21:09 +02:00
Pavel Laptev
5809ab86bd refactor: remove unused code and styles 2024-01-04 01:23:25 +01:00
Pavel Laptev
955d21ab38 - Updated changes list CSS
- Updated default line-height to 120%
- Commitbox line-height updated
2024-01-04 01:20:24 +01:00
Qix
d70c6a970b
Merge pull request #2154 from gitbutlerapp/dependabot/npm_and_yarn/typescript-eslint/parser-6.16.0
chore(deps-dev): bump @typescript-eslint/parser from 6.14.0 to 6.16.0
2024-01-03 21:25:26 +01:00
Pavel Laptev
cd2cfad353 fix: adjust position of virtual branch icon in UI 2024-01-03 17:52:09 +01:00
Pavel Laptev
2652b19d98 chore: remove unused CSS variable --clr-theme-warn-element-dark 2024-01-03 17:21:16 +01:00
Pavel Laptev
24478163ca chore: update fill color for path in SVG element to var(--clr-theme-container-light) 2024-01-03 17:18:40 +01:00
Pavel Laptev
2b94956182 style: remove unnecessary fill attribute from SVG paths and their colors updated 2024-01-03 17:15:34 +01:00
Pavel Laptev
8350fe0c6b chore: update color variables and icons 2024-01-03 17:07:29 +01:00
Mattias Granlund
e59d14067c feat: add a new Svelte component for displaying info messages with different styles and buttons 2024-01-03 15:46:15 +02:00
Mattias Granlund
9a691e1003 chore: fix typo in CSS variable name for warn element dark color 2024-01-03 15:38:28 +02:00
Mattias Granlund
012c1c4a7d feat: add support for 'warn' color option in button component 2024-01-03 15:34:34 +02:00
Mattias Granlund
9a3d458e30 Fix persisting cloud sync setting 2024-01-02 14:11:46 +02:00
dependabot[bot]
918cf8cac8
chore(deps-dev): bump @typescript-eslint/parser from 6.14.0 to 6.16.0
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.14.0 to 6.16.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.16.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-01 16:03:33 +00:00
Pavel Laptev
1626cc7fba style: update height of .textbox__input to use var(--size-btn-l) instead of var(--space-32) 2023-12-30 23:28:04 +01:00
Pavel Laptev
8a86d65c6f fix: update loading spinner behavior and style
- Fixed the loading spinner behavior.
- Updated the loading spinner style to use a circle path instead of a spinning animation for better visual effect.
- Adjusted the size and speed of the loading spinner animation.
2023-12-29 15:06:18 +01:00
Pavel Laptev
8dec8764cc tag button updated 2023-12-29 02:13:33 +01:00
Pavel Laptev
772215daeb chore: remove unnecessary CSS class and style in file list component 2023-12-29 02:10:28 +01:00
Pavel Laptev
733228a971 chore: update styling and dimensions of folder and file icons 2023-12-29 02:02:50 +01:00
Qix
c6db11ae47
Merge pull request #2136 from gitbutlerapp/dependabot/npm_and_yarn/svelte-check-3.6.2
Bump svelte-check from 3.5.2 to 3.6.2
2023-12-28 15:24:51 +01:00
Qix
1968469d25
Merge pull request #2137 from gitbutlerapp/dependabot/npm_and_yarn/tauri-apps/api-1.5.3
Bump @tauri-apps/api from 1.5.0 to 1.5.3
2023-12-28 15:24:39 +01:00
dependabot[bot]
8f67493898
Bump eslint from 8.55.0 to 8.56.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.55.0 to 8.56.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.55.0...v8.56.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-25 15:48:21 +00:00
dependabot[bot]
7e215f6614
Bump @tauri-apps/api from 1.5.0 to 1.5.3
Bumps [@tauri-apps/api](https://github.com/tauri-apps/tauri) from 1.5.0 to 1.5.3.
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/@tauri-apps/api-v1.5...@tauri-apps/api-v1.5.3)

---
updated-dependencies:
- dependency-name: "@tauri-apps/api"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-25 15:48:02 +00:00
dependabot[bot]
e826f9f3f0
Bump svelte-check from 3.5.2 to 3.6.2
Bumps [svelte-check](https://github.com/sveltejs/language-tools) from 3.5.2 to 3.6.2.
- [Release notes](https://github.com/sveltejs/language-tools/releases)
- [Commits](https://github.com/sveltejs/language-tools/compare/svelte-check-3.5.2...svelte-check-3.6.2)

---
updated-dependencies:
- dependency-name: svelte-check
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-25 15:47:40 +00:00
Mattias Granlund
5209087b8d Prevent commit when no files selected 2023-12-23 17:27:54 +01:00
Mattias Granlund
56b50af8ae Revert exclusion of closed PRs
- state was more confusing when commit is integrated
2023-12-23 17:14:18 +01:00
Mattias Granlund
da9a64c817 Add select all/none to branch files list view 2023-12-23 16:55:28 +01:00
Mattias Granlund
6ee895832c Configure eslnt so that it's happy
See: https://stackoverflow.com/questions/64933543/parsing-error-cannot-read-file-tsconfig-json-eslint
2023-12-23 13:13:40 +01:00
Josh Junon
c5c51c9254 move packages/* into root as crates 2023-12-22 14:20:02 +01:00