Mattias Granlund
|
f9415c937b
|
Make the project setup page great again 🤘
|
2023-11-30 17:47:12 +01:00 |
|
Mattias Granlund
|
6e64d3fbcc
|
Wait for prs to reload after creating pr
|
2023-11-30 10:07:48 +00:00 |
|
Mattias Granlund
|
7e6e26d4e1
|
🔨 chore: fix scrollable check in client script
|
2023-11-30 09:41:37 +00:00 |
|
Mattias Granlund
|
08f23df1b9
|
Make pr creation even more reliable
- do both pushing and pr creation in pr service
- no discontinuity in "loading"
- wait for branch to have upstream (10s timeout)
|
2023-11-30 08:42:12 +00:00 |
|
Mattias Granlund
|
8726e27e39
|
Make PR creation more reliable
- can't be exact atm as we can't "wait" for upstream data to be sent to front end
- will talk to Kiril about this
|
2023-11-29 23:23:43 +00:00 |
|
Mattias Granlund
|
593eb9e717
|
Split out commit list header and footer
|
2023-11-29 22:33:22 +00:00 |
|
Mattias Granlund
|
74aac963f7
|
Renaming a vairable to test push
|
2023-11-29 21:56:52 +00:00 |
|
Mattias Granlund
|
46909a3a25
|
🚀 feat: add state management for PR service and update createPullRequest method
|
2023-11-29 21:54:25 +00:00 |
|
Mattias Granlund
|
915426ea4e
|
Truncate long branch names in commit list item header
|
2023-11-29 20:32:13 +00:00 |
|
Kiril Videlov
|
4fd8c890c9
|
chore: increase z-index value for .popup element to prevent it from being overlapped by other elements
|
2023-11-29 20:31:50 +00:00 |
|
Mattias Granlund
|
1c2073b980
|
🔨 chore: remove badge count in applied branches component
|
2023-11-29 20:30:58 +00:00 |
|
Mattias Granlund
|
55f6130a95
|
Fix image copy when dragging a lane
|
2023-11-29 18:14:43 +00:00 |
|
Mattias Granlund
|
41634e1ae5
|
Fix duplicate PR bug
|
2023-11-29 17:51:50 +00:00 |
|
Mattias Granlund
|
3eafd5af42
|
Show number of applied branches in sidebar
- Pavel will think about this still
|
2023-11-29 17:51:38 +00:00 |
|
Mattias Granlund
|
8b22c518bc
|
Enforce use of drag handle with branches
|
2023-11-29 17:27:44 +00:00 |
|
Mattias Granlund
|
cdbeba18c7
|
🔧 fix: add default color to SVG icons for better styling consistency
|
2023-11-29 16:17:48 +00:00 |
|
Mattias Granlund
|
7ffbcf51b3
|
Refactor the project selection page
|
2023-11-29 15:54:28 +00:00 |
|
Nikita Galaiko
|
7248111e6d
|
Merge pull request #1839 from gitbutlerapp/try-to-rebase-when-applying-branch
try to rebase when applying branch GB-674
|
2023-11-29 15:59:18 +01:00 |
|
Nikita Galaiko
|
448fcea28e
|
feat: add support for merging or rebasing out-of-date branch before applying changes
|
2023-11-29 15:29:39 +01:00 |
|
Nikita Galaiko
|
9e9d2b5ecc
|
more test assertions
|
2023-11-29 15:28:21 +01:00 |
|
Nikita Galaiko
|
325d5b6539
|
remote duplicated test
|
2023-11-29 15:01:10 +01:00 |
|
Nikita Galaiko
|
0bd27e8edc
|
Merge pull request #1838 from gitbutlerapp/trigger-async-push-and-flush-event
trigger async push and flush event
|
2023-11-29 13:58:10 +01:00 |
|
Nikita Galaiko
|
619f40cf68
|
trigger async push and flush
|
2023-11-29 13:41:28 +01:00 |
|
Nikita Galaiko
|
798e736276
|
Merge pull request #1837 from gitbutlerapp/update-base-branch
GB-674: simplify update base branch
|
2023-11-29 13:27:54 +01:00 |
|
Nikita Galaiko
|
c513de478c
|
simplify update branch logic
|
2023-11-29 13:11:47 +01:00 |
|
Mattias Granlund
|
6cd9f9b2d9
|
Make eslint fail lint on unused variables
|
2023-11-29 10:50:34 +00:00 |
|
Mattias Granlund
|
42ca5c5952
|
Fix lint warnings
|
2023-11-29 10:50:26 +00:00 |
|
Mattias Granlund
|
ad11d82ae9
|
Update styling for base branch view
|
2023-11-29 10:48:39 +00:00 |
|
Mattias Granlund
|
9f2d4f2359
|
Display PR body as markdown
|
2023-11-29 10:26:22 +00:00 |
|
Mattias Granlund
|
7d99ac6b52
|
✨ feat: add support for readonly mode in commit card
|
2023-11-29 10:18:48 +00:00 |
|
Mattias Granlund
|
24ecfabf57
|
Improve the PR preview page a bit
|
2023-11-29 10:17:23 +00:00 |
|
Mattias Granlund
|
8213e0628c
|
🔥 refactor: remove crossfade transition from commit boxes
|
2023-11-29 09:38:23 +00:00 |
|
Mattias Granlund
|
fb96d91164
|
Rename LocalCommits to CommitList
|
2023-11-29 09:30:28 +00:00 |
|
Mattias Granlund
|
4f35b90508
|
Drop unused remote/integrated commits code
|
2023-11-29 09:30:28 +00:00 |
|
Mattias Granlund
|
a372f3b5cf
|
🔧 fix: decrease timeout for tooltip to improve user experience
|
2023-11-29 09:25:06 +00:00 |
|
Mattias Granlund
|
65d1c0e629
|
🔨 chore: add readonly prop to Commit component to prevent actions when in readonly mode
|
2023-11-29 09:24:43 +00:00 |
|
Nikita Galaiko
|
20782cec64
|
Merge pull request #1826 from gitbutlerapp/fix-conflict-markers
test apply after update base
|
2023-11-29 10:21:23 +01:00 |
|
Mattias Granlund
|
2548ced85c
|
Improve UI for stashed branch header
|
2023-11-29 09:19:23 +00:00 |
|
Nikita Galaiko
|
7c7fe88453
|
test apply after update base
|
2023-11-29 10:14:25 +01:00 |
|
Mattias Granlund
|
e9bb16488f
|
🐛 fix: handle sync status properly when fetching and reloading data
|
2023-11-29 09:14:20 +00:00 |
|
Mattias Granlund
|
547fb02d13
|
🔨 chore: increase sleep time before creating PR to accommodate for GitHub's processing time
|
2023-11-29 09:14:12 +00:00 |
|
Mattias Granlund
|
f1c49b2d51
|
Goto board after apply/delete
|
2023-11-29 09:13:16 +00:00 |
|
Nikita Galaiko
|
ddd801b6b0
|
Merge pull request #1822 from gitbutlerapp/apply-fixes
fix warning condition
|
2023-11-29 10:08:35 +01:00 |
|
Nikita Galaiko
|
83d1edcc71
|
fix warning condition
|
2023-11-29 09:54:11 +01:00 |
|
Mattias Granlund
|
57ef71fd0c
|
Fix the UI bug when dragging file card
|
2023-11-29 00:51:42 +00:00 |
|
Mattias Granlund
|
00dbf95444
|
Fix scrolling/resizing in files section of branch
|
2023-11-29 00:41:48 +00:00 |
|
Mattias Granlund
|
1fa737e40f
|
Await reload of prs before loading is set to false
|
2023-11-29 00:05:59 +00:00 |
|
Pavel Laptev
|
4467aefa7b
|
Merge pull request #1818 from gitbutlerapp/commit-card
Commit card style update
|
2023-11-29 01:01:16 +01:00 |
|
PavelLaptev
|
5172ca2b07
|
Wip
|
2023-11-29 00:59:40 +01:00 |
|
PavelLaptev
|
96c1fb0064
|
Test undo
|
2023-11-29 00:46:57 +01:00 |
|