Commit Graph

3800 Commits

Author SHA1 Message Date
PavelLaptev
96c1fb0064 Test undo 2023-11-29 00:46:57 +01:00
PavelLaptev
874e8f2e4b Test 2023-11-29 00:46:18 +01:00
PavelLaptev
2caddf48c1 Test 2023-11-29 00:45:43 +01:00
PavelLaptev
4e5567391e body background update, commit card update 2023-11-29 00:45:17 +01:00
PavelLaptev
6abcf57057 merged upstream 2023-11-29 00:38:42 +01:00
PavelLaptev
d3a8e9c3fb very long commit message just to test how it works and if it 2023-11-29 00:38:29 +01:00
Mattias Granlund
5973ce4364 🔧 fix: update getGithubContext to only emit distinct values when baseBranch remoteUrl changes 2023-11-28 23:30:04 +00:00
PavelLaptev
b7c5dc3e56 merged upstream 2023-11-29 00:14:00 +01:00
PavelLaptev
d1d20c063e Wip 2023-11-29 00:13:46 +01:00
Mattias Granlund
71cce6730e 🐛 fix: clear selected file ID when closing file modal 2023-11-28 23:01:13 +00:00
Mattias Granlund
8f1a8805a9 🔨 chore: update text alignment in branch card component 2023-11-28 23:00:54 +00:00
Mattias Granlund
66154ce440 🔨 chore: optimize PR loading by adding skipCache option and logging for debugging 2023-11-28 22:40:14 +00:00
Pavel Laptev
f4e8e86c58
Merge pull request #1808 from gitbutlerapp/commit
style updates
2023-11-28 23:17:50 +01:00
PavelLaptev
898834a7ee new tag color, tokens typo fix 2023-11-28 23:15:52 +01:00
PavelLaptev
8e9725e856 Changed cursor for the branch label 2023-11-28 22:48:52 +01:00
PavelLaptev
f13b33e6e3 new icon 2023-11-28 22:39:23 +01:00
Mattias Granlund
1216c5e647 🔧 fix: center align h1 and p elements in new-branch section 2023-11-28 21:31:03 +00:00
Mattias Granlund
adacf168be Fix lint warnings 2023-11-28 21:30:14 +00:00
Mattias Granlund
fb3a1b4e49 🔧 fix: center align h1 in .no-changes class 2023-11-28 21:30:07 +00:00
Mattias Granlund
cc9a6a5b70 🔨 chore: update PrService to support injecting and retrieving additional Pull Requests 2023-11-28 21:10:48 +00:00
Mattias Granlund
2c08ae499a 🔧 fix: handle push failure gracefully and display error message 2023-11-28 20:59:03 +00:00
Mattias Granlund
e0d889dd85 feat: add sleep function to delay PR creation after pushing branch 2023-11-28 19:42:31 +00:00
extrawurst
e0aea09ef1
fix pushing gitbutler refs even if target is not changed (#1796)
* push_to_gitbutler_server returns whether anything was pushed
* fix timestamp saving so tick does not try pushing everytime but only every 15min
* clearer logging (only log if we actually pushed objects of gitbutler refs)
2023-11-28 20:41:04 +01:00
Mattias Granlund
66c2e6f3ab feat: add support for creating pull requests when pushing commits 2023-11-28 19:38:49 +00:00
Mattias Granlund
ace186e6cf Testing create PR 2023-11-28 18:54:33 +00:00
Mattias Granlund
70938bdd4e 🔧 fix: try and fix create pr button 2023-11-28 18:54:16 +00:00
Mattias Granlund
93ce6917dd Fix clowny mistake 2023-11-28 18:53:59 +00:00
Mattias Granlund
b88030c81b 🔨 chore: add conditional rendering for update button based on base branch status 2023-11-28 18:43:28 +00:00
Mattias Granlund
87b9b2f3c4 🔨 chore: add clickable behavior to error Tag component 2023-11-28 18:34:09 +00:00
Mattias Granlund
999f7db224 Move sync and update buttons 2023-11-28 18:28:35 +00:00
Kiril Videlov
c53f3ae8f6 chore: update minimum and initial inner window sizes for better user experience 2023-11-28 19:15:55 +01:00
Mattias Granlund
151924ea8a Make wide option for regular buttons 2023-11-28 18:15:06 +00:00
Mattias Granlund
3b0777fe4c Change PR tag to say "PR" 2023-11-28 18:15:06 +00:00
Kiril Videlov
516f3700a1 chore: update Prettier configuration files to use JSON format instead of JavaScript module format 2023-11-28 18:52:02 +01:00
Mattias Granlund
2b89f67040 Add back hacky reset head commit button
- will be updated soon
2023-11-28 17:33:24 +00:00
Mattias Granlund
7e7eac663f Show only "create pull request" for remote commits 2023-11-28 17:33:24 +00:00
Mattias Granlund
b6771b6018 Refactor and restyle commit boxes 2023-11-28 17:33:24 +00:00
Mattias Granlund
ea32af1022 Add a couple of icons 2023-11-28 16:14:53 +00:00
Kiril Videlov
86ccd3b4bd fix: automatically generate branch name for virtual branches with one-liner changes 2023-11-28 16:21:52 +01:00
Kiril Videlov
124aacef4e chore: update prettier configuration file paths and format 2023-11-28 15:53:31 +01:00
Pavel Laptev
2515d7f8c7
Merge pull request #1784 from gitbutlerapp/virtual-branch-1
some css changes
2023-11-28 15:46:55 +01:00
PavelLaptev
df6a31d9a4 Wip 2023-11-28 15:44:45 +01:00
PavelLaptev
7543609d62 Fixes 2023-11-28 15:42:59 +01:00
Mattias Granlund
652912a589 Make file tree files draggable 2023-11-28 14:30:13 +00:00
Mattias Granlund
1f7a03f59d Add new button for push/pr action 2023-11-28 14:27:46 +00:00
Kiril Videlov
3117769556 chore: add draggable region to window and update class order for offline status indicator 2023-11-28 15:04:58 +01:00
Nikita Galaiko
df796bf91f
Merge pull request #1780 from gitbutlerapp/add-rolling-file-appender
Add rolling file appender
2023-11-28 14:58:29 +01:00
Nikita Galaiko
fa5e9dad43 keep at most 14 log files 2023-11-28 14:53:29 +01:00
Nikita Galaiko
c0e70cc04d
Merge pull request #1777 from gitbutlerapp/fix-assertions-in-update-base-branch
do not lose work on base branch update GB-674
2023-11-28 14:33:17 +01:00
Kiril Videlov
c077bd965a chore: update file rendering logic and transition animation in Svelte component 2023-11-28 14:30:17 +01:00