Abdelilah El Aissaoui
1f889aca1c
Fixed reset on conflicted files
2022-06-22 10:40:41 +02:00
Abdelilah El Aissaoui
15827d119a
Added option to discard hunks
2022-06-19 19:52:53 +02:00
Abdelilah El Aissaoui
c5f7ddf266
Fixed stage all when there are removed files
2022-06-06 01:41:41 +02:00
Abdelilah El Aissaoui
c31b1a9d6b
Fixed hunk stage on files with a single line without lineDelimiter
2022-04-07 23:06:20 +02:00
Abdelilah El Aissaoui
c71f7555de
Fixed stage/unstage hunks not working on properly on specific line endings
2022-04-07 22:39:33 +02:00
Abdelilah El Aissaoui
b53b9b0b79
Now staged and unstaged use the same status to update the data (instead of executing it twice)
2022-04-06 20:19:29 +02:00
Abdelilah El Aissaoui
7f9da646ff
Fixed uncommited changes line not appearing on rebase with a single conflict (no other changes)
2022-04-06 20:18:59 +02:00
Abdelilah El Aissaoui
ab9c8ce2df
Fixed unstage hunk not restoring lines properly
2022-04-06 19:48:30 +02:00
Abdelilah El Aissaoui
1e0660dca0
Refactored status to improve its performance and removed diff update handling
2022-04-06 19:39:06 +02:00
Abdelilah El Aissaoui
4108537825
[WIP] started refactor of status
2022-04-06 17:49:38 +02:00
Abdelilah El Aissaoui
2dd6fb106e
Filtered out uninitialized submodules from git diff
2022-03-31 22:09:59 +02:00
Abdelilah El Aissaoui
4ed10c0682
Reformated project's code
2022-02-21 01:49:14 +01:00
Abdelilah El Aissaoui
df3f47f073
Untracked files are now staged before stash
2022-02-15 20:05:49 +01:00
Abdelilah El Aissaoui
02313fe632
Implemented context menu for stash operations
...
Moved selected item to TabState, so every ViewModel can update the current selected tab state without having to use callbacks to the RepoOpened component. This allows to set currently selected item to "None" when droping a stash that has been selected
2022-02-06 22:57:46 +01:00
Abdelilah El Aissaoui
fff18b7fef
Added uncommited files count to "uncommited changes" line in the log
...
Also improved log performance when a file has changed to only update the header and not the whole list
2022-02-06 20:49:54 +01:00
Abdelilah El Aissaoui
ac21b59f6c
Implemented amend previous commit
2022-02-05 03:01:03 +01:00
Abdelilah El Aissaoui
a3ff073b54
Fixed project's formatting
2022-02-02 00:26:46 +01:00
Abdelilah El Aissaoui
27f216aa5d
Added basic images diff
2022-01-29 20:33:08 +01:00
Abdelilah El Aissaoui
620fd1022b
Commit message is now preserved even after disposing the composable (stored in he VM)
2022-01-03 23:04:04 +01:00
Abdelilah El Aissaoui
9c53ce726e
Creation of multiple viewmodels that hold data state
2022-01-03 21:39:53 +01:00
Abdelilah El Aissaoui
c0c07ef5b1
Added conflict indicator during merge in uncommited changes
2022-01-02 01:46:23 +01:00
Abdelilah El Aissaoui
ad55f41f58
Fixed unstage hunk not working properly when having context lines inbetween changes
2021-12-28 02:01:08 +01:00
Abdelilah El Aissaoui
2e157aa773
Added try catch that unlocks the dir cache in case of error in hunk unstage
2021-12-28 01:37:21 +01:00
Abdelilah El Aissaoui
a8ed01784d
Implemented stage/unstage by hunks
2021-12-28 01:19:29 +01:00
Abdelilah El Aissaoui
908696735b
Added error display when a push has failed
2021-12-21 02:26:52 +01:00
Abdelilah El Aissaoui
3ed5f0cc1e
Uncommited changes line now show if merging/rebasing
...
This commit starts not only the rebase support but also manage merges when conflicts appear [WIP]
2021-12-18 04:18:48 +01:00
Abdelilah El Aissaoui
1943bd6906
Fixed crashes when opening an empty repository
2021-12-18 02:23:39 +01:00
Abdelilah El Aissaoui
31b692e581
Reformated project's code
2021-12-12 19:49:46 +01:00
Abdelilah El Aissaoui
2a43cdeca8
Disabled allowing empty git commits
2021-12-06 23:05:06 +01:00
Abdelilah El Aissaoui
ca3a55ce21
Added status update when file system changes (excluding ignored dirs)
2021-11-28 03:15:18 +01:00
Abdelilah El Aissaoui
da3f3c8935
Added password for ssh keys
2021-11-05 04:27:35 +01:00
Abdelilah El Aissaoui
87d7f1cdae
Added new log tree
2021-10-15 01:09:25 +02:00
Abdelilah El Aissaoui
ee745bd4e0
Added un/stage all buttons
2021-10-10 02:59:26 +02:00
Abdelilah El Aissaoui
2b3c12e20d
Migrated project to use Dagger
2021-10-06 20:45:33 +02:00
Abdelilah El Aissaoui
642cfd5f1e
Added dagger dependencies and moved code to package to avoid kapt warnings
2021-10-06 19:05:07 +02:00
