Commit Graph

4521 Commits

Author SHA1 Message Date
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
b5e04b8bca merged from upstream 2024-01-05 00:09:18 +01:00
Pavel Laptev
2cf90b2218 empty state - approach with svelte components 2024-01-05 00:08:53 +01:00
Pavel Laptev
715e3548aa empty state - approach with svelte components 2024-01-05 00:08:43 +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
c92a25c335
Merge pull request #2170 from gitbutlerapp/line-height-fixing-some-css-updates
line-height fixing, some css updates
2024-01-04 12:34:38 +01:00
Pavel Laptev
b731d19c69 - Line height fixes
- branch header button size update
2024-01-04 12:29:19 +01:00
Pavel Laptev
493213be74
Merge pull request #2169 from gitbutlerapp/console-log-removed
console.log removed
2024-01-04 11:54:51 +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
1cafc36611
Merge pull request #2167 from gitbutlerapp/css-lineheight-and-changes-list-updated
CSS: lineheight and changes list updated
2024-01-04 01:24:59 +01: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
Qix
4fcce6a0be
Merge pull request #2155 from gitbutlerapp/dependabot/cargo/reqwest-0.11.23
chore(deps): bump reqwest from 0.11.22 to 0.11.23
2024-01-03 21:25:05 +01:00
Qix
879ac5f245
Merge pull request #2156 from gitbutlerapp/dependabot/cargo/thiserror-1.0.53
chore(deps): bump thiserror from 1.0.50 to 1.0.53
2024-01-03 21:24:53 +01:00
Qix
867e1870d6
Merge pull request #2164 from gitbutlerapp/gitbutler-core-lib-docs
add core lib module docs
2024-01-03 20:23:22 +01:00
Qix
e29ab41b46
Merge pull request #2165 from gitbutlerapp/id-newtype-docs
add core lib id docs
2024-01-03 20:13:52 +01:00
Josh Junon
2a21bd5880 add core lib module docs 2024-01-03 20:11:22 +01:00
Josh Junon
354afedea2 add core lib id docs 2024-01-03 20:02:39 +01:00
Pavel Laptev
e67e1b983f
Merge pull request #2163 from gitbutlerapp/update-virtual-branch-svg
Update virtual branch svg
2024-01-03 17:54:18 +01:00
Pavel Laptev
cd2cfad353 fix: adjust position of virtual branch icon in UI 2024-01-03 17:52:09 +01:00
Pavel Laptev
01d3581889
Merge pull request #2162 from gitbutlerapp/update-color-variables
Update color variables
2024-01-03 17:47:55 +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
Mattias Granlund
ef0f69eb55 Fix shared prettier settings 2024-01-02 13:22:57 +02:00
dependabot[bot]
0aa52506e0
chore(deps): bump thiserror from 1.0.50 to 1.0.53
Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.50 to 1.0.53.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.50...1.0.53)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-01 16:04:21 +00:00
dependabot[bot]
266d763f40
chore(deps): bump reqwest from 0.11.22 to 0.11.23
Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.22 to 0.11.23.
- [Release notes](https://github.com/seanmonstar/reqwest/releases)
- [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.22...v0.11.23)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-01 16:03:41 +00: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
dependabot[bot]
fcd311f70f
chore(deps): bump bstr from 1.8.0 to 1.9.0
Bumps [bstr](https://github.com/BurntSushi/bstr) from 1.8.0 to 1.9.0.
- [Commits](https://github.com/BurntSushi/bstr/compare/1.8.0...1.9.0)

---
updated-dependencies:
- dependency-name: bstr
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-01 16:02:58 +00:00
dependabot[bot]
fa60e29704
chore(deps): bump tauri-build from 1.5.0 to 1.5.1
Bumps [tauri-build](https://github.com/tauri-apps/tauri) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/tauri-build-v1.5...tauri-build-v1.5.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-01 16:02:22 +00:00
dependabot[bot]
207e90413f
chore(deps): bump serde_json from 1.0.108 to 1.0.109
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.108 to 1.0.109.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.108...v1.0.109)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-01 16:01:39 +00:00
Pavel Laptev
0b74019811
Merge pull request #2146 from gitbutlerapp/textbox-height-variable-updated
Textbox height variable updated
2023-12-30 23:29:36 +01: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
799a27d30d
Merge pull request #2145 from gitbutlerapp/update-spinner-icon-and-behavior
Update spinner icon and behavior
2023-12-29 21:30:05 +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
55c0554c25
Merge pull request #2144 from gitbutlerapp/remove-file-icon-and-icon-class
Remove file icon and icon class, tag button updated
2023-12-29 02:15:56 +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