gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-03 03:33:16 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,419 Commits 147 Branches 1,033 Tags 66 MiB
9aa9ab14aa
Commit Graph

562 Commits

Author SHA1 Message Date
Mattias Granlund
9aa9ab14aa Make default bg color a bit brighter 2023-11-11 18:27:28 +00:00
Mattias Granlund
6ceca226ec Fixes weird commit card overflow 2023-11-11 18:02:07 +00:00
Mattias Granlund
8ebc746bd0 Fix some things related to project store 2023-11-11 17:20:44 +00:00
Mattias Granlund
e9563d9437 Refactor project store 
- also changes how the base branch is displayed
 2023-11-11 17:20:44 +00:00
Mattias Granlund
e1b63dfbc3 Show trunk as card 2023-11-11 17:20:44 +00:00
Mattias Granlund
a480ea0ecc Make base branch into component 2023-11-11 17:20:44 +00:00
Kiril Videlov
071889592c chore: simplify filter condition in list_remote_branches function 2023-11-11 18:02:23 +01:00
Kiril Videlov
c00e645881 list all remote branches 2023-11-11 18:02:23 +01:00
Mattias Granlund
4de1f8ad7f Show loading stack on hovering spinner 2023-11-11 13:24:05 +00:00
Mattias Granlund
267d073f7a Use Meta + Shift + S for manual sync to cloud 2023-11-11 10:49:32 +00:00
Mattias Granlund
66b05c0430 Show loading spinner during ipc/fetch 2023-11-11 10:24:42 +00:00
Nikita Galaiko
8f43847213
Merge pull request #1557 from gitbutlerapp/add-commit-method 
Add commit method
 2023-11-10 16:12:59 +01:00
Nikita Galaiko
77a8f15efa no signing when authors might mismatch 2023-11-10 16:04:39 +01:00
Nikita Galaiko
f58a79eb0c chore: remove migration logic for old data format 2023-11-10 15:48:23 +01:00
Nikita Galaiko
b48815c4d7
Merge pull request #1555 from gitbutlerapp/virtual-branch 
Virtual branch
 2023-11-10 13:02:33 +01:00
Nikita Galaiko
9949d2aa39
Merge pull request #1554 from gitbutlerapp/check-and-push-project-code 
Check and push project code
 2023-11-10 13:02:23 +01:00
Nikita Galaiko
b11f9be1ba refactor: remove unused activeZones set from draggable function 2023-11-10 12:29:29 +01:00
Nikita Galaiko
018a480f3f feat: optimize code push check to only push if sync is enabled and code URL is present 2023-11-10 12:26:53 +01:00
Nikita Galaiko
b2c97fcc89 fix: fix order of commit descriptions in assertion statements 2023-11-10 12:19:57 +01:00
Nikita Galaiko
67cea3c292
Merge pull request #1551 from gitbutlerapp/gb-601-squash-commits-ui 
GB-601: squash commits ui
 2023-11-10 10:42:24 +01:00
Nikita Galaiko
35dce0b728 fix draggable commit apperance 2023-11-10 10:34:20 +01:00
Mattias Granlund
b6e039115f Fix syntax highlighting backgrounds 2023-11-10 09:04:38 +00:00
Nikita Galaiko
dc2e8accfe simplify draggable 2023-11-10 09:09:29 +01:00
Nikita Galaiko
c144a82e36 feat: squash commits 2023-11-10 09:05:20 +01:00
Nikita Galaiko
41710e8656
Merge pull request #1549 from gitbutlerapp/add-squash-function 
GB-601 Add squash function
 2023-11-09 13:45:19 +01:00
Nikita Galaiko
ed8e348bfe feat: squash api 2023-11-09 13:00:14 +01:00
Kiril Videlov
1f7bcd05fb remove dead code 2023-11-08 18:45:32 +01:00
Mattias Granlund
308edbe1b9 Fix "open in vscode" context menu 2023-11-08 16:34:11 +00:00
Mattias Granlund
b101c1db58 Make pull request cache work with new store functionality 
This makes it load early based on cached results, followed up
with results from the API.
 2023-11-08 16:14:42 +00:00
Mattias Granlund
6809ada374 Bump the forked square/svelte-store library version 2023-11-08 16:11:20 +00:00
extrawurst
e94631cbb1 remove unused code 2023-11-08 16:36:11 +01:00
extrawurst
7e0a5844c4
GB-627: Session flush command (#1539) 2023-11-08 16:34:33 +01:00
Nikita Galaiko
26acd86063
Merge pull request #1542 from gitbutlerapp/remove-git-remote-branches-data 
Remove git remote branches data
 2023-11-08 15:08:34 +01:00
Mattias Granlund
8f9f29e8d6 Drop unused file 2023-11-08 13:48:08 +00:00
Nikita Galaiko
b277992391 move virtual branches call into controller 2023-11-08 14:38:27 +01:00
Nikita Galaiko
43ffb2dc05 extract bookmarks controller 2023-11-08 13:32:46 +01:00
Nikita Galaiko
21f678b273 extract deltas controller 2023-11-08 12:28:50 +01:00
extrawurst
7d7fbbb513 * not not try to push code to gb every tick 
* use same tick interval as for fetch: 15min
* flush leading to push is unaffected by this
 2023-11-08 12:08:48 +01:00
Mattias Granlund
3c9a1a3170 Make remote branch peek into page 2023-11-08 10:47:47 +00:00
Nikita Galaiko
cc900b911d
Merge pull request #1536 from gitbutlerapp/remove-log-tree-function 
Remove log tree function
 2023-11-08 11:13:49 +01:00
Nikita Galaiko
76c871bebe do not flush logs tree 2023-11-08 10:51:00 +01:00
Nikita Galaiko
14b25966e5 fix: handle removed files correctly when building working directory tree 2023-11-08 10:48:09 +01:00
Mattias Granlund
35cc2a5870 Make pull request peek into page 2023-11-08 09:46:02 +00:00
Nikita Galaiko
872079fc8a
Merge pull request #1532 from gitbutlerapp/add-sessions-controller 
Add sessions controller
 2023-11-08 10:45:53 +01:00
Nikita Galaiko
89f4ee7899
Merge pull request #1533 from gitbutlerapp/remove-git-gb-push 
Remove git gb push
 2023-11-08 10:45:45 +01:00
dependabot[bot]
cf28889d79
chore(deps-dev): bump prettier-plugin-tailwindcss from 0.5.4 to 0.5.6 (#1523) 
Bumps [prettier-plugin-tailwindcss](https://github.com/tailwindlabs/prettier-plugin-tailwindcss) from 0.5.4 to 0.5.6.
- [Release notes](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/compare/v0.5.4...v0.5.6)

---
updated-dependencies:
- dependency-name: prettier-plugin-tailwindcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-08 09:09:45 +00:00
dependabot[bot]
64efd859b3
chore(deps-dev): bump @codemirror/state from 6.2.1 to 6.3.1 (#1522) 
Bumps [@codemirror/state](https://github.com/codemirror/state) from 6.2.1 to 6.3.1.
- [Changelog](https://github.com/codemirror/state/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/state/compare/6.2.1...6.3.1)

---
updated-dependencies:
- dependency-name: "@codemirror/state"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-08 09:09:34 +00:00
dependabot[bot]
bec7bafa96
chore(deps): bump tokio-util from 0.7.9 to 0.7.10 
Bumps [tokio-util](https://github.com/tokio-rs/tokio) from 0.7.9 to 0.7.10.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-08 08:23:24 +00:00
Nikita Galaiko
18c83607bb
Merge pull request #1516 from gitbutlerapp/dependabot/cargo/chrono-0.4.31 
chore(deps): bump chrono from 0.4.29 to 0.4.31
 2023-11-08 09:20:46 +01:00
Nikita Galaiko
f8ef0e005a
Merge pull request #1515 from gitbutlerapp/dependabot/cargo/thiserror-1.0.50 
chore(deps): bump thiserror from 1.0.48 to 1.0.50
 2023-11-08 09:20:17 +01:00