Kiril Videlov
|
04afdc47e0
|
fix: exclude default target branch from the list of remote branches
|
2023-11-30 18:12:05 +01:00 |
|
Kiril Videlov
|
c8c29fbc37
|
Merge pull request #1872 from gitbutlerapp/add-cloud-enabled-flag-to-sync-button
Add cloud enabled flag to sync button
|
2023-11-30 18:04:00 +01:00 |
|
Kiril Videlov
|
56a0d652fc
|
feat: add cloudEnabled prop to SyncButton component to conditionally call syncToCloud based on project's API sync status
|
2023-11-30 17:58:49 +01:00 |
|
Mattias Granlund
|
0a426013da
|
Merge pull request #1870 from gitbutlerapp/remove-resizer-1
Remove resizer 1
|
2023-11-30 16:55:15 +00:00 |
|
Mattias Granlund
|
c3ed0c57b5
|
Merge pull request #1869 from gitbutlerapp/refactor-project-setup-page
Refactor project setup page
|
2023-11-30 16:54:18 +00:00 |
|
Mattias Granlund
|
e3b30fa3df
|
Remove resizer from BranchFiles.svelte
|
2023-11-30 17:52:43 +01:00 |
|
Mattias Granlund
|
eb7f2674a5
|
Merge branch 'master' into refactor-project-setup-page
|
2023-11-30 16:48:48 +00:00 |
|
Mattias Granlund
|
f9415c937b
|
Make the project setup page great again 🤘
|
2023-11-30 17:47:12 +01:00 |
|
Kiril Videlov
|
225de46e6f
|
fix lint
|
2023-11-30 15:41:37 +01:00 |
|
Kiril Videlov
|
2046df3a43
|
fix: prevent default behavior only when drag handle id is not 'drag-handle'
|
2023-11-30 15:41:37 +01:00 |
|
Kiril Videlov
|
e9828a605e
|
fix: adjust drop position calculation in drag and drop functionality
|
2023-11-30 15:41:37 +01:00 |
|
Nikita Galaiko
|
f8ab949e08
|
Merge pull request #1864 from gitbutlerapp/handle-file-content-1
Handle file content 1
|
2023-11-30 15:32:58 +01:00 |
|
Nikita Galaiko
|
dbe84e117f
|
do not fail vbranch calculations on wrong branch
|
2023-11-30 15:23:12 +01:00 |
|
Nikita Galaiko
|
a56de709a1
|
Merge pull request #1863 from gitbutlerapp/remove-ignored-files-from-wd-tree
Remove ignored files from wd tree
|
2023-11-30 14:20:17 +01:00 |
|
Nikita Galaiko
|
0f29b62b79
|
when calculating files to remove, use session data only
|
2023-11-30 14:15:42 +01:00 |
|
Kiril Videlov
|
5008de035e
|
refactor: remove filtering of branches based on default target branch
|
2023-11-30 13:41:57 +01:00 |
|
Kiril Videlov
|
ef6c6afa8a
|
refactor: simplify code for getting user name in configure_scope function
|
2023-11-30 13:40:23 +01:00 |
|
Kiril Videlov
|
f7945a5294
|
refactor: simplify code for configuring user scope and creating git signature
|
2023-11-30 13:40:23 +01:00 |
|
Kiril Videlov
|
41d0494b73
|
feat: update user name field to be optional in User struct and User type to handle cases where name or given_name is not available
|
2023-11-30 13:40:23 +01:00 |
|
Nikita Galaiko
|
0976cd294a
|
Merge pull request #1857 from gitbutlerapp/try-to-rebase-when-applying-branch
optimize wd flushing
|
2023-11-30 13:32:35 +01:00 |
|
Nikita Galaiko
|
65f7bbbbd1
|
test with sub directories
|
2023-11-30 13:18:04 +01:00 |
|
Nikita Galaiko
|
10b325732f
|
bring back build_wd_tree optimization
|
2023-11-30 12:54:01 +01:00 |
|
Mattias Granlund
|
6e64d3fbcc
|
Wait for prs to reload after creating pr
|
2023-11-30 10:07:48 +00:00 |
|
Nikita Galaiko
|
e25cd28c9f
|
list files can filter by prefix
|
2023-11-30 10:41:47 +01: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 |
|