github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-09-26 13:04:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
789 Commits 89 Branches 954 Tags
4a76c17dda29b51bcd19ddcc4f32da556390de7d
Commit Graph

789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amit Fainholts
4a76c17dda merge with user mange 2022-02-01 14:48:23 +02:00
Leon
ef9af937c3 revert trafic page 2022-02-01 14:45:12 +02:00
Leon
2f9bd203d3 changes 2022-02-01 14:41:23 +02:00
Amit Fainholts
5e1000aa85 select list bug fixed 2022-02-01 14:03:36 +02:00
Leon
ba49f7c1d5 changes 2022-01-31 20:15:31 +02:00
Amit Fainholts
071ec955f5 Merge branch 'origin/ui/TRA-4204_user_managment' of github.com:up9inc/mizu into feature/ui/TRA-4192_workspace_management 
# Conflicts:
#	ui/src/components/Modals/AddUserModal/AddUserModal.tsx
#	ui/src/helpers/api.js
 2022-01-31 18:11:01 +02:00
Amit Fainholts
0705f13295 tapping settings modal added to first login 2022-01-31 18:09:20 +02:00
Amit Fainholts
19f7bea194 endpoints added 2022-01-31 16:32:41 +02:00
Leon
1a7e4a90c9 changes 2022-01-31 15:33:00 +02:00
Amit Fainholts
0824dcb817 addworkspaceModal and selctList updated 2022-01-30 18:56:33 +02:00
Leon
b89820fe86 changes 2022-01-30 12:08:52 +02:00
Amit Fainholts
16a4708aec Merge branch 'origin/ui/TRA-4204_user_managment' of github.com:up9inc/mizu into feature/ui/TRA-4192_workspace_management 
# Conflicts:
#	ui/src/components/UI/SelectList.tsx
 2022-01-30 11:40:34 +02:00
Amit Fainholts
f4d651812f commit to enable merge 2022-01-30 11:37:53 +02:00
Leon
4a69526829 changes 2022-01-30 11:34:57 +02:00
Amit Fainholts
4e1e552044 Merge branch 'origin/ui/TRA-4204_user_managment' of github.com:up9inc/mizu into feature/ui/TRA-4192_workspace_management 2022-01-27 15:01:05 +02:00
Amit Fainholts
889fa7881c select list changes 2022-01-27 15:00:24 +02:00
Leon
0633df4c63 delete user 2022-01-27 14:57:38 +02:00
Leon
6e3ba55d7f Merge remote-tracking branch 'origin/feature/ui/TRA-4192_workspace_management' into origin/ui/TRA-4204_user_managment 2022-01-27 11:59:21 +02:00
Leon
4baec11a82 field name change 2022-01-27 11:59:11 +02:00
Amit Fainholts
462bf72632 merge fixes 2022-01-27 11:47:26 +02:00
Amit Fainholts
5bd40a6581 Merge branch 'origin/ui/TRA-4204_user_managment' of github.com:up9inc/mizu into feature/ui/TRA-4192_workspace_management 
# Conflicts:
#	ui/src/components/Modals/AddUserModal/AddUserModal.tsx
#	ui/src/components/UserSettings/UserSettings.tsx
 2022-01-27 11:45:29 +02:00
Amit Fainholts
5aa16eaf56 selectList supports array of objects instead of object 2022-01-27 11:40:38 +02:00
Leon
9c45d63237 changes 2022-01-27 11:30:48 +02:00
Amit Fainholts
b73bb69491 edit mode added 2022-01-26 20:31:04 +02:00
Amit Fainholts
e39641f59a Merge branch 'origin/ui/TRA-4204_user_managment' of github.com:up9inc/mizu into feature/ui/TRA-4192_workspace_management 
# Conflicts:
#	ui/src/components/Modals/AddUserModal/AddUserModal.tsx
#	ui/src/components/UserSettings/UserSettings.tsx
 2022-01-26 19:10:50 +02:00
Amit Fainholts
83d8f2d232 dealing with warnings 2022-01-26 19:09:16 +02:00
Leon
d7a0f5ff6f genarate link button 2022-01-26 18:48:21 +02:00
Amit Fainholts
2426f57388 Merge branch 'origin/ui/TRA-4204_user_managment' of github.com:up9inc/mizu into feature/ui/TRA-4192_workspace_management 
# Conflicts:
#	ui/src/components/Modals/AddUserModal/AddUserModal.sass
 2022-01-26 14:52:28 +02:00
Leon
84e5820f4f changes 2022-01-26 14:51:57 +02:00
Amit Fainholts
eeda33ac5e styling added to addworkspacemodal 2022-01-26 14:49:21 +02:00
Leon
1cfc896c10 changes 2022-01-26 13:18:51 +02:00
Amit Fainholts
557c77cd04 close function added to addworkspacemodal 2022-01-26 12:05:06 +02:00
Amit Fainholts
7983869e76 Merge branch 'origin/ui/TRA-4204_user_managment' of github.com:up9inc/mizu into feature/ui/TRA-4192_workspace_management 
# Conflicts:
#	ui/src/components/Modals/AddUserModal/AddUserModal.sass
#	ui/src/components/Modals/AddUserModal/AddUserModal.tsx
#	ui/src/components/UI/SelectList.tsx
 2022-01-26 11:58:26 +02:00
Amit Fainholts
e108fb542c addworkspace modal added 2022-01-26 11:56:53 +02:00
Leon
ffa040d705 change 2022-01-26 11:54:05 +02:00
Leon
2f34ce5a04 changes 2022-01-26 10:58:34 +02:00
Amit Fainholts
9c174b9f1a Merge branch 'origin/ui/TRA-4204_user_managment' of github.com:up9inc/mizu into feature/ui/TRA-4192_workspace_management 2022-01-25 18:43:02 +02:00
Leon
6c88b0ef46 workspace + user settings 2022-01-25 17:51:07 +02:00
Amit Fainholts
5850a250fe Radio buttons added to selectList with single select 2022-01-25 14:29:45 +02:00
Leon
e392bbd279 Merge remote-tracking branch 'origin/feature/ui/TRA-4192_workspace_management' into origin/ui/TRA-4204_user_managment 2022-01-25 12:26:07 +02:00
Amit Fainholts
5d6f53409c added settings page 2022-01-25 12:15:32 +02:00
Leon
64316046cd Merge remote-tracking branch 'origin/develop' into origin/ui/TRA-4204_user_managment 2022-01-25 12:01:26 +02:00
Amit Fainholts
5d7cf230c8 Merge branch 'develop' of github.com:up9inc/mizu into feature/ui/TRA-4192_workspace_management 
# Conflicts:
#	ui/src/components/Header/EntHeader.tsx
 2022-01-25 11:59:53 +02:00
Leon
726db15aa8 Add userSettings 2022-01-25 11:57:18 +02:00
Amit Fainholts
1644930516 remove new basicTabs 2022-01-25 11:50:12 +02:00
Gustavo Massaneiro
e30b52f528 [TRA-4190] ExecutionTime telemetry (#685) 0.22.35 2022-01-25 11:13:49 +02:00
lirazyehezkel
80418f1802 TRA-4205 React router (#684) 
* React router

* removed comment
0.22.34 		2022-01-25 10:45:07 +02:00
Amit Fainholts
da9bbd848e basic tabs component added 2022-01-25 10:05:25 +02:00
Gustavo Massaneiro
85edd6e5b0 updated debug.Dockerfile with the latest changes for the ui split build (#691) 0.22.31 2022-01-24 13:52:09 -03:00
RoyUP9
3067bf5eaf Fixed ui split (#690) 0.22.30 2022-01-24 18:11:45 +02:00