547 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jochen	2239d534f8	add logo-type file for gittyup ... dark version (blue) and light version (yellow)	2021-11-19 13:13:29 +01:00
Martin Marmsoler	ec561e637c	disable update dialog	2021-11-19 13:13:28 +01:00
Martin Marmsoler	20686f8968	remove GitAhead Changelog	2021-11-19 13:13:27 +01:00
Martin Marmsoler	85bdb2a9bd	Update com.github.Murmele.Gittyup.appdata.xml	2021-11-19 13:13:26 +01:00
Martin Marmsoler	11b1eecb8e	disable tracking	2021-11-19 13:13:25 +01:00
Martin Marmsoler	2218aac5c4	Add changelog	2021-11-19 13:13:24 +01:00
Martin Marmsoler	faa00a966d	fix appdata	2021-11-19 13:13:23 +01:00
Martin Marmsoler	dcfad51043	Add Copyright	2021-11-19 13:13:21 +01:00
Martin Marmsoler	ab340f87f9	version1.0.0	2021-11-19 13:13:20 +01:00
Martin Marmsoler	d3379d09a4	if patch conflited, patch_header_struct does not exist	2021-11-19 12:22:53 +01:00
Martin Marmsoler	6e8336248c	fix diff in old to new	2021-11-19 12:01:15 +01:00
Murmele	032f7dd312	Merge pull request #21 from Murmele/GitResetSubmodule ... Fix resetting submodules	2021-11-19 09:51:18 +01:00
Martin Marmsoler	7a2973bd64	fix reset submodules	2021-11-19 09:50:10 +01:00
Martin Marmsoler	431300545b	fix appdata id	2021-11-18 10:04:29 +01:00
Martin Marmsoler	73bf3dbf7c	if patch_header_struct->old_start > mStaged.header_struct(i)->old_start + mStaged.header_struct(i)->old_lines is not matching from beginning, setEditorLineInfos fails	2021-11-17 16:37:23 +01:00
Murmele	02c86835d3	Merge pull request #4 from Murmele/fix_hunk_staging_match ... Fix hunk line staging	2021-11-17 15:14:56 +01:00
Martin Marmsoler	49d7dd0711	remove content, because it is used in the editor	2021-11-17 15:12:03 +01:00
Martin Marmsoler	c0cca814a2	Update HunkWidget.cpp	2021-11-17 15:09:02 +01:00
Martin Marmsoler	c0296da29b	add comment	2021-11-17 15:07:11 +01:00
Martin Marmsoler	d364e88781	remove not needed variables	2021-11-17 15:03:08 +01:00
Martin Marmsoler	ee04b94ecd	rename variables	2021-11-17 15:00:00 +01:00
Martin Marmsoler	69e2a624ed	remove not needed variable	2021-11-17 14:56:50 +01:00
Martin Marmsoler	cef6280fb9	Merge commit '9ee074e7eb78b2d42dda21cb0dee31a4fd0b363a'	2021-11-17 14:52:50 +01:00
Martin Marmsoler	140dc426a9	add forgotten code	2021-11-17 14:48:38 +01:00
Martin Marmsoler	5e5370da6c	remove not needed code	2021-11-17 14:36:57 +01:00
Martin Marmsoler	85e93abf84	remove not needed stuff	2021-11-17 14:35:45 +01:00
Martin Marmsoler	1291b04aff	remove not needed functions	2021-11-17 14:34:47 +01:00
Martin Marmsoler	4d9bc02b55	remove not needed variables	2021-11-17 14:28:49 +01:00
Martin Marmsoler	69a9e034f0	remove comments	2021-11-17 14:26:18 +01:00
Martin Marmsoler	0692b42d41	do not force, otherwise there is a loop	2021-11-17 14:24:18 +01:00
Martin Marmsoler	d28eab9b6a	assert not needed, because it is a condition	2021-11-17 14:24:05 +01:00
Martin Marmsoler	1e1dd588ef	do not check all lines, if it is already clear that it must be partially staged	2021-11-17 14:10:21 +01:00
Martin Marmsoler	d021de5f40	Update HunkWidget.cpp	2021-11-17 14:03:41 +01:00
Murmele	9ee074e7eb	Replace flatpak url to the repository	2021-11-17 11:47:39 +01:00
Murmele	ccc1444192	Update README.md	2021-11-17 11:44:53 +01:00
Martin Marmsoler	c3b29b3697	change sizepolicy, so when changing to maximize mode, the TreeView will not be expanded	2021-11-17 11:39:13 +01:00
Martin Marmsoler	905790c3cf	Update HunkWidget.cpp	2021-11-17 11:18:29 +01:00
Murmele	0d74358c67	Merge pull request #18 from Murmele/Flatpak_external_merge_tools ... Fix external Merge Tool for Flatpak	2021-11-15 12:45:14 +01:00
Martin Marmsoler	d1b00adf75	Fix external Merge Tool	2021-11-15 12:30:50 +01:00
Murmele	8a650d7c96	Merge pull request #13 from Murmele/install_reorder ... Fix Flatpak installation	2021-11-14 10:04:14 +01:00
Martin Marmsoler	ef367b1dab	WIP	2021-11-09 15:15:19 +01:00
Martin Marmsoler	452a2df15c	do not install all libraries which are already part of the kde sdk of flatpak. Change paths which are not correct in the flatpak environment	2021-11-08 11:10:47 +01:00
Murmele	410be915e5	Merge pull request #11 from stingray21/master ... add new Gittyup logo	2021-11-01 16:37:07 +01:00
Jochen	788aec79de	add new Gittyup logo	2021-10-30 14:38:22 +02:00
Martin Marmsoler	8eed39847c	WIP	2021-10-26 14:47:22 +02:00
Martin Marmsoler	5aa9d09a57	Remove license word	2021-10-20 15:46:19 +02:00
Martin Marmsoler	648355d9fb	flatpak manifest ist on flathub	2021-10-20 15:28:01 +02:00
Martin Marmsoler	b38f473f53	uppercase Gittyup	2021-10-20 15:18:39 +02:00
Martin Marmsoler	fa4dc57da3	change id	2021-10-20 15:11:19 +02:00
Martin Marmsoler	da800ded69	change id in desktop file	2021-10-20 15:09:32 +02:00