Develop

.gitignore

@@ -1,5 +1,4 @@
-
-# Created by https://www.gitignore.io/api/osx,linux,vi,vim,atom,nano,sass
+#Created by https://www.gitignore.io/api/osx,linux,vi,vim,atom,nano,sass
 # Edit at https://www.gitignore.io/?templates=osx,linux,vim,sass
 
 ### Linux ###
@@ -17,7 +16,6 @@
 # .nfs files are created when an open file is removed but is still being accessed
 .nfs*
 
-
 ### OSX ###
 # General
 .DS_Store
@@ -52,6 +50,228 @@ Temporary Items
 *.sass.map
 *.scss.map
 
+
+## Angular ##
+# compiled output
+/dist
+/tmp
+/app/**/*.js
+/app/**/*.js.map
+
+# dependencies
+/node_modules
+/bower_components
+
+# IDEs and editors
+/.idea
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage/*
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+#System Files
+.DS_Store
+
+### Eclipse ###
+
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# CDT- autotools
+.autotools
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Annotation Processing
+.apt_generated/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+### Eclipse Patch ###
+# Eclipse Core
+.project
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# Annotation Processing
+.apt_generated
+
+.sts4-cache/
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### Node ###
+# Logs
+logs
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+#DynamoDB Local files
+.dynamodb/
+
+
 ### Vim ###
 # Swap
 [._]*.s[a-v][a-z]
@@ -71,3 +291,4 @@ tags
 [._]*.un~
 
 # End of https://www.gitignore.io/api/osx,linux,vi,vim,atom,nano,sass
+

CONTRIBUTING.md

@@ -4,5 +4,8 @@ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
 # RULE #2
 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 
+# RULE #3
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua$
+
 # RULE #4
 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

Page2.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr">
+    <head>
+        <meta charset="utf-8">
+        <title>My super fancy webpage</title>
+    </head>
+    <body>
+    <h1>Page 2</h1>
+        <h2>This is my page 2 !</h2>
+    <p><b>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Temporibus facilis, error sapiente rem dolorum, eius minus inventore deleniti debitis molestiae quae nihil amet dolores voluptatum esse nisi voluptate molestias illum.<$
+    </body>
+</html>

README

@@ -1,3 +1,6 @@
 # My Test repository
 
 *Version 0.2*
+
+
+Ceci est un fork du projet https://github.com/smileinnovation/formation-git

index.html

@@ -8,9 +8,11 @@
 
 <body>
     <h1>Hello Guys &amp; Gals</h1>
-    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Temporibus facilis, error sapiente rem dolorum, eius
+	<h2>This is my change added to this page!</h2>
+	<a href="Page2.html">Go to Page 2</a>
+    <p><b>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Temporibus facilis, error sapiente rem dolorum, eius
         minus inventore deleniti debitis molestiae quae nihil amet dolores voluptatum esse nisi voluptate molestias
-        illum.</p>
+        illum.</b></p>
     <p><a href="page2.html">Go to page 2</a></p>
 	<blockquote>
     Lorem ipsum dolor sit amet, consectetur adipisicing elit. Temporibus facilis, error sapiente rem dolorum, eius

javascript.js

@@ -1,3 +1,8 @@
+function hello()
+{
+alert("Hello  world!');
+}
+
 function test()
 {
 	alert("test");