gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-02 07:53:55 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,871 Commits 148 Branches 1,032 Tags 66 MiB
04afdc47e0
Commit Graph

3871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavel Laptev
63108d1afd
Merge pull request #1765 from gitbutlerapp/css-changes 
css fixes
 2023-11-28 01:01:46 +01:00
PavelLaptev
2d51fdcf1d css fixes 2023-11-28 00:55:23 +01:00
Pavel Laptev
352a626817
Merge branch 'master' into css-changes 2023-11-28 00:50:06 +01:00
PavelLaptev
0ebac9075d css fixes 2023-11-28 00:45:20 +01:00
Mattias Granlund
fb32a06d31 Make file card resizable 2023-11-27 22:39:41 +00:00
Mattias Granlund
0bda5e3996
Merge pull request #1763 from gitbutlerapp/add-tags-to-file-card 
Add tags to file card
 2023-11-27 22:11:26 +00:00
Mattias Granlund
ab29fd4e84 Add tags for file card 2023-11-27 23:08:59 +01:00
Mattias Granlund
05687c48ea
Merge pull request #1762 from gitbutlerapp/update-branches 
Update branches
 2023-11-27 21:38:34 +00:00
Mattias Granlund
11f4925c65
Merge branch 'master' into update-branches 2023-11-27 21:36:19 +00:00
Mattias Granlund
42883198d0 Improve file selection in branch card 2023-11-27 22:28:43 +01:00
Mattias Granlund
b4616eaa1f Improve a bunch of stuff 2023-11-27 21:17:01 +00:00
Mattias Granlund
3da78c2fe4 Show file diff next to branch lane 2023-11-27 21:17:01 +00:00
Mattias Granlund
344c24b702 Improve a bunch of stuff 2023-11-27 22:15:26 +01:00
Mattias Granlund
9e61bc05b0 Show file diff next to branch lane 2023-11-27 21:42:01 +01:00
Mattias Granlund
f2827b8978 fix: update dropdown component to include wrapper div for proper styling and positioning 2023-11-27 18:53:08 +00:00
Mattias Granlund
9471e8567a Move branch lane to branch card 2023-11-27 18:38:33 +00:00
extrawurst
7350fc59d0
fix push code (#1714) 2023-11-27 18:25:50 +01:00
Mattias Granlund
ca106bc3e4 Update navigation bar and selected states 2023-11-27 17:23:51 +00:00
Kiril Videlov
bb1928de1b fix lint issue 2023-11-27 18:18:44 +01:00
Kiril Videlov
fac45a2d6b chore: update styling and conditional rendering in branch component 2023-11-27 18:18:44 +01:00
Pavel Laptev
a6a1a7e3c9
Merge pull request #1753 from gitbutlerapp/css-changes 
Tokens and icons update
 2023-11-27 18:04:45 +01:00
PavelLaptev
61b09582f1 merged upstream 2023-11-27 18:02:01 +01:00
PavelLaptev
2b58cb37d3 new icons 2023-11-27 18:01:43 +01:00
Mattias Granlund
5d3f2e7084 chore: update styling of input field to improve visibility and add placeholder color 2023-11-27 16:59:13 +00:00
Mattias Granlund
88526d237a Fix commit issue 
- selecting what to commit is currently unavailable
 2023-11-27 16:53:25 +00:00
PavelLaptev
22577c6d20 Update tokens 2023-11-27 17:47:39 +01:00
Mattias Granlund
efa80954f6 Refactor the commit box and dropdown button 2023-11-27 16:45:35 +00:00
dependabot[bot]
183d61c45c
Bump tempfile from 3.8.0 to 3.8.1 
Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.8.0 to 3.8.1.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-27 15:38:48 +00:00
dependabot[bot]
f20998ecc2
Bump futures from 0.3.28 to 0.3.29 
Bumps [futures](https://github.com/rust-lang/futures-rs) from 0.3.28 to 0.3.29.
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.28...0.3.29)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-27 15:38:37 +00:00
dependabot[bot]
0b8d8e211a
Bump tauri-plugin-single-instance from b13d97c to 537053d 
Bumps [tauri-plugin-single-instance](https://github.com/tauri-apps/plugins-workspace) from `b13d97c` to `537053d`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](b13d97c7c7...537053d317)

---
updated-dependencies:
- dependency-name: tauri-plugin-single-instance
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-27 15:38:23 +00:00
dependabot[bot]
d54c22a9e1
Bump itertools from 0.11.0 to 0.12.0 
Bumps [itertools](https://github.com/rust-itertools/itertools) from 0.11.0 to 0.12.0.
- [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-itertools/itertools/compare/v0.11.0...v0.12.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-27 15:37:58 +00:00
dependabot[bot]
66ec459423
Bump tracing-appender from 0.2.2 to 0.2.3 
Bumps [tracing-appender](https://github.com/tokio-rs/tracing) from 0.2.2 to 0.2.3.
- [Release notes](https://github.com/tokio-rs/tracing/releases)
- [Commits](https://github.com/tokio-rs/tracing/compare/tracing-appender-0.2.2...tracing-appender-0.2.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-27 15:37:45 +00:00
Nikita Galaiko
646eedd06e more refactor 2023-11-27 15:32:22 +01:00
Nikita Galaiko
c77355676d fix current behaviour in tests 2023-11-27 15:32:14 +01:00
Kiril Videlov
d1b73fe9cf chore: remove unused 'baseCurrent' property from Branch class and update its usage in applyBranch function 2023-11-27 14:28:43 +01:00
Kiril Videlov
927bc6c5c1 feat: rename activeBranches$ to stashedBranches$ in VirtualBranchService and update references in the component 2023-11-27 14:21:53 +01:00
Kiril Videlov
15e2c0eb2d chore: update branch conflict handling and apply button behavior 2023-11-27 14:07:17 +01:00
Nikita Galaiko
88b78c083f do not calculate non comitted files all the time 2023-11-27 14:00:54 +01:00
Nikita Galaiko
118628f0e7 more tests 2023-11-27 13:57:50 +01:00
Nikita Galaiko
9f0ad03d98 rm silimar tests 2023-11-27 13:09:00 +01:00
Nikita Galaiko
b1efad0f6f minor refactoring 2023-11-27 13:08:23 +01:00
Nikita Galaiko
203d66b270 move update base branch tests to integration 2023-11-27 13:06:03 +01:00
Nikita Galaiko
4c2e1b8ab3
Merge pull request #1733 from gitbutlerapp/update-branch-state-and-write 
Update branch state and write
 2023-11-27 12:55:44 +01:00
Mattias Granlund
5d3381cae9 Fix project selector 2023-11-27 11:45:29 +00:00
Mattias Granlund
da3516c31a Sync to cloud when clicking that button in the sidebar 2023-11-27 11:24:51 +00:00
Scott Chacon
dd8b7fd1b0
Merge pull request #1734 from gitbutlerapp/add-link-to-project-page 
Add link to project page
 2023-11-27 11:47:45 +01:00
Mattias Granlund
4a752ed086 Restyle button component and update all instances 2023-11-27 10:46:03 +00:00
Scott Chacon
1a1d7228ac
maybe formatted 2023-11-27 11:30:56 +01:00
Scott Chacon
6b950b3b16
add link to project page 2023-11-27 10:51:25 +01:00
Nikita Galaiko
f41631eb50 instead of flushing vbranches before flushing session, do it all the time 2023-11-27 10:20:16 +01:00