Commit Graph

939 Commits

Author SHA1 Message Date
Abdelilah El Aissaoui
e6619cbd4b Diff scroll is now preserved when changing the diff entry
The scroll is stored in the view model and only resetted when changing to a different file or state (staged/unstaged version of the same file).
2022-01-03 22:59:35 +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
997a651faf Fixed status not being updated when merging 2022-01-02 01:47:45 +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
2313ad4591 Added tabs management comments 2022-01-01 18:41:26 +01:00
Abdelilah El Aissaoui
474cc9a1d7 Fixed fast forward text in merge dialog when using dark theme 2022-01-01 18:32:51 +01:00
Abdelilah El Aissaoui
d4b2a1c57f Refactored tabs management 2022-01-01 18:32:35 +01:00
Abdelilah El Aissaoui
6ddb77bf60 Added diff update when staging/unstagins (files & hunks) 2021-12-28 02:40:18 +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
86fd61d0d7 Extracted RawFile generation to its own class 2021-12-27 22:55:31 +01:00
Abdelilah El Aissaoui
bd719be963 Refactored diff by replacing text diff patch with a custom Hunk class 2021-12-27 05:13:55 +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
d81c81de87 Fixed log not updating when new uncommited changes appear 2021-12-18 02:33:13 +01:00
Abdelilah El Aissaoui
1943bd6906 Fixed crashes when opening an empty repository 2021-12-18 02:23:39 +01:00
Abdelilah El Aissaoui
6c550960a1 Changed clone repo icon 2021-12-18 00:06:15 +01:00
Abdelilah El Aissaoui
79aff9104a Replaced elmo avatar placeholder by Color+Initial 2021-12-17 23:54:10 +01:00
Abdelilah El Aissaoui
7f6cc7c32a Fixed flickering when (un)staging many files due to file watcher updating
Commiting show progress bar
2021-12-14 20:06:18 +01:00
Abdelilah El Aissaoui
3f31cd2ac0 Renamed package name and included all modules for release build 2021-12-14 13:42:31 +01:00
Abdelilah El Aissaoui
23a6b741b8 Fixed FileWatcher triggering status update while an operation is running 2021-12-14 13:40:01 +01:00
Abdelilah El Aissaoui
cd19a62ae9 Fixed checking out remote branch doesn't preserve the starting point 2021-12-14 13:33:25 +01:00
Abdelilah El Aissaoui
45d89f3699 Fixed crash when clicking on a ref with a ref that's not shown in the log 2021-12-12 20:16:00 +01:00
Abdelilah El Aissaoui
e12a5ee2e2 Doing a commit now refreshes the whole repo info, not just the log 2021-12-12 20:11:33 +01:00
Abdelilah El Aissaoui
31b692e581 Reformated project's code 2021-12-12 19:49:46 +01:00
Abdelilah El Aissaoui
912397b257 Clicking on a ref now selects the log's commit 2021-12-12 19:38:11 +01:00
Abdelilah El Aissaoui
2d32b77a69 Implemented context menu in side panel branches/tags 2021-12-12 06:04:19 +01:00
Abdelilah El Aissaoui
e068ac42de Changed log's ref chips design 2021-12-12 02:02:33 +01:00
Abdelilah El Aissaoui
05326f3a1d Fixed crash when being detached from any branch 2021-12-12 01:07:42 +01:00
Abdelilah El Aissaoui
0fec32e25f Pixed password field text color in dark theme 2021-12-12 00:43:01 +01:00
Abdelilah El Aissaoui
2e2277885c Removed splitter from SplitPane 2021-12-12 00:42:40 +01:00
Abdelilah El Aissaoui
8c96858baa Updated JGit to 6.0
Also updated minnor dagger version
2021-12-08 23:02:06 +01:00
Abdelilah El Aissaoui
43fa81c090 Fixed "Recent" text color in dark theme 2021-12-08 19:33:15 +01:00
Abdelilah El Aissaoui
6f542d4869 Changes dark theme color scheme 2021-12-08 19:23:48 +01:00
Abdelilah El Aissaoui
330a7aa6b8 Fixed text field colors in dark theme 2021-12-08 19:21:41 +01:00
Abdelilah El Aissaoui
7eb26f0f4b Dark theme is now the default one 2021-12-08 19:12:08 +01:00
Abdelilah El Aissaoui
2a5b3097ad Fixed commit message color in dark theme 2021-12-08 19:05:09 +01:00
Abdelilah El Aissaoui
0565bf1a33 Added settings dialog & improved dark theme 2021-12-08 19:04:16 +01:00
Abdelilah El Aissaoui
c7954af9ad Added remotes to side panel 2021-12-08 18:30:41 +01:00
Abdelilah El Aissaoui
bc52221ef1 Added app logo 2021-12-07 20:03:40 +01:00
Abdelilah El Aissaoui
a141b0676e Fixed remote branch checkout
Also removed remote branches from "Branches" list in left menu (will add a future "remotes" list)
2021-12-07 19:17:18 +01:00
Abdelilah El Aissaoui
7a3d68e3a6 Limited images concurrent loading to 3 2021-12-07 17:42:15 +01:00
Abdelilah El Aissaoui
bf6600878b Diff view closes if user clicks on a different stash/commit 2021-12-07 01:21:12 +01:00
Abdelilah El Aissaoui
d4991bf7b4 Changes stash list to show short message instead of the name 2021-12-07 01:09:58 +01:00
Abdelilah El Aissaoui
26edec3de3 Added stash detail viewing & selected item state management 2021-12-07 01:08:45 +01:00
Abdelilah El Aissaoui
5493451719 Added current branch icon to detached HEAD 2021-12-07 00:02:49 +01:00
Abdelilah El Aissaoui
6d190614e5 Added branch current branch identifier to log & branch sorting 2021-12-06 23:52:51 +01:00
Abdelilah El Aissaoui
efab5b0bfa Added remove tag functionality 2021-12-06 23:15:31 +01:00
Abdelilah El Aissaoui
2a43cdeca8 Disabled allowing empty git commits 2021-12-06 23:05:06 +01:00