gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-29 06:18:12 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,768 Commits 147 Branches 1,026 Tags 65 MiB
7ca7dfd3e2
Commit Graph

2768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Galaiko
7ca7dfd3e2 cargo fmt 2023-09-18 15:05:57 +02:00
Nikita Galaiko
e98f8bbf7b merged upstream 2023-09-18 15:04:15 +02:00
Nikita Galaiko
0caf0366e3 commit files fetching async 2023-09-18 15:04:09 +02:00
Nikita Galaiko
301c58964f
Merge pull request #1215 from gitbutlerapp/no-error 
no error is branch is already applied
 2023-09-18 14:03:46 +02:00
Nikita Galaiko
49d5295911 no error is branch is already applied 2023-09-18 13:59:50 +02:00
Nikita Galaiko
cb37cbadfb
Merge pull request #1214 from gitbutlerapp/can-apply-methods 
Can apply methods
 2023-09-18 12:20:55 +02:00
Nikita Galaiko
f5a525d840 make isMergeable asyncronous 2023-09-18 10:39:48 +02:00
Nikita Galaiko
4e568420c8 fetch isMergeable asyncronously 2023-09-18 10:00:56 +02:00
Nikita Galaiko
2cfe510fc4 add can apply methods 2023-09-18 09:15:49 +02:00
Nikita Galaiko
c5dc6785a2
Merge pull request #1213 from gitbutlerapp/link-fix 
fix link without href
 2023-09-18 08:39:17 +02:00
Nikita Galaiko
5e27f9b8e9
fix link without href 2023-09-18 08:37:29 +02:00
Kiril Videlov
188892ff00 chore: update language parser usage and add support for Ruby language 
The code changes in this commit update the usage of language parsers in the codebase. Instead of using the `LanguageSupport` interface from `@codemirror/language`, the code now directly uses the `Parser` interface from `@lezer/common`. Additionally, support for the Ruby language has been added by importing the `ruby` mode from `@codemirror/legacy-modes/mode/ruby` and defining a parser for it using `StreamLanguage.define(ruby
 2023-09-16 00:09:53 +02:00
dependabot[bot]
1b20e735f0 Bump marked from 7.0.4 to 9.0.0 
Bumps [marked](https://github.com/markedjs/marked) from 7.0.4 to 9.0.0.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v7.0.4...v9.0.0)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-15 15:36:00 +02:00
dependabot[bot]
2341cb232f Bump eslint-plugin-svelte from 2.33.0 to 2.33.1 
Bumps [eslint-plugin-svelte](https://github.com/sveltejs/eslint-plugin-svelte) from 2.33.0 to 2.33.1.
- [Release notes](https://github.com/sveltejs/eslint-plugin-svelte/releases)
- [Changelog](https://github.com/sveltejs/eslint-plugin-svelte/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/eslint-plugin-svelte/compare/v2.33.0...v2.33.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-svelte
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-15 15:35:50 +02:00
dependabot[bot]
293897b523 Bump @histoire/plugin-svelte from 0.16.5 to 0.17.0 
Bumps [@histoire/plugin-svelte](https://github.com/Akryum/histoire/tree/HEAD/packages/histoire-plugin-svelte) from 0.16.5 to 0.17.0.
- [Release notes](https://github.com/Akryum/histoire/releases)
- [Changelog](https://github.com/histoire-dev/histoire/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Akryum/histoire/commits/v0.17.0/packages/histoire-plugin-svelte)

---
updated-dependencies:
- dependency-name: "@histoire/plugin-svelte"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-15 15:35:42 +02:00
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