Skip to content

Commit f75c1d7

Browse files
Merge branch 'website_docs_dev' into rename_ws_docs
# Conflicts: # docs/StardustDocs/topics/_shadow_resources.md # tests/build.gradle.kts
2 parents 61ca64f + 587f789 commit f75c1d7

25 files changed

+1115
-14
lines changed

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/explainer/SamplesRenderingUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ allObservedTables.forEach((table) => {
9696
characterData: true,
9797
});
9898
});
99-
""".trimIndent()
99+
""".trimIndent(),
100100
)
101101

102102
val WritersideFooter: (DataFrame<*>) -> String = { "" }

docs/StardustDocs/cfg/platforms.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<platforms>
3+
<platform id="primary">
4+
<src>keymap.xml</src>
5+
<use-keymaps>
6+
primary_macOS
7+
</use-keymaps>
8+
<use-keymaps>
9+
primary_Win-Linux
10+
</use-keymaps>
11+
</platform>
12+
</platforms>

docs/StardustDocs/d.tree

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
<toc-element topic="Home.topic"/>
1010
<toc-element topic="Guides-And-Examples.md">
1111
<toc-element topic="quickstart.md"/>
12+
<toc-element topic="Kotlin-DataFrame-Features-in-Kotlin-Notebook.md">
13+
<toc-element topic="Trobleshooting.md"/>
14+
</toc-element>
1215
</toc-element>
1316

1417
<toc-element topic="gettingStarted.md" accepts-web-file-names="installation.html">
@@ -193,9 +196,7 @@
193196
</toc-element>
194197
</toc-element>
195198
<toc-element topic="gradleReference.md"/>
196-
<toc-element topic="Usage-with-Kotlin-Notebook-Plugin.md">
197-
<toc-element topic="Trobleshooting.md"/>
198-
</toc-element>
199199
<toc-element topic="Compiler-Plugin.md"/>
200+
<toc-element topic="DataSchema-Data-Classes-Generation.md"/>
200201
<toc-element topic="_shadow_resources.md" hidden="true"/>
201202
</instance-profile>
45.4 KB
Loading
45.5 KB
Loading
253 KB
Loading
236 KB
Loading
359 KB
Binary file not shown.

docs/StardustDocs/keymap.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Keymap id="instance_id">
3+
<Action id="$Settings">
4+
<Description>Settings of Intellij IDEA</Description>
5+
<Shortcut layout="primary_macOS">Cmd+comma</Shortcut>
6+
<Shortcut layout="primary_Win-Linux">Ctrl+Alt+S</Shortcut>
7+
</Action>
8+
<Action id="$NewFile">
9+
<Description>Settings of Intellij IDEA</Description>
10+
<Shortcut layout="primary_macOS">Cmd+N</Shortcut>
11+
<Shortcut layout="primary_Win-Linux">Alt+Insert</Shortcut>
12+
</Action>
13+
</Keymap>

0 commit comments

Comments
 (0)