Commit Graph

3579 Commits

Author SHA1 Message Date
Nikita Galaiko
f4f140afa5 new branch dropzone works again 2023-11-06 13:36:14 +01:00
Nikita Galaiko
6bcf1f90c6 fix dragable bug 2023-11-06 13:36:03 +01:00
Nikita Galaiko
7f6e391347 cherry picking works again 2023-11-06 13:13:16 +01:00
Nikita Galaiko
97cd2d4920 ammendable commit card 2023-11-06 12:53:47 +01:00
Nikita Galaiko
b31441b888 drag & amend works 2023-11-06 11:41:18 +01:00
Nikita Galaiko
b804a2017a
Merge pull request #1511 from gitbutlerapp/add-branch-reference-and-delete
Add branch reference and delete
2023-11-06 11:16:14 +01:00
Nikita Galaiko
f946a58d5f feat: use From instead of TryForm where possible 2023-11-06 10:57:00 +01:00
Nikita Galaiko
0779511a84
Merge pull request #1512 from gitbutlerapp/crancky-got-cranckier
crancky got cranckier
2023-11-06 10:51:17 +01:00
Nikita Galaiko
7dc9f45d1a chore: refactor Controller initialization to use from method instead of try_from for improved code readability and consistency 2023-11-06 10:32:12 +01:00
Mattias Granlund
fff966a063 Fix event propagation for cherry picking 2023-11-03 15:01:40 +01:00
Nikita Galaiko
f00aa38677
Merge pull request #1508 from gitbutlerapp/add-test-for-dirty-function
GB-626
2023-11-03 14:47:38 +01:00
Nikita Galaiko
5581a476e9 refresh sessions on vbranch updates 2023-11-03 14:30:40 +01:00
Nikita Galaiko
1a5cda3799 extra check for sessions indexer 2023-11-03 14:30:30 +01:00
Nikita Galaiko
7480ac20be
Merge pull request #1506 from gitbutlerapp/create-virtual-branch-reference
Create virtual branch reference
2023-11-03 13:30:44 +01:00
Mattias Granlund
d2ba79a695 Prevent navigation on clicking refresh button 2023-11-03 13:28:48 +01:00
Nikita Galaiko
40bf6c6670 add missing reference creation 2023-11-03 13:08:37 +01:00
Mattias Granlund
58a74873fe Fix button that takes you back to integration branch 2023-11-03 12:37:27 +01:00
Mattias Granlund
91dd37e570 Make base branch popout into page 2023-11-03 12:06:20 +01:00
Kiril Videlov
232a0dcf01 feat: add ProjectHeader component to display project title and GitHub icon, update SVG components to spread props for reusability 2023-11-02 17:34:15 +01:00
extrawurst
dc4fddf81f code push ends with pushing all gb refs 2023-11-02 16:20:39 +01:00
Mattias Granlund
7a787f53eb chore: use correct BranchLane import name 2023-11-02 14:48:44 +01:00
extrawurst
918a093d89
GB-613 push project code to gb repo (#1479) 2023-11-02 14:45:50 +01:00
Mattias Granlund
0513ccccdb Fix settings UI by refactoring layout structure 2023-11-02 12:52:29 +01:00
Kiril Videlov
85022032fe fix: mergeability check for remote branches is not suitable for eager execution because it's expensive and the results are not immediatelly needed 2023-11-02 12:08:03 +01:00
Nikita Galaiko
b0aac0d3dc
Merge pull request #1492 from gitbutlerapp/add-amend-virtual-branch-command
Add amend virtual branch command
2023-11-02 10:47:11 +01:00
Mattias Granlund
4b51ebc565 Fix navigation after adding new project 2023-11-02 10:47:04 +01:00
Nikita Galaiko
911f884552 ensure can amend only to the same branch 2023-11-02 10:25:54 +01:00
Nikita Galaiko
67fce382d9 merged upstream 2023-11-02 09:45:45 +01:00
Nikita Galaiko
52089f8ab1
Merge pull request #1494 from gitbutlerapp/symlinks
symlinks
2023-11-02 09:45:36 +01:00
Nikita Galaiko
531bff3061 satisfy cranky 2023-11-02 09:21:05 +01:00
Nikita Galaiko
3ebd071e9e do not unwrap 2023-11-02 09:19:28 +01:00
Nikita Galaiko
ede64d3501 recursive link test 2023-11-02 09:00:07 +01:00
Nikita Galaiko
0edbfc1a54 fix: handle symlinks correctly when adding and flushing files in the repository 2023-11-02 08:43:25 +01:00
Mattias Granlund
c5f53f003f Add back tauri dragger to top left corner 2023-11-01 17:20:22 +01:00
Mattias Granlund
c9ba804674 Fix imports and drop unused page file 2023-11-01 17:16:55 +01:00
Mattias Granlund
83b3df7315 Create new page for board in nested layout 2023-11-01 17:16:55 +01:00
Nikita Galaiko
b221254257 to_same_branch working 2023-11-01 14:44:47 +01:00
Mattias Granlund
a3dc701a8f Create modules under $lib 2023-11-01 14:01:08 +01:00
Mattias Granlund
9c0e4bd427 Move sentry and posthog into analytics module 2023-11-01 14:01:08 +01:00
Mattias Granlund
72d59d1fa2 Rename lib/api -> lib/backend 2023-11-01 14:01:08 +01:00
Mattias Granlund
f2e609e791 Flatten the front end api folder 2023-11-01 14:01:08 +01:00
Nikita Galaiko
693e92119d add tests 2023-11-01 13:45:13 +01:00
Nikita Galaiko
ad7d0d6f62 feat: allow amending hunks to the branch top commit 2023-11-01 13:42:58 +01:00
Nikita Galaiko
2f4e26475e
Merge pull request #1491 from gitbutlerapp/lock-hunks-on-commit
Lock hunks on commit
2023-11-01 13:34:05 +01:00
Nikita Galaiko
ba0069e6ae fix hunk locking 2023-11-01 13:27:12 +01:00
Nikita Galaiko
78c179389b
Merge pull request #1487 from gitbutlerapp/refactor-get-applied-status-function
Refactor get applied status function
2023-11-01 12:17:05 +01:00
Nikita Galaiko
65b1d7ed38 simplify virtual branch types conversion 2023-11-01 11:54:59 +01:00
Mattias Granlund
f10a443606 Move svelte lib components into a flat directory 2023-11-01 11:47:00 +01:00
Mattias Granlund
fb7a327cef Remove stories from github actions and readme 2023-11-01 11:47:00 +01:00
Mattias Granlund
84121b94f0 Move a few more files 2023-11-01 11:47:00 +01:00