Commit Graph

21 Commits

Author SHA1 Message Date
Abdelilah El Aissaoui
a3ff073b54 Fixed project's formatting 2022-02-02 00:26:46 +01:00
Abdelilah El Aissaoui
6ca1e15ce8 UI improvements 2022-01-31 15:15:05 +01:00
Abdelilah El Aissaoui
42fec7c591 Implemented merge & rebase 2022-01-31 01:30:25 +01:00
Abdelilah El Aissaoui
1508e27b13 Fixed warnings and removed unused code 2022-01-05 03:19:52 +01:00
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
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
79aff9104a Replaced elmo avatar placeholder by Color+Initial 2021-12-17 23:54:10 +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
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
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
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
6c1dc32928 Log full cleanup
- Refactored log function into multiple sub functions
- Removed use of DialogManager from Log
- Merge branch now shows current branch instead of hardcoded "HEAD"
2021-12-04 07:02:40 +01:00