Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
322 Commits 5 Branches 15 Tags 13 MiB
b980784b1f
Commit Graph

283 Commits

Author SHA1 Message Date
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
cb609c44cc Removed unused annotation 2022-02-05 03:12:20 +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
9105940e00 Push deletion is done before doing it locally to prevent deleting the local branch in case of error 2022-02-05 01:35:44 +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
7dc2ad0a72 All the tab is refreshed now after a push 2022-02-04 18:54:03 +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
13684e4f90 Fixed file delete not deleting the file using the repo path 2022-02-02 20:23:04 +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
2efaf654c7 Added webp support 2022-02-01 19:46:17 +01:00
Abdelilah El Aissaoui
171e9dc0be Added force push 2022-02-01 14:31:56 +01:00
Abdelilah El Aissaoui
c746f845ee Fixed tags not being properly detected as tags in the graph 2022-02-01 14:29:18 +01:00
Abdelilah El Aissaoui
de9e982ff3 Added pull with rebase 2022-02-01 14:18:59 +01:00
Abdelilah El Aissaoui
a4ce691679 Fixed push not showing errors 2022-02-01 12:52:56 +01:00
Abdelilah El Aissaoui
0091f3abb8 Fixed error dialog font color 2022-02-01 12:52:56 +01:00
Abdelilah El Aissaoui
edbb095246 Added try catch to dir opening to avoid crash if the dir has been removed 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
2354602e6d Selected branch is the first one always now 2022-01-31 02:02:11 +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
934413557d Remove unused class 2022-01-06 17:15:53 +01:00
Abdelilah El Aissaoui
1508e27b13 Fixed warnings and removed unused code 2022-01-05 03:19:52 +01:00
Abdelilah El Aissaoui
61c4abda5c Updated dependencies and removed unused dep 2022-01-05 03:17:51 +01:00
Abdelilah El Aissaoui
1d2ad6f947 Fixed crash when trying to diff binary files 2022-01-05 03:02:36 +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
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
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
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