Differences

This shows you the differences between two versions of the page.

--- documentation:fa21:fabac21_week_18 [2021/06/02 12:01]
ferdi
+++ documentation:fa21:fabac21_week_18 [2021/07/07 07:57] (current)
ferdi
@@ Line 47: / Line 47: @@
 === Loes ===
-http://fabacademy.org/archives/2015/eu/students/bogers.loes/17inventionintellectualpropertyincome.html\\
+http://fab.academany.org/2021/labs/waag/students/loes-schakenbos/blog/week17/\\
-{{http://fabacademy.org/archives/2015/eu/students/bogers.loes/images/finalproject/48allematerials_beforeassembly.jpg?425}}\\
+{{http://fab.academany.org/2021/labs/waag/students/loes-schakenbos/img/projects/FP_04.jpeg?425}}\\
-{{youtube>cjGOSBkY4Bk}}\\
+{{http://fab.academany.org/2021/labs/waag/students/loes-schakenbos/img/week17/VID1.mp4}}\\
+{{http://fab.academany.org/2021/labs/waag/students/loes-schakenbos/img/projects/FP_46.jpeg?425}}\\
+==== Prep meeting ====
+right to use students work for FabAcademy\\
+https://finalprojects.fabacademy.org/#/schedule/2021\\
+http://fabacademy.org/2021/presentations.html\\
+https://fabxlive.fabevent.org/expo\\
+==== Homework invention, intellectual property, and income  ====
+=== Jeffery Naranjo ===
+{{http://fabacademy.org/2021/labs/zoi/students/jeffery-naranjo/assets/images/FinalProject/BusStop.png?425}}\\
+=== Tatjana Soronda ===
+http://fabacademy.org/2021/labs/barcelona/students/tatjana-soronda/pages/week17.html\\
+{{http://fabacademy.org/2021/labs/barcelona/students/tatjana-soronda/presentation.png?425}}\\
+{{http://fabacademy.org/2021/labs/barcelona/students/tatjana-soronda/presentation.mp4}}\\
+no-breathing alarm\\
+Git rollback/ undo commit:\\
+https://docs.gitlab.com/ee/topics/git/rollback_commits.html\\
+[<>]

FabLab Kamp-Lintfort

User Tools

Site Tools

Differences

Page Tools