Commit 2054b9b9 authored by Jasin's avatar Jasin

Merge branch 'master' into development

parents 28954e27 4d8917bd
......@@ -4,7 +4,6 @@
<list default="true" id="8c781855-12fc-4edd-b7db-fe31e2496215" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/UI/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/UI/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/UI/js/chart.js" beforeDir="false" afterPath="$PROJECT_DIR$/UI/js/chart.js" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -23,11 +22,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/UI/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="55" column="125" selection-start-line="55" selection-start-column="125" selection-end-line="55" selection-end-column="125" />
<state relative-caret-position="136">
<caret line="267" column="92" selection-start-line="267" selection-start-column="92" selection-end-line="267" selection-end-column="92" />
<folding>
<element signature="n#style#0;n#section#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#p#0;n#div#0;n#div#0;n#div#0;n#section#4;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -36,12 +35,10 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/UI/js/chart.js">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/UI/css/freelancer.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="337">
<caret line="71" column="46" selection-start-line="71" selection-start-column="46" selection-end-line="71" selection-end-column="46" />
</state>
<state relative-caret-position="-4556" />
</provider>
</entry>
</file>
......@@ -51,6 +48,7 @@
<findStrings>
<find>schreiben</find>
<find>Versptäung</find>
<find>Statis</find>
</findStrings>
</component>
<component name="Git.Settings">
......@@ -60,8 +58,8 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/../../untitled/dataQuery.php" />
<option value="$PROJECT_DIR$/UI/index.html" />
<option value="$PROJECT_DIR$/UI/js/chart.js" />
<option value="$PROJECT_DIR$/UI/index.html" />
</list>
</option>
</component>
......@@ -99,6 +97,12 @@
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="UI" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="public" type="b2602c69:ProjectViewProjectNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="UI" type="462c0819:PsiDirectoryNode" />
<item name="css" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
......@@ -139,12 +143,12 @@
<workItem from="1562774440059" duration="1677000" />
<workItem from="1563206596683" duration="596000" />
<workItem from="1563345106408" duration="763000" />
<workItem from="1563374644786" duration="476000" />
<workItem from="1563374644786" duration="1488000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="4503000" />
<option name="totallyTimeSpent" value="5515000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
......@@ -209,10 +213,22 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/UI/js/chart.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="337">
<caret line="71" column="46" selection-start-line="71" selection-start-column="46" selection-end-line="71" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/UI/css/freelancer.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4556" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/UI/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="55" column="125" selection-start-line="55" selection-start-column="125" selection-end-line="55" selection-end-column="125" />
<state relative-caret-position="136">
<caret line="267" column="92" selection-start-line="267" selection-start-column="92" selection-end-line="267" selection-end-column="92" />
<folding>
<element signature="n#style#0;n#section#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#p#0;n#div#0;n#div#0;n#div#0;n#section#4;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -220,12 +236,5 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/UI/js/chart.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="337">
<caret line="71" column="46" selection-start-line="71" selection-start-column="46" selection-end-line="71" selection-end-column="46" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
......@@ -258,6 +258,27 @@
</div>
</section>
<!-- About Section -->
<section class="text-white mb-0" id="nextUpdate">
<div class="container">
<h2 class="text-center text-uppercase text-secondary">Mit dem nächsten Update</h2>
<hr class="star-dark mb-5">
<div class="row">
<p class="lead text-dark">Mit dem nächsten Update am 01.08.2019 kommt: <br>
1. Es werde nicht mehr nur noch Verspätungen, sondern auch Fahrtausfälle erfasst<br>
2. Erweiterte Statistik<br>
3. Mehr Stabilität</p>
</div>
<div class="text-center mt-4">
<a class="btn btn-xl btn-primary" href="https://rnv-monitor.de/public/stats">
<i class="far fa-chart-bar mr-2"></i>
Statistik zu Ihrer Verbindung
</a>
</div>
</div>
</section>
<!-- Contact Section
<section id="contact">
<div class="container">
......@@ -385,6 +406,9 @@
<div class="container">
<small>Copyright &copy; RNV-MONITOR 2018-2019 - Jasin Goldkorn</small>
</div>
<div class="container">
<small>V:1.0.7</small>
</div>
</div>
<!-- Scroll to Top Button (Only visible on small and extra-small screen sizes) -->
......
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