Skip to content
Snippets Groups Projects
Commit c9626586 authored by abuomar1211980's avatar abuomar1211980
Browse files

Merge branch 'master' of gitlab.fabcloud.org:preacademy/preacademy2018

parents 2b31dfe6 182fa8ae
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
Showing
with 101 additions and 9 deletions
participants/elshare.anas/index.html
+ 14
− 1
View file @ c9626586
......@@ -8,6 +8,19 @@
<style type="text/css">code{white-space: pre;}</style>
</head>
<body>
<h1 id="assignments">Assignments</h1>
<ol style="list-style-type: decimal">
<li><a href="About_Fab.html">Introduction to Fab-Lab</a><br />
</li>
<li><a href="About_Fab.html">Working With Linux</a><br />
</li>
<li><a href="vinyl.html">Vinyl Cutter.</a><br />
</li>
<li><a href="3D_printer.html">3D Printer and Scanner.</a><br />
</li>
<li><a href="electronix_production.html">Electronics Production.</a></li>
</ol>
<h1 id="final-project">Final Project</h1>
<p><a href="final_project.html">Final Project Documentation</a></p>
</body>
</html>
participants/elshare.anas/index.md
+ 9
− 0
View file @ c9626586
#Assignments
1. [Introduction to Fab-Lab](About_Fab.html)
2. [Working With Linux](About_Fab.html)
3. [Vinyl Cutter.](vinyl.html)
4. [3D Printer and Scanner.](3D_printer.html)
5. [Electronics Production.](electronix_production.html)
#Final Project
[Final Project Documentation](final_project.html)
participants/fares.ahmad/auto.sh
+ 1
− 0
View file @ c9626586
......@@ -10,6 +10,7 @@ pandoc -s -t html laserCutter.md -o laserCutter.html
pandoc -s -t html shopbot.md -o shopbot.html
pandoc -s -t html vinyl.md -o vinyl.html
pandoc -s -t html principles.md -o principles.html
pandoc -s -t html finalProject.md -o finalProject.html
echo "All files converteds to html"
echo "Pull"
......
participants/fares.ahmad/finalProject.html 0 → 100644
+ 13
− 0
View file @ c9626586
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="generator" content="pandoc" />
<title></title>
<style type="text/css">code{white-space: pre;}</style>
</head>
<body>
</body>
</html>
participants/fares.ahmad/finalProject.md 0 → 100644
+ 0
− 0
View file @ c9626586
participants/fares.ahmad/first.md 0 → 100644
+ 7
− 0
View file @ c9626586
# Index Page
- [Introduction](introduction.html)
# Final Project
[Final Project](finalProject.html)
participants/fares.ahmad/index.html
+ 8
− 2
View file @ c9626586
......@@ -8,7 +8,13 @@
<style type="text/css">code{white-space: pre;}</style>
</head>
<body>
<h1 id="this-is-ahmad-fares-page">This is Ahmad Fares page</h1>
<p>First time to push using ssh</p>
<h1 id="index-page">Index Page</h1>
<ul>
<li><a href="introduction.html">Introduction</a></li>
</ul>
<h1 id="final-project">Final Project</h1>
<ul>
<li><a href="finalProject.html">Final Project</a></li>
</ul>
</body>
</html>
participants/fares.ahmad/index.md
+ 7
− 2
View file @ c9626586
# This is Ahmad Fares page
First time to push using ssh
# Index Page
- [Introduction](introduction.html)
# Final Project
- [Final Project](finalProject.html)
participants/qwider.walaa/auto.sh
+ 6
− 2
View file @ c9626586
......@@ -10,11 +10,15 @@ pandoc -s -t html shopbot.md -o shopbot.html
pandoc -s -t html electronics_prod.md -o electronics_prod.html
echo "All files coverted to HTML"
if [ "$#" -gt 0 ]
then
cd ..
cd ..
git pull
git add .
git commit -m "upaate"
git commit -m "update"
git pull && git push
else
echo "not uploading [empty commit message]"
fi
participants/qwider.walaa/finalpro.html 0 → 100644
+ 13
− 0
View file @ c9626586
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="generator" content="pandoc" />
<title></title>
<style type="text/css">code{white-space: pre;}</style>
</head>
<body>
</body>
</html>
participants/qwider.walaa/finalpro.md 0 → 100644
+ 0
− 0
View file @ c9626586
participants/qwider.walaa/index.html
+ 13
− 1
View file @ c9626586
......@@ -8,6 +8,18 @@
<style type="text/css">code{white-space: pre;}</style>
</head>
<body>
<p>index list</p>
<h1 id="index-page">Index Page</h1>
<ul>
<li><a href="introduction.html">introduction</a><br />
</li>
<li><a href="vinyl.html">vinyl cutter</a><br />
</li>
<li><a href="3dprinting_scanning.html">3Dprinting</a></li>
<li><a href="electronics_prod.html">Electronics_Prod</a></li>
<li><a href="laser.html">laser</a></li>
<li><a href="shopbot.html">Shopbot</a> list</li>
</ul>
<h1 id="final-project">Final project</h1>
<p><a href="fainalpro.html">Final Project</a></p>
</body>
</html>
participants/qwider.walaa/index.md
+ 10
− 1
View file @ c9626586
index
#Index Page
- [introduction](introduction.html)
- [vinyl cutter](vinyl.html)
- [3Dprinting](3dprinting_scanning.html)
- [Electronics_Prod](electronics_prod.html)
- [laser](laser.html)
- [Shopbot](shopbot.html)
list
#Final project
[Final Project](fainalpro.html)
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