Merge dev-1.1 into main. #11

Closed
LukeGus wants to merge 71 commits from main into dev-1.1
pull from: main
5 changed files with 18 additions and 17 deletions
Showing only changes of commit f677a54551 - Show all commits

No files matched your search

+16 -15
View File
@@ -4,9 +4,10 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="8497df64-d86b-4c98-ac58-c157d9d3fb1e" name="Changes" comment="Release 1.0!!!!">
<list default="true" id="8497df64-d86b-4c98-ac58-c157d9d3fb1e" name="Changes" comment="Update README.md #4">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TermixLogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/repo-images/TermixLogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/info.txt" beforeDir="false" afterPath="$PROJECT_DIR$/info.txt" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
@@ -17,7 +18,7 @@
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="alpha-1.0" />
<entry key="$PROJECT_DIR$" value="release-1.0" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -101,8 +102,8 @@
<method v="2" />
</configuration>
<list>
<item itemvalue="Shell Script.run_backend_frontend" />
<item itemvalue="npm.run_start_frontend" />
<item itemvalue="Shell Script.run_backend_frontend" />
</list>
</component>
<component name="SharedIndexes">
@@ -127,6 +128,7 @@
<workItem from="1733601633451" duration="10190000" />
<workItem from="1733644355292" duration="59000" />
<workItem from="1733644430242" duration="42000" />
<workItem from="1733688686708" duration="2146000" />
</task>
<task id="LOCAL-00001" summary="Nano zoom fix #11">
<option name="closed" value="true" />
@@ -344,18 +346,21 @@
<option name="project" value="LOCAL" />
<updated>1733603759658</updated>
</task>
<option name="localTasksCounter" value="28" />
<task id="LOCAL-00028" summary="Update README.md #4">
<option name="closed" value="true" />
<created>1733688870582</created>
<option name="number" value="00028" />
<option name="presentableId" value="LOCAL-00028" />
<option name="project" value="LOCAL" />
<updated>1733688870582</updated>
</task>
<option name="localTasksCounter" value="29" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="OPEN_GENERIC_TABS">
<map>
<entry key="b19a2984-e5f0-4539-aee3-b8a963f11544" value="TOOL_WINDOW" />
</map>
</option>
<option name="TAB_STATES">
<map>
<entry key="MAIN">
@@ -363,11 +368,6 @@
<State />
</value>
</entry>
<entry key="b19a2984-e5f0-4539-aee3-b8a963f11544">
<value>
<State />
</value>
</entry>
</map>
</option>
</component>
@@ -396,6 +396,7 @@
<MESSAGE value="Docker build update #10 (I hope final)" />
<MESSAGE value="Docker build update #10 (actual final)" />
<MESSAGE value="Release 1.0!!!!" />
<option name="LAST_COMMIT_MESSAGE" value="Release 1.0!!!!" />
<MESSAGE value="Update README.md #4" />
<option name="LAST_COMMIT_MESSAGE" value="Update README.md #4" />
</component>
</project>
+1 -1
View File
@@ -13,7 +13,7 @@
<br />
<p align="center">
<a href="https://github.com/LukeGus/Termix">
<img alt="Termimx Banner" src="./TermixLogo.png" style="width: 125px; height: auto;"> </a>
<img alt="Termimx Banner" src=./repo-images/TermixLogo.png style="width: 125px; height: auto;"> </a>
</p>
# Description
+1 -1
View File
@@ -1,5 +1,5 @@
Currently:
Create read.me (copy stuff from nexterm, do planned vs current features, description, why were different, setup tutorial (docker, manual build), example images (live tutorial?), eventually website?)
Create read.me (setup tutorial (docker, manual build), example images (live tutorial?), eventually website?)
then all done for release!
Minor bugs:
Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

File renamed without changes.