Merge branch 'main' of https://github.com/DevDuCoffee/Nuit-De-L-Info-2020 into main

.idea/workspace.xml

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="5db01d37-ed98-4df0-8a3f-85093d5456ef" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/inscription.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/connexion.html" beforeDir="false" afterPath="$PROJECT_DIR$/connexion.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/connexion.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/connexion.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/creation.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/inscription.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/creation.html" beforeDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ComposerSettings">
-    <execution />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="HTML File" />
-        <option value="CSS File" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectId" id="1lA5FnXumkMauI2VLRUvRUzSLTD" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="DefaultHtmlFileTemplate" value="HTML File" />
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="list.type.of.created.stylesheet" value="CSS" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.detected.package.tslint" value="true" />
-    <property name="node.js.path.for.package.eslint" value="project" />
-    <property name="node.js.path.for.package.tslint" value="project" />
-    <property name="node.js.selected.package.eslint" value="(autodetect)" />
-    <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="vue.rearranger.settings.migration" value="true" />
-  </component>
-  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\Nuit-De-L-Info-2020" />
-    </key>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="5db01d37-ed98-4df0-8a3f-85093d5456ef" name="Default Changelist" comment="" />
-      <created>1607026953826</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1607026953826</updated>
-      <workItem from="1607026956145" duration="16554000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>

README.md

@@ -1 +1,29 @@
-# Nuit-De-L-Info-2020
+# Projet Nuit De L'Info 2020 - Equipe DevDuCoffee
+
+## Dépendences
+
+Le projet necessite d'être lancé sous une machine disposant d'un serveur web (WAMP/LAMP/XAMP/MAMP...) et des services Apaches, php 7.4+.
+
+## Défis
+
+- Défi [Principal de la nuit](https://www.nuitdelinfo.com/inscription/defis/174)
+- Défi [Transcender la distance](https://www.nuitdelinfo.com/inscription/defis/284)
+- Défi [GridPocket Data Lake](https://www.nuitdelinfo.com/inscription/defis/285)
+- Défi [EMERGENCY MEETING!!](https://www.nuitdelinfo.com/inscription/defis/273)
+- Défi [Neurchi Illuminati](https://www.nuitdelinfo.com/inscription/defis/267)
+
+## L'équipe
+
+- [Alexandre](https://github.com/lemoinealexandre) : Étudiant en L3 MIAGE
+- [Hugo](https://github.com/lh-deux) : Étudiant en DUT informatique (2e Année)
+- [Lisa](https://github.com/LisaDes) : Étudiante en L3 MIAGE
+- [Manon](https://github.com/ThebaultManon) : Étudiante en L2 Info
+- [Mathieu](https://github.com/RethersMathieu) : Étudiant en L3 MIAGE
+- [Nicolas](https://github.com/Nicolas-Corbiere) : Étudiant en L3 MIAGE
+- [Pauline](https://github.com/JunkJumper) : Étudiantæ en DUT informatique (2e Année)
+- [Seb](https://github.com/NeBuBuLL) : Étudiant en Master 1 Info
+- [Yannick](https://github.com/AlcarazYannick) : Étudiant en L3 MIAGE
+
+## Licence
+
+Ce projet est disponible sous licence creative common Attribution 4.0 (voir [Licence.MD](https://github.com/DevDuCoffee/Nuit-De-L-Info-2020/blob/main/LICENSE.md))

historiqueFormulaire.html

@@ -54,10 +54,10 @@
         </tr>
 
         <tr>
-            <td>Date 03/12/2020<br/>
-                Lieu: Nice        Spot:La villa<br/>
+            <td>Date 01/05/1976<br/>
+                Lieu: ingolstadt_germany       Spot:Proof of a Conspiracy<br/>
             </td>
-            <td>Aucun problème lors de cette session</td>
+            <td>un triangle de billard flotte a la surface</td>
 
         </tr>
     </table>