diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..9777fe96 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +#Ignoring Intellij workspace specific folders and files +/**/.idea/workspace.xml +/**/tasks.xml + +/**/.idea/libraries + +#Ignoring target folders +**/target/ \ No newline at end of file diff --git a/Documentation/Diagrammes/diagrammes.asta b/Documentation/Diagrammes/diagrammes.asta index 8a57e052..b16a0a47 100644 Binary files a/Documentation/Diagrammes/diagrammes.asta and b/Documentation/Diagrammes/diagrammes.asta differ diff --git a/Documentation/Interactions_serveur-clients.ods b/Documentation/Interactions_serveur-clients.ods index a4d41bbf..7b99c96b 100644 Binary files a/Documentation/Interactions_serveur-clients.ods and b/Documentation/Interactions_serveur-clients.ods differ diff --git a/Workspace/.idea/artifacts/server_war.xml b/Workspace/.idea/artifacts/server_war.xml new file mode 100644 index 00000000..0f04e2c1 --- /dev/null +++ b/Workspace/.idea/artifacts/server_war.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/server/target + + + + + \ No newline at end of file diff --git a/Workspace/.idea/artifacts/server_war_exploded.xml b/Workspace/.idea/artifacts/server_war_exploded.xml new file mode 100644 index 00000000..ac4990b5 --- /dev/null +++ b/Workspace/.idea/artifacts/server_war_exploded.xml @@ -0,0 +1,23 @@ + + + $PROJECT_DIR$/server/target/server-1.0-SNAPSHOT + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Workspace/.idea/codeStyleSettings.xml b/Workspace/.idea/codeStyleSettings.xml new file mode 100644 index 00000000..5555dd26 --- /dev/null +++ b/Workspace/.idea/codeStyleSettings.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/Workspace/.idea/compiler.xml b/Workspace/.idea/compiler.xml index e4c04dd0..63c22bca 100644 --- a/Workspace/.idea/compiler.xml +++ b/Workspace/.idea/compiler.xml @@ -8,12 +8,13 @@ + - + diff --git a/Workspace/.idea/misc.xml b/Workspace/.idea/misc.xml index 82ba6c90..769b4698 100644 --- a/Workspace/.idea/misc.xml +++ b/Workspace/.idea/misc.xml @@ -1,15 +1,14 @@ + + + - diff --git a/Workspace/.idea/modules.xml b/Workspace/.idea/modules.xml index 464e4d5d..1796f0ba 100644 --- a/Workspace/.idea/modules.xml +++ b/Workspace/.idea/modules.xml @@ -5,6 +5,7 @@ + \ No newline at end of file diff --git a/Workspace/.idea/workspace.xml b/Workspace/.idea/workspace.xml deleted file mode 100644 index 27e76320..00000000 --- a/Workspace/.idea/workspace.xml +++ /dev/null @@ -1,1264 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - com.pqt.core.entities.sale.Sale - - - long - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - Android - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -