Commit Graph

590 Commits

Author SHA1 Message Date
Nikita Galaiko
ee2e281ec3
Merge pull request #1595 from gitbutlerapp/fix-amend-ownership-check
Fix amend ownership check
2023-11-14 10:14:21 +01:00
Nikita Galaiko
0046cc2628 merged upstream 2023-11-14 10:06:37 +01:00
Nikita Galaiko
2cccfec49a merged upstream 2023-11-14 10:06:37 +01:00
Nikita Galaiko
f6531e815e verify amendable diffs agains real diff 2023-11-14 09:48:18 +01:00
Nikita Galaiko
449c0092e5 make sure all dirs exist when creating project 2023-11-14 09:47:49 +01:00
Nikita Galaiko
bdb0753e0b chore: fix warnings 2023-11-14 09:24:26 +01:00
Mattias Granlund
ed7410e186 Fixing some container and theme stuff for PR list/page 2023-11-13 19:01:37 +00:00
Mattias Granlund
ca21e879ac Use observable suffix in pr component 2023-11-13 18:22:12 +00:00
Nikita Galaiko
19619a6781
Merge pull request #1585 from gitbutlerapp/remove-result-from-handle-event
Remove result from handle event
2023-11-13 16:59:58 +01:00
Mattias Granlund
e62157646f Add error handling to PR service 2023-11-13 15:44:20 +00:00
Mattias Granlund
3e162e645c Add service for pull requests 2023-11-13 15:44:20 +00:00
Mattias Granlund
dbfff1e52f Make remote contributions code a bit more succinct 2023-11-13 15:44:20 +00:00
Nikita Galaiko
75541c16b8 remove wd_tree flush optimization 2023-11-13 16:34:15 +01:00
Mattias Granlund
cceac88b85 Darken overlay backdrop color slightly 2023-11-13 10:55:51 +00:00
Kiril Videlov
bfa84c9d46 chore: remove unused imports and variables 2023-11-12 23:18:01 +01:00
Kiril Videlov
c01c7626ce feat: add support for filtering pull requests by "Only Yours" in project pull request listing, based on the logged-in user's GitHub username 2023-11-12 23:07:30 +01:00
Kiril Videlov
8de3eaf9b2 feat: add function to generate remote contributions based on pull requests and remote branches 2023-11-12 22:47:53 +01:00
Mattias Granlund
e79d3e9ebe Fix text input styles 2023-11-12 21:09:23 +00:00
Mattias Granlund
6d0d34fa65 Add first iteration of project switcher
- next to base refresh button
2023-11-12 20:45:50 +00:00
Mattias Granlund
6e2139b224 Improve stashed branch view 2023-11-12 20:45:50 +00:00
Kiril Videlov
1882b8e736 fix: remove unused imports and update conditional rendering in PullRequestPage component 2023-11-12 19:39:55 +01:00
Kiril Videlov
94ff6cb3b9 feat: update dependencies and refactor pullRequestsStore to use RxJS Observable 2023-11-12 19:39:55 +01:00
Mattias Granlund
b4c11c9e6a Move some files into nav package 2023-11-12 16:03:02 +00:00
Mattias Granlund
5ed72f3883
Moving faster with the UI (#1569)
- using css vars directly in components for theming
- getting far with app bg, surfaces and cards
- lots of files touched to make app generally look better
2023-11-12 15:50:02 +00:00
Mattias Granlund
4d22f1339e
More UI edits for the board (#1568)
- adjusting colors, spacing, borders
2023-11-11 19:51:15 +00:00
Mattias Granlund
0b05eea9de Fixes the style of the email button in the footer 2023-11-11 18:55:51 +00:00
Mattias Granlund
6ce3335170 Update the board UI with more padding 2023-11-11 18:46:15 +00:00
Mattias Granlund
a49d146d96 - active branch domain link
- settigns domain link
- remove project header
2023-11-11 18:27:49 +00:00
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