Commit Graph

240 Commits

Author SHA1 Message Date
Abdelilah El Aissaoui
fb8e41dfff Fixed lines in diff being cut when overflowing 2022-04-08 20:22:04 +02:00
Abdelilah El Aissaoui
c20021832f Fixed graph size not being recalculated after changing uncommited changes status 2022-04-07 22:44:34 +02:00
Abdelilah El Aissaoui
1baab9e3f8 Fixed clone state being lost on error & multiple errros not being reported
Also updated errors strings to better clarify the issue
2022-04-07 18:41:53 +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
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
60a6fb1a3e Fixed file name not being completly displayed when it's in the root of the dir for commited changes 2022-04-04 21:00:17 +02:00
Abdelilah El Aissaoui
f1868844a2 Extracted project name as a constant 2022-04-04 18:32:56 +02:00
Abdelilah El Aissaoui
27e8efcaf7 Added additional info dialog 2022-04-04 18:32:06 +02:00
Abdelilah El Aissaoui
61d5ee941a Fixed file name not being completly displayed when it's in the root of the dir 2022-04-04 05:05:50 +02:00
Abdelilah El Aissaoui
dac6d597a2 Fixed date being moved if the message is too long 2022-04-04 03:00:51 +02:00
Abdelilah El Aissaoui
b980784b1f Changed secondary color & reorganized welcome/home screen 2022-04-04 02:58:51 +02:00
Abdelilah El Aissaoui
8f92b6d195 Added updates check 2022-04-04 02:48:40 +02:00
Abdelilah El Aissaoui
c1fdd891c6 Added clone progress and changed clone button to PrimaryButton 2022-04-03 19:43:54 +02:00
Abdelilah El Aissaoui
e2449db568 Added padding at the end of the graph to avoid the last line being partially covered by the horizontal scrollbar of the graph 2022-04-03 19:22:45 +02:00
Abdelilah El Aissaoui
154ab89a21 Changed old style buttons to the new one 2022-04-03 01:29:18 +02:00
Abdelilah El Aissaoui
d662edba9d Improved clone dialog features by adding more error management & directory picker 2022-04-03 01:16:55 +02:00
Abdelilah El Aissaoui
59a36fed08 Graph now shows properly the HEAD commits when rebasing & commits referenced by unpeeled tags 2022-04-02 04:03:01 +02:00
Abdelilah El Aissaoui
457d604575 Removed unnecessary parameters from callbacks 2022-04-02 00:36:09 +02:00
Abdelilah El Aissaoui
5ab529e22b Updated repo URLs 2022-04-02 00:35:33 +02:00
Abdelilah El Aissaoui
558f02fca4 Implemented basic local git init 2022-04-01 05:42:44 +02:00
Abdelilah El Aissaoui
54a1ab4436 Added loading screen when opening a repository 2022-04-01 05:00:06 +02:00
Abdelilah El Aissaoui
a32f4d5ccd Fixed text not being cleared after commit 2022-03-31 20:40:25 +02:00
Abdelilah El Aissaoui
054778bdcc Implemented graph search
Fixed bug where deleting text input value too fast (keeping pressed backspace) would not behave properly
2022-03-31 20:39:25 +02:00
Abdelilah El Aissaoui
2466dd7a33 File picker styling is only applied in windows/macOs now 2022-03-04 14:53:49 +01:00
Abdelilah El Aissaoui
3352444371 Disabled the option to stage/unstage hunks when the repository is not in a safe state 2022-03-03 20:27:11 +01:00
Abdelilah El Aissaoui
bbea356eb2 Added missing horizontal padding to commited changes files icon 2022-02-25 00:41:03 +01:00
Abdelilah El Aissaoui
41ff6a57b8 Improved display of branches' names in branch context menu 2022-02-24 23:07:28 +01:00
Abdelilah El Aissaoui
dd56ccf2fc Now uncommited changes shows which diff entry has been clicked
Also refactored selected index from commit changes to use the same logic as uncommited changes
2022-02-24 15:41:10 +01:00
Abdelilah El Aissaoui
970132f1d7 File name is always shown in the changes log to cut the dir path 2022-02-24 14:51:12 +01:00
Abdelilah El Aissaoui
250ca295b9 Added option to pull/push from specific branch 2022-02-24 14:25:15 +01:00
Abdelilah El Aissaoui
b8e76aa7a8 Added push including tags option 2022-02-23 02:19:11 +01:00
Abdelilah El Aissaoui
8d00141df2 Improved settings dialog UI 2022-02-21 16:03:36 +01:00
Abdelilah El Aissaoui
84d986587d Reduced status sumary font size + fixed typo 2022-02-21 15:19:45 +01:00
Abdelilah El Aissaoui
4ed10c0682 Reformated project's code 2022-02-21 01:49:14 +01:00
Abdelilah El Aissaoui
fb377b9554 Changed graph border width and corner shape 2022-02-18 15:30:46 +01:00
Abdelilah El Aissaoui
82d9479e55 Changed multiple elements colors
Button and log border
2022-02-18 15:03:52 +01:00
Abdelilah El Aissaoui
7a86ed8227 Changed abort button colors 2022-02-18 12:30:30 +01:00
Abdelilah El Aissaoui
32ef5d50cd Fixed crash when commits list is empty 2022-02-17 23:18:51 +01:00
Abdelilah El Aissaoui
f314dc2c26 Limited tab title lines to 1 2022-02-17 23:18:51 +01:00
Abdelilah El Aissaoui
afce2a2aa7 Added basic remotes management 2022-02-17 19:24:36 +01:00
Abdelilah El Aissaoui
0ff882a31c Added native look and file for system dialogs 2022-02-11 20:55:10 +01:00
Abdelilah El Aissaoui
587843d246 Changed how the diff list is created to improve scrollbar's behavior (used to change its size depending on the scroll position ???) 2022-02-11 20:47:20 +01:00
Abdelilah El Aissaoui
c374ac77d5 Fixed weird spacing when using fonts with different heights in lines with empty text in the diff 2022-02-11 20:34:13 +01:00
Abdelilah El Aissaoui
a3f233d363 Added option to refresh repository 2022-02-10 00:46:26 +01:00
Abdelilah El Aissaoui
2a12c3e883 Changed scrollbar color scheme to make it more visible 2022-02-07 22:04:06 +01:00
Abdelilah El Aissaoui
e54ba6d8a0 Log code cleanup and added more comments 2022-02-07 20:39:30 +01:00
Abdelilah El Aissaoui
759d30014b Fixed context menu not working when clicking on the graph 2022-02-07 15:37:14 +01:00
Abdelilah El Aissaoui
7e86e3b2fd Reimplemented log view. Now graph can be horizontally scrolled 2022-02-07 15:34:21 +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
72e77f41fd Implemented cherry-pick 2022-02-05 19:19:49 +01:00
Abdelilah El Aissaoui
ac21b59f6c Implemented amend previous commit 2022-02-05 03:01:03 +01:00
Abdelilah El Aissaoui
e473d29167 Reformated project's code 2022-02-05 02:55:26 +01:00
Abdelilah El Aissaoui
df48b40ce5 Refactored safeProcessing to be able to refresh data even after a crash 2022-02-05 02:06:55 +01:00
Abdelilah El Aissaoui
857032ec04 Remote branches in side panel is shown now without the remote name 2022-02-05 01:35:21 +01:00
Abdelilah El Aissaoui
cc787064b6 Clicking on a remote now colpases it
Removed animations from expandable to improve performance in big lists
2022-02-05 01:28:48 +01:00
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