Commit Graph

133 Commits

Author SHA1 Message Date
Abdelilah El Aissaoui
07703a66be Added remote branch deletion 2022-02-04 18:53:21 +01:00
Abdelilah El Aissaoui
fc4d52b57a Temporary files are now deleted when exiting the app 2022-02-04 01:34:22 +01:00
Abdelilah El Aissaoui
35a6b9cdeb Limited max lines to 1 in the graph text 2022-02-03 15:12:04 +01:00
Abdelilah El Aissaoui
832189e91e Changed side panel headers to be expandables and improved its UI 2022-02-03 14:47:25 +01:00
Abdelilah El Aissaoui
09d4184c40 Changed header weight for commited and uncommited changes 2022-02-02 21:45:24 +01:00
Abdelilah El Aissaoui
b042dcf2b9 Fixed delete and rebase branch being inverted 2022-02-02 20:25:21 +01:00
Abdelilah El Aissaoui
dabdaca3b1 UI improvements + code cleanup in side panels 2022-02-02 20:24:22 +01:00
Abdelilah El Aissaoui
1dca2dfd51 Added fetch all & after pull all the repository is reloaded 2022-02-02 10:33:08 +01:00
Abdelilah El Aissaoui
a3ff073b54 Fixed project's formatting 2022-02-02 00:26:46 +01:00
Abdelilah El Aissaoui
6142ecef5b Added option to delete file in uncommited changes context menu 2022-02-02 00:23:31 +01:00
Abdelilah El Aissaoui
171e9dc0be Added force push 2022-02-01 14:31:56 +01:00
Abdelilah El Aissaoui
de9e982ff3 Added pull with rebase 2022-02-01 14:18:59 +01:00
Abdelilah El Aissaoui
0091f3abb8 Fixed error dialog font color 2022-02-01 12:52:56 +01:00
Abdelilah El Aissaoui
6ca1e15ce8 UI improvements 2022-01-31 15:15:05 +01:00
Abdelilah El Aissaoui
d3c1664f45 Added repository directory in file explorer button 2022-01-31 14:36:14 +01:00
Abdelilah El Aissaoui
234e04192b Removed unused logs 2022-01-31 14:28:56 +01:00
Abdelilah El Aissaoui
fe718fdfec Fixed errors not being displayed 2022-01-31 14:17:54 +01:00
Abdelilah El Aissaoui
0f484a9b26 Changed tabs design to use different colors and fixed width 2022-01-31 01:55:56 +01:00
Abdelilah El Aissaoui
42fec7c591 Implemented merge & rebase 2022-01-31 01:30:25 +01:00
Abdelilah El Aissaoui
ef5bd9a254 Completed images & binaries diff 2022-01-30 02:27:41 +01:00
Abdelilah El Aissaoui
27f216aa5d Added basic images diff 2022-01-29 20:33:08 +01:00
Abdelilah El Aissaoui
57e428a9e8 Disabled softwarp for branches and uncommited changes 2022-01-23 17:16:28 +01:00
Abdelilah El Aissaoui
d14c13595c Improved diff design 2022-01-19 01:06:10 +01:00
Abdelilah El Aissaoui
5bd15a0c22 Adjusted UI font size 2022-01-19 00:57:08 +01:00
Abdelilah El Aissaoui
1508e27b13 Fixed warnings and removed unused code 2022-01-05 03:19:52 +01:00
Abdelilah El Aissaoui
7c0316b2d3 Reduced diff header size 2022-01-05 02:58:57 +01:00
Abdelilah El Aissaoui
1ed6572170 Added lines numbers in diff view 2022-01-05 02:52:32 +01:00
Abdelilah El Aissaoui
f20cfbb698 Fixed tabs not selecting/creating the next tab properly 2022-01-05 01:51:08 +01:00
Abdelilah El Aissaoui
9271dcdd60 Added file path to the diff view 2022-01-04 22:04:10 +01:00
Abdelilah El Aissaoui
14c8b24456 Changed "Stage" to "Stage hunk" in diff hunks 2022-01-04 20:01:36 +01:00
Abdelilah El Aissaoui
97a082bc47 Completed arch refactor 2022-01-04 19:54:56 +01:00
Abdelilah El Aissaoui
e7de563b28 Fixed adding a new tab crashing 2022-01-04 17:53:31 +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
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
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
a8ed01784d Implemented stage/unstage by hunks 2021-12-28 01:19:29 +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
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
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