Commit 01adbe5
Merge branch 'main' into ksinder/main
Resolved conflicts in ToolsTab.tsx by combining:
- Error alert display from main
- Description styling improvements from PR #823 (whitespace-pre-wrap, max-h-48, overflow-y-auto)
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <[email protected]>File tree
24 files changed
+1763
-606
lines changed- client
- src
- components
- __tests__
- ui
- lib
- hooks
- __tests__
- utils
- __tests__
- cli
- src
- server
24 files changed
+1763
-606
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
3 | 4 | | |
4 | 5 | | |
5 | 6 | | |
| |||
99 | 100 | | |
100 | 101 | | |
101 | 102 | | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
102 | 112 | | |
103 | 113 | | |
104 | 114 | | |
105 | 115 | | |
106 | 116 | | |
107 | 117 | | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
112 | 124 | | |
113 | 125 | | |
114 | 126 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
| 26 | + | |
25 | 27 | | |
26 | 28 | | |
27 | 29 | | |
| |||
162 | 164 | | |
163 | 165 | | |
164 | 166 | | |
165 | | - | |
| 167 | + | |
166 | 168 | | |
167 | 169 | | |
168 | 170 | | |
169 | 171 | | |
170 | | - | |
| 172 | + | |
171 | 173 | | |
172 | 174 | | |
173 | 175 | | |
| |||
777 | 779 | | |
778 | 780 | | |
779 | 781 | | |
| 782 | + | |
| 783 | + | |
| 784 | + | |
| 785 | + | |
| 786 | + | |
| 787 | + | |
780 | 788 | | |
781 | 789 | | |
782 | 790 | | |
783 | 791 | | |
784 | 792 | | |
785 | | - | |
| 793 | + | |
786 | 794 | | |
787 | 795 | | |
788 | 796 | | |
| |||
793 | 801 | | |
794 | 802 | | |
795 | 803 | | |
| 804 | + | |
| 805 | + | |
796 | 806 | | |
797 | 807 | | |
798 | 808 | | |
| |||
804 | 814 | | |
805 | 815 | | |
806 | 816 | | |
| 817 | + | |
| 818 | + | |
807 | 819 | | |
808 | 820 | | |
809 | 821 | | |
| |||
0 commit comments