bitte verwendet nur noch addressen die https beginnen! Siehe wiki https://wiki.mediacube.at/wiki/index.php?title=Repositories#ssh-_vs._https_repository_adressen

alle von MMT haben hier Zugriff. Du willst Deine Freunde von MMA auch dabei haben? Mail mit den usernamen an Brigitte Jellinek

Commit 3623a024 authored by Christoph Mayr's avatar Christoph Mayr

Merge branch 'master' of gitlab.mediacube.at:fhs39859/Solr_Pokedex

parents 96be3767 6768e46e
./node_modules
# system
.DS_Store
# IDE
.idea/
# node.js
node_modules/
# build
dist/
#IDE metadata
.idea/workspace.xml
.idea/tasks.xml
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/pokedex.iml" filepath="$PROJECT_DIR$/.idea/pokedex.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?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>
\ No newline at end of file
......@@ -2,9 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="03703853-d797-498e-a74c-c726d51baed3" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/minijson.json" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/pokedex.iml" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pokemon.json" afterPath="$PROJECT_DIR$/pokemon.json" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
......@@ -42,27 +44,29 @@
<entry file="file://$PROJECT_DIR$/pokemon.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="259">
<caret line="173" column="5" lean-forward="true" selection-start-line="166" selection-start-column="4" selection-end-line="173" selection-end-column="5" />
<folding />
<caret line="173" column="5" lean-forward="false" selection-start-line="166" selection-start-column="4" selection-end-line="173" selection-end-column="5" />
<folding>
<marker date="1528808165905" expanded="true" signature="0:71927" ph="[...]" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="minijson.json" pinned="false" current-in-tab="true">
<file leaf-file-name="minijson.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/minijson.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" column="3" lean-forward="true" selection-start-line="30" selection-start-column="3" selection-end-line="30" selection-end-column="3" />
<caret line="30" column="3" lean-forward="false" selection-start-line="30" selection-start-column="3" selection-end-line="30" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="15" lean-forward="false" selection-start-line="4" selection-start-column="15" selection-end-line="4" selection-end-column="15" />
<state relative-caret-position="180">
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -89,8 +93,8 @@
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/index.js" />
<option value="$PROJECT_DIR$/pokemon.json" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/minijson.json" />
<option value="$PROJECT_DIR$/.gitignore" />
</list>
</option>
</component>
......@@ -171,12 +175,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1528804284204</updated>
<workItem from="1528804285428" duration="2266000" />
<workItem from="1528804285428" duration="2316000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="2266000" />
<option name="totallyTimeSpent" value="2316000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="877" extended-state="0" />
......@@ -228,14 +232,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="15" lean-forward="false" selection-start-line="4" selection-start-column="15" selection-end-line="4" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pokemoncopy.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
......@@ -247,15 +243,25 @@
<entry file="file://$PROJECT_DIR$/pokemon.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="259">
<caret line="173" column="5" lean-forward="true" selection-start-line="166" selection-start-column="4" selection-end-line="173" selection-end-column="5" />
<folding />
<caret line="173" column="5" lean-forward="false" selection-start-line="166" selection-start-column="4" selection-end-line="173" selection-end-column="5" />
<folding>
<marker date="1528808165905" expanded="true" signature="0:71927" ph="[...]" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/minijson.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" column="3" lean-forward="true" selection-start-line="30" selection-start-column="3" selection-end-line="30" selection-end-column="3" />
<caret line="30" column="3" lean-forward="false" selection-start-line="30" selection-start-column="3" selection-end-line="30" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding />
</state>
</provider>
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment