Merge dev-1.1 into main. #11
Generated
+12
@@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="WEB_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager">
|
||||||
|
<content url="file://$MODULE_DIR$">
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/temp" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
||||||
|
</content>
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
</component>
|
||||||
|
</module>
|
||||||
Generated
+8
@@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectModuleManager">
|
||||||
|
<modules>
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/.idea/Termix.iml" filepath="$PROJECT_DIR$/.idea/Termix.iml" />
|
||||||
|
</modules>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
Generated
+10
-13
@@ -4,15 +4,10 @@
|
|||||||
<option name="autoReloadType" value="SELECTIVE" />
|
<option name="autoReloadType" value="SELECTIVE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="8497df64-d86b-4c98-ac58-c157d9d3fb1e" name="Changes" comment="">
|
<list default="true" id="8497df64-d86b-4c98-ac58-c157d9d3fb1e" name="Changes" comment="Release 1.0!!!!">
|
||||||
<change beforePath="$PROJECT_DIR$/.github/workflows/docker-image.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.github/workflows/docker-image.yml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<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$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/frontend/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/index.html" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/info.txt" beforeDir="false" afterPath="$PROJECT_DIR$/info.txt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/info.txt" beforeDir="false" afterPath="$PROJECT_DIR$/info.txt" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/public/favicon.ico" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/public/logo192.png" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/public/logo512.png" beforeDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@@ -32,14 +27,14 @@
|
|||||||
}</component>
|
}</component>
|
||||||
<component name="GithubPullRequestsUISettings">{
|
<component name="GithubPullRequestsUISettings">{
|
||||||
"selectedUrlAndAccountId": {
|
"selectedUrlAndAccountId": {
|
||||||
"url": "https://github.com/LukeGus/ssh-project.git",
|
"url": "https://github.com/LukeGus/Termix",
|
||||||
"accountId": "f04977d4-c3b2-400a-9c9b-d5b445f8a970"
|
"accountId": "f04977d4-c3b2-400a-9c9b-d5b445f8a970"
|
||||||
}
|
}
|
||||||
}</component>
|
}</component>
|
||||||
<component name="ProjectColorInfo"><![CDATA[{
|
<component name="ProjectColorInfo">{
|
||||||
"customColor": "636378de",
|
"customColor": "636378de",
|
||||||
"associatedIndex": 8
|
"associatedIndex": 8
|
||||||
}]]></component>
|
}</component>
|
||||||
<component name="ProjectId" id="2pojjnjB8kTL4lo1P2No1yvZp4c" />
|
<component name="ProjectId" id="2pojjnjB8kTL4lo1P2No1yvZp4c" />
|
||||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
|
||||||
<ConfirmationsSetting value="1" id="Add" />
|
<ConfirmationsSetting value="1" id="Add" />
|
||||||
@@ -58,7 +53,7 @@
|
|||||||
"Shell Script.run_backend_frontend.executor": "Run",
|
"Shell Script.run_backend_frontend.executor": "Run",
|
||||||
"git-widget-placeholder": "release-1.0",
|
"git-widget-placeholder": "release-1.0",
|
||||||
"ignore.virus.scanning.warn.message": "true",
|
"ignore.virus.scanning.warn.message": "true",
|
||||||
"last_opened_file_path": "D:/Programming Projects/SSH-Project-JB",
|
"last_opened_file_path": "D:/Programming Projects/Termix",
|
||||||
"node.js.detected.package.eslint": "true",
|
"node.js.detected.package.eslint": "true",
|
||||||
"node.js.detected.package.tslint": "true",
|
"node.js.detected.package.tslint": "true",
|
||||||
"node.js.selected.package.eslint": "(autodetect)",
|
"node.js.selected.package.eslint": "(autodetect)",
|
||||||
@@ -106,8 +101,8 @@
|
|||||||
<method v="2" />
|
<method v="2" />
|
||||||
</configuration>
|
</configuration>
|
||||||
<list>
|
<list>
|
||||||
<item itemvalue="npm.run_start_frontend" />
|
|
||||||
<item itemvalue="Shell Script.run_backend_frontend" />
|
<item itemvalue="Shell Script.run_backend_frontend" />
|
||||||
|
<item itemvalue="npm.run_start_frontend" />
|
||||||
</list>
|
</list>
|
||||||
</component>
|
</component>
|
||||||
<component name="SharedIndexes">
|
<component name="SharedIndexes">
|
||||||
@@ -130,6 +125,8 @@
|
|||||||
<workItem from="1733549186397" duration="8748000" />
|
<workItem from="1733549186397" duration="8748000" />
|
||||||
<workItem from="1733599078854" duration="1895000" />
|
<workItem from="1733599078854" duration="1895000" />
|
||||||
<workItem from="1733601633451" duration="10190000" />
|
<workItem from="1733601633451" duration="10190000" />
|
||||||
|
<workItem from="1733644355292" duration="59000" />
|
||||||
|
<workItem from="1733644430242" duration="42000" />
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00001" summary="Nano zoom fix #11">
|
<task id="LOCAL-00001" summary="Nano zoom fix #11">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#### Stats
|
#### Repo Stats
|
||||||

|

|
||||||

|

|
||||||

|

|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
Currently:
|
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?, that cool info stuff it shows like the repo stars and the brand iamge and stuff)
|
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?)
|
||||||
then all done for release!
|
then all done for release!
|
||||||
|
|
||||||
Minor bugs:
|
Minor bugs:
|
||||||
|
|||||||
Reference in New Issue
Block a user