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

305 Commits

Author SHA1 Message Date
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
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
Abdelilah El Aissaoui
ed55ba2814 Added full date-time tooltip 2021-12-06 23:02:14 +01:00
Abdelilah El Aissaoui
e23181d530 Removed completly dialog manager 2021-12-06 22:54:25 +01:00
Abdelilah El Aissaoui
3c3b044c80 Changed author info to show commit id instead of mail 
E-mail is shown as a tooltip of the username
 2021-12-06 22:47:09 +01:00
Abdelilah El Aissaoui
2a8794d62d Disabled commit with ctrl+enter if commtis conditions are not met 2021-12-04 06:53:13 +01:00
Abdelilah El Aissaoui
7b1a79e2cf Fixed commit msg not cleared after commit 2021-12-04 06:50:41 +01:00
Abdelilah El Aissaoui
d099c94fcf Fixed credentials dialogs not showing as MaterialDialogs 2021-12-04 06:48:28 +01:00
Abdelilah El Aissaoui
7436eb80cf Added ctrl+enter to commit in commit's msg field 2021-12-04 06:46:22 +01:00
Abdelilah El Aissaoui
c5372e074a Fixed build error 2021-12-04 06:35:35 +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
Abdelilah El Aissaoui
f9a2917bbd Improved dialog background code 2021-12-04 04:24:59 +01:00
Abdelilah El Aissaoui
5f4762691c Fixed branch dialog not showing as a material dialog 2021-12-02 22:49:35 +01:00
Abdelilah El Aissaoui
9f67f91a77 Started removal of dialog manager in favor of new MaterialDialog component 2021-12-02 22:45:41 +01:00
Abdelilah El Aissaoui
8a7e8c470e Fixed clone not asking http credentials 2021-12-02 22:45:26 +01:00
Abdelilah El Aissaoui
2b479d1d3f Added popupPositionProvider to MaterialDialog 2021-12-02 01:55:04 +01:00
Abdelilah El Aissaoui
b518c5007e Added avatar caching 2021-12-02 01:50:59 +01:00
Abdelilah El Aissaoui
f5ab2b0881 Added basic clone implementation 
Also fixed crash when selecting non-existant file to diff
 2021-11-29 18:50:39 +01:00
Abdelilah El Aissaoui
d8f1bcb8bf Changed current branch design in left branches panel 2021-11-28 06:44:50 +01:00
Abdelilah El Aissaoui
849aeb17cc Now whole repository tab refreshes when deleting a branch 2021-11-28 06:09:49 +01:00
Abdelilah El Aissaoui
26682daa96 Added comments & improved logs 2021-11-28 03:35:28 +01:00
Abdelilah El Aissaoui
239d004b84 Added git manager scope cancellation on disposal of the tab 2021-11-28 03:30:30 +01:00
Abdelilah El Aissaoui
5ab88ecce0 Made safeGit private 2021-11-28 03:15:49 +01:00
Abdelilah El Aissaoui
ca3a55ce21 Added status update when file system changes (excluding ignored dirs) 2021-11-28 03:15:18 +01:00
Abdelilah El Aissaoui
4abd9e331d Added support for local branch deletion 2021-11-27 20:22:05 +01:00
Abdelilah El Aissaoui
fc0fc8c448 Added enter support for input dialogs 2021-11-27 07:16:26 +01:00
Abdelilah El Aissaoui
619083f829 Changed tabs background color 2021-11-27 07:02:56 +01:00
Abdelilah El Aissaoui
af09479fcf Changed menu design 2021-11-26 06:34:49 +01:00
Abdelilah El Aissaoui
a89317305e Changed log to use the new design 2021-11-26 05:32:14 +01:00
Abdelilah El Aissaoui
b394d9f33b Changed commited and uncommited changes to use new design 2021-11-26 05:24:14 +01:00
Abdelilah El Aissaoui
317947cee7 Moved to compose 1.0.0-rc4 2021-11-26 05:13:56 +01:00
Abdelilah El Aissaoui
ee010b1f55 Removed log card 2021-11-22 03:39:53 +01:00
Abdelilah El Aissaoui
2ec3815abf Added split pane support 2021-11-22 03:38:16 +01:00
Abdelilah El Aissaoui
c4afb9e457 Added new possible color scheme 2021-11-19 20:08:35 +01:00
Abdelilah El Aissaoui
03201972e7 Checking out a remote branch create now a local branch with the same name 2021-11-19 03:36:23 +01:00
Abdelilah El Aissaoui
4e15fabf75 Fixed release build 2021-11-19 03:09:09 +01:00
Abdelilah El Aissaoui
713fba6ab9 Started side menu desgin change and added tags support 2021-11-18 02:01:17 +01:00
Abdelilah El Aissaoui
3dd9b4a2cd Replaced drawn in canvas commit node by box composable 2021-11-17 05:23:32 +01:00
Abdelilah El Aissaoui
9322691565 Reduced click effect area to the chip shape 2021-11-17 04:42:35 +01:00
Abdelilah El Aissaoui
1056e60f96 Changed log commits design 2021-11-13 00:07:31 +01:00
Abdelilah El Aissaoui
61464a02ba Fixed welcome page on dark theme 2021-11-12 23:54:52 +01:00
Abdelilah El Aissaoui
58da603bbf Moved gitManager code to Log 2021-11-12 23:54:46 +01:00
Abdelilah El Aissaoui
fce9f93df4 Added diff closing to show the log after commiting 2021-11-05 04:33:07 +01:00
Abdelilah El Aissaoui
d3633151f7 More cleanup 2021-11-05 04:32:31 +01:00
Abdelilah El Aissaoui
e9bf65e854 Code cleanup 2021-11-05 04:29:33 +01:00
Abdelilah El Aissaoui
da3f3c8935 Added password for ssh keys 2021-11-05 04:27:35 +01:00
Abdelilah El Aissaoui
b63614d68d Fixed uncommited changes parent node lane position 2021-10-30 19:38:11 +02:00
Abdelilah El Aissaoui
ba4c9596f8 Changed zenity dialog name 2021-10-30 19:11:37 +02:00
Abdelilah El Aissaoui
73659a2a10 Added support for zenity dialogs in linux 2021-10-30 19:06:03 +02:00
Abdelilah El Aissaoui
4a6542abcd Fixed previous commits of uncommited changes not showing in the same column 2021-10-28 17:03:06 +02:00
Abdelilah El Aissaoui
7c2029d602 Improved merge dialog UI 2021-10-28 04:28:50 +02:00
Abdelilah El Aissaoui
67f1135b85 Added reset branch feature 2021-10-28 04:28:37 +02:00
Abdelilah El Aissaoui
cc1f6b3cd5 Added bottom padding to error message 2021-10-28 04:04:32 +02:00
Abdelilah El Aissaoui
61f0c00290 Fixed graph not updating properly when switching branches 2021-10-28 04:04:19 +02:00
Abdelilah El Aissaoui
71bf75ceca Added merge feature 2021-10-27 20:41:05 +02:00
Abdelilah El Aissaoui
d60b1a14a2 Added revert commit feature 2021-10-27 03:57:15 +02:00
Abdelilah El Aissaoui
a7d89aabaf Fixed context menu not showing up in branches/tags 2021-10-27 03:52:21 +02:00
Abdelilah El Aissaoui
d4d057c291 Added context menu to branches/tags & moved code to their correct managers 2021-10-27 03:45:22 +02:00
Abdelilah El Aissaoui
414bce560f Added context menu to log and added tag creation 2021-10-27 03:23:06 +02:00
Abdelilah El Aissaoui
cafe8f1b19 Removed unnecessary comment 2021-10-27 02:53:40 +02:00
Abdelilah El Aissaoui
1116a093c7 Migrated project to compose-jb beta 3 2021-10-27 02:38:31 +02:00
Abdelilah El Aissaoui
40fe4c694f Added basic implementation of error manager 2021-10-26 18:59:52 +02:00
Abdelilah El Aissaoui
469fe530ee Log updates after creating a new branch 2021-10-26 03:25:48 +02:00
Abdelilah El Aissaoui
c465b89b61 Added field focus when opening branch and credentials dialogs 2021-10-26 03:25:27 +02:00
Abdelilah El Aissaoui
e6cd822b17 Created custom dialog UI 2021-10-25 02:26:58 +02:00
Abdelilah El Aissaoui
e718f10b60 Added new branch dialog 2021-10-25 02:01:53 +02:00
Abdelilah El Aissaoui
a4f0820857 Moved credentials dialog to a different file 2021-10-21 23:55:08 +02:00
Abdelilah El Aissaoui
d27161eb98 Added non-functional settings button 2021-10-21 01:37:15 +02:00
Abdelilah El Aissaoui
cd592292d1 Improved welcome/new tab page 2021-10-16 03:39:59 +02:00
Abdelilah El Aissaoui
cc2a7e180f Log is now updated if uncommited changes status changed 2021-10-15 14:10:59 +02:00
Abdelilah El Aissaoui
eef36cf53c Fixed credentials dialog string 2021-10-15 03:15:04 +02:00
Abdelilah El Aissaoui
a719c2355a Fixed refs not updating after a log change 2021-10-15 03:09:21 +02:00
Abdelilah El Aissaoui
0547c2fe9a Changed max commits loaded in the log to 1000 2021-10-15 03:02:57 +02:00
Abdelilah El Aissaoui
8b325b117a Added progress loading animation 2021-10-15 03:01:24 +02:00
Abdelilah El Aissaoui
894138b39f Renamed Gitnuro composable to App 2021-10-15 02:38:36 +02:00