Commit 775cf26
committed
Merge remote-tracking branch 'origin/main' into sdn-server-refactor-ui
# Conflicts:
# kubo/plugin/plugins/sdnruntime/sdnruntime.go
# kubo/plugin/plugins/sdnruntime/sdnruntime_test.go
# kubo/sdn/build/release/Dockerfile.linux
# kubo/sdn/build/release/build-release.sh
# kubo/sdn/flowrt/abi_test.go
# kubo/sdn/flowrt/flatsql_query_test.go
# kubo/sdn/flowrt/flatsql_store_link.go
# kubo/sdn/flowrt/flatsql_store_link_test.go
# kubo/sdn/flowrt/runtime.go
# kubo/sdn/modulert/hostbridge.go
# kubo/sdn/modulert/hostbridge_test.go
# kubo/sdn/modulert/module.go
# kubo/sdn/modulert/publication_signature.go
# kubo/sdn/modulert/publication_signature_test.go
# kubo/sdn/sdnflows/installer.go
# kubo/sdn/sdnflows/isomorphic_installer_test.go
# kubo/sdn/sdnservices/opaque_state.go
# kubo/sdn/sdnservices/opaque_state_test.go
# kubo/sdn/sdnservices/sdnservices.go
# sdn-server/cmd/spacedatanetwork/apps_ui.go
# sdn-server/cmd/spacedatanetwork/apps_ui_test.go
# sdn-server/cmd/spacedatanetwork/conjunction_ui.go
# sdn-server/cmd/spacedatanetwork/conjunction_ui_test.go
# sdn-server/cmd/spacedatanetwork/embedded/conjunction_app.html
# sdn-server/cmd/spacedatanetwork/embedded/spaceaware_app.html
# sdn-server/cmd/spacedatanetwork/main.go123 files changed
Lines changed: 7216 additions & 10995 deletions
File tree
- deployment
- scripts
- spaceaware
- fixtures
- docs
- kubo
- plugin/plugins/sdnruntime
- sdn
- flowrt
- modulert
- sdnflows
- sdnservices
- scripts
- sdn-js
- scripts
- src
- crypto
- types
- ui
- runtime
- upstream-webui
- ui
- shims
- src
- components
- lib
- auth
- screens
- spaceaware
- lib
- screens
- upstream-webui/overrides
- verification/c1
- sdn-server
- cmd/spacedatanetwork
- embedded
- internal
- auth
- versioninfo
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
44 | 45 | | |
45 | | - | |
46 | | - | |
| 46 | + | |
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| 31 | + | |
| 32 | + | |
31 | 33 | | |
32 | 34 | | |
33 | 35 | | |
| |||
209 | 211 | | |
210 | 212 | | |
211 | 213 | | |
212 | | - | |
| 214 | + | |
213 | 215 | | |
214 | | - | |
215 | 216 | | |
216 | | - | |
| 217 | + | |
217 | 218 | | |
218 | 219 | | |
219 | 220 | | |
220 | | - | |
221 | | - | |
222 | | - | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
223 | 252 | | |
224 | | - | |
225 | | - | |
226 | | - | |
227 | | - | |
228 | | - | |
229 | | - | |
230 | | - | |
231 | | - | |
232 | | - | |
233 | | - | |
234 | | - | |
235 | | - | |
236 | | - | |
237 | | - | |
238 | | - | |
239 | | - | |
240 | | - | |
241 | | - | |
242 | | - | |
243 | | - | |
244 | | - | |
245 | | - | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
246 | 275 | | |
247 | 276 | | |
248 | 277 | | |
| |||
483 | 512 | | |
484 | 513 | | |
485 | 514 | | |
486 | | - | |
| 515 | + | |
487 | 516 | | |
488 | 517 | | |
489 | 518 | | |
| |||
596 | 625 | | |
597 | 626 | | |
598 | 627 | | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
| 631 | + | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
| 653 | + | |
| 654 | + | |
| 655 | + | |
599 | 656 | | |
600 | 657 | | |
601 | 658 | | |
| |||
613 | 670 | | |
614 | 671 | | |
615 | 672 | | |
616 | | - | |
| 673 | + | |
617 | 674 | | |
618 | 675 | | |
619 | 676 | | |
| |||
630 | 687 | | |
631 | 688 | | |
632 | 689 | | |
| 690 | + | |
| 691 | + | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
633 | 697 | | |
634 | 698 | | |
635 | 699 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
10 | 70 | | |
11 | 71 | | |
12 | 72 | | |
| |||
17 | 77 | | |
18 | 78 | | |
19 | 79 | | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
20 | 95 | | |
21 | 96 | | |
22 | 97 | | |
| |||
40 | 115 | | |
41 | 116 | | |
42 | 117 | | |
| 118 | + | |
| 119 | + | |
43 | 120 | | |
44 | 121 | | |
45 | 122 | | |
| |||
Lines changed: 56 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
0 commit comments