Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix issues #1 & #2 #1818

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5263616
Update README.md
Nabakator Nov 8, 2024
8634177
fix issue correction du texte en francais #1787
Nabakator Nov 8, 2024
6e63e59
fix issue Texte en anglais dans le fichier
Nabakator Nov 8, 2024
57ac9be
fix issue Texte en anglais dans le fichier README.md #1
Nabakator Nov 8, 2024
85e5239
fix issue Modifier l'auteur dans le fichier README.md #2
Nabakator Nov 8, 2024
6a98b7e
pull request ignored
Nabakator Nov 8, 2024
fb43b9f
Update README.md
Nabakator Nov 8, 2024
954ace1
fix issue Définir les prérequis dans le fichier README.md #3
Nabakator Nov 8, 2024
1280723
code to text
Nabakator Nov 8, 2024
9ad12a5
typo
Nabakator Nov 8, 2024
f1f0695
Update CONTRIBUTING.md
Nabakator Nov 8, 2024
94e6938
fix issue Erreur de typographie fichier CONTRIBUTING.md #4
Nabakator Nov 8, 2024
8028f0c
Create blank.yml
Nabakator Nov 12, 2024
892a946
fix issue Ajouter le fichier .gitignore pour JetBrains #5
Nabakator Nov 12, 2024
3941150
init DS_Store
Nabakator Nov 12, 2024
e8d6dd7
add test.txt
Nabakator Nov 12, 2024
659a8b5
deleted test.txt
Nabakator Nov 12, 2024
701c95f
no issue number
Nabakator Nov 12, 2024
9401473
deleted test.txt under Ajouter le fichier .gitignore pour JetBrains #5
Nabakator Nov 12, 2024
f168fe6
added congratulation post commit hook #5
Nabakator Nov 12, 2024
093b0f5
deleted temp.txt under Ajouter le fichier .gitignore pour JetBrains #5
Nabakator Nov 12, 2024
ce143d2
added temp2 #5
Nabakator Nov 12, 2024
76efd3e
added temp3 #5
Nabakator Nov 12, 2024
abc8d06
deleted temp 2 & 3 #5
Nabakator Nov 12, 2024
7444169
Delete .github/workflows/blank.yml
Nabakator Nov 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
77 changes: 77 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# AWS User-specific
.idea/**/aws.xml

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# SonarLint plugin
.idea/sonarlint/

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"githubPullRequests.ignoredPullRequestBranches": [
"main"
]
}
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ C'est grâce à ce genre d'investissement que nous pourrons favoriser un covoitu

Open Transport recherche des contributeurs pour tous types de tâches : améliorations, correction de bugs, nouvelles fonctionnalités.

## Comment contriburer ?

## Comment contribuer ?

Pour commencer, nous recommendons de consulter la liste des [issues](https://github.com/OpenClassrooms-Student-Center/7688581-Expert-Git-GitHub/issues)

Expand Down
13 changes: 5 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ Ces instructions permettent d'executer une copie du projet en local sur votre po

Pour executer en local le projet Open Transport, vous devez au préalable installer :

```
A définir

```
• Une solution permettant de mettre en place un serveur Web local (par exemple [XAMPP](https://sourceforge.net/projects/xampp/)).

### Installation

Expand All @@ -33,7 +30,7 @@ A définir : expliquer comment executer les tests
```


## Deployment
## Déploiement

Voici les étapes à suivre pour déployer en production :

Expand All @@ -44,7 +41,7 @@ A définir
## Technologies :

* HTML5/CSS3
* [Boostrap](https://getbootstrap.com/)
* [Bootstrap](https://getbootstrap.com/)

## Contribution

Expand All @@ -54,8 +51,8 @@ Merci de lire les fichiers :

## Auteurs

* **Non spécifié**
* O. C.

## License

Ce projet est sous la licence GNU GPL V3 - voir le fichier [LICENSE](LICENSE) pour plus de détails
Ce projet est sous la licence GNU GPL V3 - voir le fichier [LICENSE](LICENSE) pour plus de détails