Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-08-15 21:50:29 +03:00
Code Issues Projects Releases Wiki Activity
1,777 Commits 87 Branches 20 Tags 80 MiB
e6e6aaf917
Commit Graph

1777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Jensen
e6e6aaf917 Prevent Uncommitted Changes from being shown when ShowCleanStatus is false 
Previously, it was possible for the "Uncommitted Changes" row to be
appended to the CommitList even if "Show Clean Status" option had been
unchecked.  This commit prevents that from happening.
 2024-05-21 19:03:26 -05:00
Murmele
025f55cec8
Merge pull request #759 from AHSauge/fixes/zip-dep 
Update zip dependency to fix GCC14 build error
 2024-05-21 11:25:19 +02:00
Murmele
39ccb2661c
Merge pull request #751 from mwerle/feature/editor-show-whitespace 
feat: add an option to render whitespace in the diff and editor views
 2024-05-12 18:38:23 +02:00
Micha WERLE
37c8034e31 feat(whitespace): add german translation for "Show whitespace" 
Add german translations for the new "Show whitespace" settings in the Settings dialog.
 2024-05-13 00:03:03 +09:00
Micha WERLE
e3072fce50 feat(whitespace): Update translation files. 
Commit updated translation files following source code changes.

NOTE: This commit does not update the actual translations.
 2024-05-13 00:03:03 +09:00
Micha WERLE
81cf2e6e5e feat(whitespace): show whitespace in editor views 
This commit adds a new Settings entry "ShowWhitespaceinEditor"
("editor/view/showWhitespace") to the Settings class, and a new checkbox
in the Editor settings dialog.

This setting defaults to off/false, preserving the current behaviour of
the application.

If this setting is toggled to on, whitespace is rendered in the HunkWidget
and BlameEditor views.
 2024-05-13 00:03:03 +09:00
Micha WERLE
e5f9484638 chore: add tags file to gitignore 2024-05-13 00:03:03 +09:00
Alf Henrik Sauge
d36eba172a Update zip dependency to fix GCC14 build error 
Change needed since zip contained a call to calloc where the argument
order was reversed. This results in calloc-transposed-args being raised.
 2024-05-11 14:47:46 +02:00
Murmele
67a358f864
Merge pull request #757 from Murmele/macos_build_fix 
macos-latest is now the arm64 version, but we wanna build against x86_64
 2024-05-11 08:03:27 +02:00
Murmele
4d5cd5bcec
Update .github/workflows/build.yml 2024-05-11 07:38:55 +02:00
Martin Marmsoler
339ae5fdb9 macos-latest is now the arm64 version, but we wanna build against x86_64 
Description: Because openssl uses it
https://github.com/actions/runner-images/tree/main
 2024-05-08 21:17:31 +02:00
Murmele
d48073f5b6
Merge pull request #755 from Murmele/fix_appdata 
remove id because otherwise a cyclic dependency is created
 2024-05-08 21:09:37 +02:00
Martin Marmsoler
c748d12d92 remove id because otherwise a cyclic dependency is created 
https://docs.flathub.org/docs/for-app-authors/metainfo-guidelines/
Error message during flatpak build on flathub:
```{
    "errors": [
        "appstream-failed-validation"
    ],
    "warnings": [
        "appstream-summary-too-long"
    ],
    "appstream": [
        "W: com.github.Murmele.Gittyup:49: circular-component-relation"
    ],
    "message": "Please consult the documentation at https://docs.flathub.org/docs/for-app-authors/linter"
}
```
 2024-05-08 20:41:09 +02:00
Murmele
ee5a4aea81
Merge pull request #748 from Murmele/release_1.4.0 
release commit 1.4.0
 2024-04-24 19:56:31 +02:00
Martin Marmsoler
a0349a2e9a release commit 2024-04-24 19:02:05 +02:00
Murmele
0f97bf2181
Merge pull request #745 from Murmele/flatpak_artifacts 
wrong path used
 2024-04-21 09:45:21 +02:00
Martin Marmsoler
ea466af862 wrong path used 
Description: so the bundle was not found
 2024-04-21 09:44:47 +02:00
Murmele
cbcca937d3
Merge pull request #744 from Murmele/flatpak_artifacts 
remove quotes, otherwise the artifact will not be found
 2024-04-21 09:23:59 +02:00
Martin Marmsoler
81f91e5de7 remove quotes, otherwise the artifact will not be found 2024-04-21 08:45:25 +02:00
Murmele
16d1e27197
Merge pull request #743 from Murmele/release 
update changelog for upcomming release
 2024-04-20 21:04:36 +02:00
Martin Marmsoler
5a3e27ea8a revert date 
Reason: so it can be merged and at the end only the date must be changed
 2024-04-20 20:15:34 +02:00
Murmele
7e94710d77
Merge pull request #742 from Murmele/flatpak_artifact 
update flatpak-builder
 2024-04-20 20:14:04 +02:00
Martin Marmsoler
7ef031f43b remove check 2024-04-20 19:38:28 +02:00
Martin Marmsoler
4115ba2e43 test with different exit codes 2024-04-20 19:35:31 +02:00
Martin Marmsoler
8d99085847 Description: 2024-04-20 19:35:00 +02:00
Martin Marmsoler
883930b339 fix 2024-04-20 19:34:07 +02:00
Martin Marmsoler
8c863b4f98 remove section because not handled correctly 2024-04-20 19:07:31 +02:00
Martin Marmsoler
3145a3f936 fix appdata file 2024-04-20 18:32:46 +02:00
Martin Marmsoler
33451d4fa5 Description: 2024-04-20 18:30:53 +02:00
Martin Marmsoler
d9d8c28ad2 Description: 2024-04-20 18:26:06 +02:00
Martin Marmsoler
a15947f7f5 Description: 2024-04-20 18:23:00 +02:00
Martin Marmsoler
98bafe8b93 Description: 2024-04-20 18:20:21 +02:00
Martin Marmsoler
5b97c84c3c Description: 2024-04-20 18:17:17 +02:00
Martin Marmsoler
82b2b36257 update changelog for upcomming release 2024-04-20 18:10:21 +02:00
Martin Marmsoler
0f1178be09 remove testing not found 2024-04-20 17:57:29 +02:00
Murmele
db7daf90e8
Merge pull request #741 from Murmele/flatpak_sdk_version 
update flatpak runtime version
 2024-04-20 17:55:36 +02:00
Martin Marmsoler
e48dd9cfba test not found 2024-04-20 17:45:00 +02:00
Murmele
9c20e60e8d
Merge pull request #713 from siforrer/fix-drop-pop-stash-crashes 
Set head/stash reference after pop/drop stash
 2024-04-20 17:43:54 +02:00
Martin Marmsoler
5431debea6 uppercase AppImage filename 2024-04-20 17:43:00 +02:00
Martin Marmsoler
13db99408b update git lfs 2024-04-20 17:23:23 +02:00
Martin Marmsoler
22f656a626 install correct versions and remove sdk because it will be installed automatically by the flatpak-builder plugin 2024-04-20 17:18:44 +02:00
Martin Marmsoler
287cf5a32d Set name for the flatpak artifact and validate that all artifacts are available 2024-04-20 17:14:54 +02:00
Martin Marmsoler
b573da616b use system openssl 2024-04-20 16:58:16 +02:00
Murmele
64cecfadaf
Merge pull request #719 from monks-dev/master 
Add option to always show window maximized
 2024-04-20 16:39:12 +02:00
Martin Marmsoler
0f0e9e427f update flatpak-builder 2024-04-20 16:38:44 +02:00
Martin Marmsoler
896bd6e2e0 update flatpak runtime version 2024-04-20 16:29:19 +02:00
siforrer
744dc13551 Update src/ui/RepoView.cpp 
Co-authored-by: Ryan Jensen <jensenr30@gmail.com>
 2024-04-20 16:24:21 +02:00
Silvan Forrer
1cb74d17e1 Select "Uncommitted changes" after "Pop Stash" 2024-04-20 16:24:20 +02:00
Silvan Forrer
659776f938 Revert the refresh behavior 2024-04-20 16:24:20 +02:00
Silvan Forrer
0515491197 Set head reference after pop stash or refresh 
When executing "Stash->Pop Stash" from the menu bar or when popping a
specific stash from the commit list then the repo view is set to the head
revision and the commit list is updated with the content from the head
revision. 

Before the when doing a "Refresh" and being on the stash view the commit list 
stayed on the stashes but the head revision was selected. Now the commit list 
contains the commits from the head revision.
 2024-04-20 16:24:19 +02:00