gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-13 15:34:13 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,753 Commits 150 Branches 1,055 Tags 59 MiB
c7262cbef5
Commit Graph

2753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Galaiko
c7262cbef5
Merge pull request #1211 from gitbutlerapp/fix-commit-time 
fix commit timestamp
 2023-09-15 15:06:40 +02:00
Nikita Galaiko
46e97af7e8 pnpm format 2023-09-15 15:05:17 +02:00
Nikita Galaiko
0fb1df1ff8 fix commit timestamp 2023-09-15 15:04:03 +02:00
Nikita Galaiko
82dc647322
Merge pull request #1210 from gitbutlerapp/rm-get-commit-diff 
get rid of git_commit_diff call
 2023-09-15 13:32:26 +02:00
Nikita Galaiko
602fca0e87 cargo fmt 2023-09-15 13:28:10 +02:00
Nikita Galaiko
f5a24cf5e5 get rid of git_commit_diff call 2023-09-15 13:24:07 +02:00
Nikita Galaiko
2be120797b
Merge pull request #1209 from gitbutlerapp/define-remote-types 
get rid of virtual / remote confusion
 2023-09-15 12:51:09 +02:00
Nikita Galaiko
edbbe1f0a8 get rid of virtual / remote confusion 2023-09-15 12:46:25 +02:00
Kiril Videlov
f3666624f1 fix formatting 2023-09-15 11:30:35 +02:00
Kiril Videlov
45c9d1a5f6 chore: refactor commit message generation logic and add UI support for toggling options 
The commit message generation logic in the server.ts file has been refactored to improve readability and maintainability. The `trimNonLetters` function has been removed as it was not necessary. Additionally, UI support has been added to toggle options for generating commit messages. The options include "Extra concise" and "Use emojis", which can be enabled or disabled based on user preferences
 2023-09-15 11:30:35 +02:00
Nikita Galaiko
797942fedd
Merge pull request #1207 from gitbutlerapp/rm-plaintext-conflicts 
do not send conflicts back
 2023-09-15 10:18:37 +02:00
Nikita Galaiko
ae40f6abda do not send conflicts back 2023-09-15 10:11:45 +02:00
Nikita Galaiko
573419c342
Merge pull request #1206 from gitbutlerapp/cleanup 
rm some unused code
 2023-09-15 09:45:15 +02:00
Nikita Galaiko
ee82ea03ce rm some unused code 2023-09-15 09:30:51 +02:00
Nikita Galaiko
1cbb0e02ab
Merge pull request #1204 from gitbutlerapp/refactor 
Refactor
 2023-09-14 15:37:09 +02:00
Mattias Granlund
ebf9627132 Fix links nested within some stopPropagation 2023-09-14 15:35:17 +02:00
Mattias Granlund
5c6171b558 fix(branch-list): updates border color for stashed and remote branches 
The border color for stashed branches and remote branches in the branch list component was incorrect. This commit fixes the issue by updating the border color to match the design specifications
 2023-09-14 15:34:50 +02:00
Nikita Galaiko
0526d11b56 fix tests 2023-09-14 15:31:50 +02:00
Nikita Galaiko
a832a877ea rm instrumentation 2023-09-14 15:27:03 +02:00
Nikita Galaiko
b684c6266a add .ahead() 2023-09-14 15:26:13 +02:00
Nikita Galaiko
df97887f52 start removing fields 2023-09-14 15:24:52 +02:00
Mattias Granlund
3cd9bcb290 Various css color related UI fixes 2023-09-14 13:57:36 +02:00
Mattias Granlund
2152d3d638 Fix user/project settings page backgrounds 2023-09-14 13:57:36 +02:00
Mattias Granlund
922c3fd12f Fix GH action node detection for CI 
- s/node/ui
 2023-09-14 13:54:59 +02:00
Nikita Galaiko
85010e5fcc
Merge pull request #1200 from gitbutlerapp/pool-database 
add db connections pool
 2023-09-14 12:32:38 +02:00
Nikita Galaiko
b05fe81000 add db connections pool 2023-09-14 12:23:25 +02:00
Nikita Galaiko
d7eee727cb
Merge pull request #1199 from gitbutlerapp/cargo-sort 
actions refactor
 2023-09-14 09:45:39 +02:00
Nikita Galaiko
0404c1e0ff fixup for publish.yaml 2023-09-14 09:40:39 +02:00
Nikita Galaiko
8bec547ebd rename to rust / node 2023-09-14 09:30:38 +02:00
Nikita Galaiko
c5d44b7cb9 checkout for changes 2023-09-14 09:21:20 +02:00
Nikita Galaiko
88f42ac596 filter on jobs level 2023-09-14 09:16:00 +02:00
Nikita Galaiko
682c2e1b82 sort tauri cargo 2023-09-14 09:07:58 +02:00
Nikita Galaiko
b8c128d623 rm init-env 2023-09-14 09:05:12 +02:00
Nikita Galaiko
ee9c656346 checkout before init 2023-09-14 08:56:12 +02:00
Nikita Galaiko
e6b281cf5f refactor actions 2023-09-14 08:54:23 +02:00
Nikita Galaiko
738606d1a1 merged upstream 2023-09-14 08:31:13 +02:00
Nikita Galaiko
b3a36f8c3f
Merge pull request #1198 from gitbutlerapp/partial-commit-ui 
remove terminal
 2023-09-14 08:31:05 +02:00
Nikita Galaiko
1750949e80 fix github action conditions 2023-09-14 08:28:55 +02:00
Nikita Galaiko
849a4da4b8 pnpm install 2023-09-14 08:25:02 +02:00
Nikita Galaiko
7c3a3af9f6 ensure cargo deps are sorted 2023-09-14 08:20:53 +02:00
Nikita Galaiko
3c0d4acabe remove terminal 2023-09-14 08:16:26 +02:00
Nikita Galaiko
425ee0ffb1 merged upstream 2023-09-14 08:16:14 +02:00
Mattias Granlund
ca3e4c2f72 Create new utility classes for border color 
- the colors need a bit of adjusting still, but commit is getting big
- doesn't seem like we need 4 border colors, but leaving in for now
 2023-09-13 22:28:35 +02:00
Mattias Granlund
a5526bb5dd Create new utility classes for setting bg and text color 
- choose from 5 bg colors
- choose from 4 text colors
- add text-color-[n] or bg-color-[n]
 2023-09-13 22:28:35 +02:00
Mattias Granlund
7ad43dfff7 Fix lint errors 2023-09-13 22:26:20 +02:00
Mattias Granlund
c353809869 Upgrade to prettier npm -> v3 2023-09-13 22:26:20 +02:00
Nikita Galaiko
1a0e1f7844
Merge pull request #1195 from gitbutlerapp/partial-commit-ui 
Partial commit UI
 2023-09-13 14:06:13 +02:00
Nikita Galaiko
395f73530c merged upstream 2023-09-13 13:54:05 +02:00
Nikita Galaiko
33cf7e7e63 remove files database 2023-09-13 13:53:59 +02:00
Nikita Galaiko
b3d3f34601
Merge pull request #1185 from gitbutlerapp/partial-commit-ui 
Partial commit UI
 2023-09-13 12:31:40 +02:00