http://2012.igem.org/wiki/index.php?title=Team:TU-Delft/Ethics&feed=atom&action=history
Team:TU-Delft/Ethics - Revision history
2024-03-29T10:49:27Z
Revision history for this page on the wiki
MediaWiki 1.16.0
http://2012.igem.org/wiki/index.php?title=Team:TU-Delft/Ethics&diff=294100&oldid=prev
Ijacobs at 01:13, 27 October 2012
2012-10-27T01:13:05Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 01:13, 27 October 2012</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 10:</td>
<td colspan="2" class="diff-lineno">Line 10:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><img src="https://static.igem.org/mediawiki/igem.org/8/86/Ethics2.jpg" align="middle" width="100%"></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><img src="https://static.igem.org/mediawiki/igem.org/8/86/Ethics2.jpg" align="middle" width="100%"></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><p><del class="diffchange diffchange-inline">Our ethics is divided in </del>two <del class="diffchange diffchange-inline">parts</del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><p><ins class="diffchange diffchange-inline">We did </ins>two <ins class="diffchange diffchange-inline">different project on the field of ethics</ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><ul></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><ul></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <li> Working together with humanist Daan Schuurbiers</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <li> Working together with humanist Daan Schuurbiers</div></td></tr>
</table>
Ijacobs
http://2012.igem.org/wiki/index.php?title=Team:TU-Delft/Ethics&diff=294076&oldid=prev
Ijacobs at 01:12, 27 October 2012
2012-10-27T01:12:11Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 01:12, 27 October 2012</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 12:</td>
<td colspan="2" class="diff-lineno">Line 12:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><p>Our ethics is divided in two parts</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><p>Our ethics is divided in two parts</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><ul></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><ul></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div> <li> <del class="diffchange diffchange-inline">Our Humanist </del>Daan Schuurbiers</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div> <li> <ins class="diffchange diffchange-inline">Working together with humanist </ins>Daan Schuurbiers</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <li> Rathenau Debate 'Meeting of Young Minds'</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <li> Rathenau Debate 'Meeting of Young Minds'</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></ul></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></ul></div></td></tr>
</table>
Ijacobs
http://2012.igem.org/wiki/index.php?title=Team:TU-Delft/Ethics&diff=293900&oldid=prev
Ijacobs at 01:03, 27 October 2012
2012-10-27T01:03:41Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 01:03, 27 October 2012</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 16:</td>
<td colspan="2" class="diff-lineno">Line 16:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></ul></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></ul></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><br/></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><br/></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div>We are working together with Daan Schuurbiers the director of a consultancy for responsible innovation. Daan's main</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>We are working together with Daan Schuurbiers<ins class="diffchange diffchange-inline">, </ins>the director of a consultancy for responsible innovation. Daan's main</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>contribution was to make the team aware of the social sciences of the research. Which is so important for our potential tuberculosis</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>contribution was to make the team aware of the social sciences of the research. Which is so important for our potential tuberculosis</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>diagnosing method.</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>diagnosing method.</div></td></tr>
</table>
Ijacobs
http://2012.igem.org/wiki/index.php?title=Team:TU-Delft/Ethics&diff=293894&oldid=prev
Lizah at 01:03, 27 October 2012
2012-10-27T01:03:19Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 01:03, 27 October 2012</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 8:</td>
<td colspan="2" class="diff-lineno">Line 8:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><div id="contentbox" style="text-align:justify;"></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><div id="contentbox" style="text-align:justify;"></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><img src="https://static.igem.org/mediawiki/igem.org/<del class="diffchange diffchange-inline">e</del>/<del class="diffchange diffchange-inline">ea</del>/<del class="diffchange diffchange-inline">Ethics</del>.jpg" align="middle" width="<del class="diffchange diffchange-inline">60</del>%"></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><img src="https://static.igem.org/mediawiki/igem.org/<ins class="diffchange diffchange-inline">8</ins>/<ins class="diffchange diffchange-inline">86</ins>/<ins class="diffchange diffchange-inline">Ethics2</ins>.jpg" align="middle" width="<ins class="diffchange diffchange-inline">100</ins>%"></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><p>Our ethics is divided in two parts</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><p>Our ethics is divided in two parts</div></td></tr>
</table>
Lizah
http://2012.igem.org/wiki/index.php?title=Team:TU-Delft/Ethics&diff=293211&oldid=prev
Ijacobs at 00:29, 27 October 2012
2012-10-27T00:29:01Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 00:29, 27 October 2012</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 29:</td>
<td colspan="2" class="diff-lineno">Line 29:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <tr></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <tr></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <th><a href="https://2012.igem.org/Team:TU-Delft/Ethics/Daan" target="_blank"> </div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <th><a href="https://2012.igem.org/Team:TU-Delft/Ethics/Daan" target="_blank"> </div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div> <img src="https://static.igem.org/mediawiki/igem.org/7/74/Daanheader.jpg" width="100%"/></a></th></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div> <img src="https://static.igem.org/mediawiki/igem.org/7/74/Daanheader.jpg" width="100%"/></a></th<ins class="diffchange diffchange-inline">></tr</ins>></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> </del><th><a href="https://2012.igem.org/Team:TU-Delft/Ethics/Rathenau" target="_blank"> </div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins class="diffchange diffchange-inline"> </ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins class="diffchange diffchange-inline"> <tr> </ins><th><a href="https://2012.igem.org/Team:TU-Delft/Ethics/Rathenau" target="_blank"> </div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <img src="https://static.igem.org/mediawiki/igem.org/2/28/Rathenauheader.jpg" width="100%"/></a></th></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <img src="https://static.igem.org/mediawiki/igem.org/2/28/Rathenauheader.jpg" width="100%"/></a></th></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> </tr></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> </tr></div></td></tr>
</table>
Ijacobs
http://2012.igem.org/wiki/index.php?title=Team:TU-Delft/Ethics&diff=293194&oldid=prev
Ijacobs at 00:28, 27 October 2012
2012-10-27T00:28:02Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 00:28, 27 October 2012</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 28:</td>
<td colspan="2" class="diff-lineno">Line 28:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><table id="tbtext"></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><table id="tbtext"></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <tr></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <tr></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> </del><th></<del class="diffchange diffchange-inline">th</del>></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins class="diffchange diffchange-inline"> </ins><th><<ins class="diffchange diffchange-inline">a href="https:</ins>/<ins class="diffchange diffchange-inline">/2012.igem.org/Team:TU-Delft/Ethics/Daan" target="_blank"</ins>> </div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> </del><<del class="diffchange diffchange-inline">th</del>><del class="diffchange diffchange-inline">Daan Schuurbiers</del></th></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins class="diffchange diffchange-inline"> </ins><<ins class="diffchange diffchange-inline">img src="https://static.igem.org/mediawiki/igem.org/7/74/Daanheader.jpg" width="100%"/></a</ins>></th></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div> <th><del class="diffchange diffchange-inline">Meeting of Young Minds</del></<del class="diffchange diffchange-inline">th</del>></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div> <th><<ins class="diffchange diffchange-inline">a href="https:</ins>/<ins class="diffchange diffchange-inline">/2012.igem.org/Team:TU-Delft/Ethics/Rathenau" target="_blank"</ins>> </div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> </del><<del class="diffchange diffchange-inline">th</del>></th></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins class="diffchange diffchange-inline"> </ins><<ins class="diffchange diffchange-inline">img src="https://static.igem.org/mediawiki/igem.org/2/28/Rathenauheader.jpg" width="100%"/></a</ins>></th></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> </tr></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> </tr></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> <tr></del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></table></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> <td></td></del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> <td><a href="https://2012.igem.org/Team:TU-Delft/Ethics/Daan" target="_blank"> </del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> <img src="https://static.igem.org/mediawiki/igem.org/1/17/Daan.png" height="130" width="140"/></a></td></del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> <td><a href="https://2012.igem.org/Team:TU-Delft/Ethics/Rathenau" target="_blank"> </del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> <img src="https://static.igem.org/mediawiki/igem.org/6/67/Rathenau1.jpg" height="130" width="140"/></a></td></del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> <td></td></del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> </tr></del></table></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></center></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></center></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
</table>
Ijacobs
http://2012.igem.org/wiki/index.php?title=Team:TU-Delft/Ethics&diff=293030&oldid=prev
Ijacobs at 00:18, 27 October 2012
2012-10-27T00:18:25Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 00:18, 27 October 2012</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 28:</td>
<td colspan="2" class="diff-lineno">Line 28:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><table id="tbtext"></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><table id="tbtext"></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <tr></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <tr></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div> <th>Daan Schuurbiers</th></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div> <ins class="diffchange diffchange-inline"><th></th></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins class="diffchange diffchange-inline"> </ins><th>Daan Schuurbiers</th></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <th>Meeting of Young Minds</th></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <th>Meeting of Young Minds</th></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> <th></th></ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> </tr></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> </tr></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <tr></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <tr></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> <td></td></ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <td><a href="https://2012.igem.org/Team:TU-Delft/Ethics/Daan" target="_blank"> </div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <td><a href="https://2012.igem.org/Team:TU-Delft/Ethics/Daan" target="_blank"> </div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <img src="https://static.igem.org/mediawiki/igem.org/1/17/Daan.png" height="130" width="140"/></a></td></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <img src="https://static.igem.org/mediawiki/igem.org/1/17/Daan.png" height="130" width="140"/></a></td></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <td><a href="https://2012.igem.org/Team:TU-Delft/Ethics/Rathenau" target="_blank"> </div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <td><a href="https://2012.igem.org/Team:TU-Delft/Ethics/Rathenau" target="_blank"> </div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <img src="https://static.igem.org/mediawiki/igem.org/6/67/Rathenau1.jpg" height="130" width="140"/></a></td></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <img src="https://static.igem.org/mediawiki/igem.org/6/67/Rathenau1.jpg" height="130" width="140"/></a></td></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> <td></td></ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> </tr></table></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> </tr></table></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></center></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></center></div></td></tr>
</table>
Ijacobs
http://2012.igem.org/wiki/index.php?title=Team:TU-Delft/Ethics&diff=293001&oldid=prev
Ijacobs at 00:16, 27 October 2012
2012-10-27T00:16:25Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 00:16, 27 October 2012</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 19:</td>
<td colspan="2" class="diff-lineno">Line 19:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>contribution was to make the team aware of the social sciences of the research. Which is so important for our potential tuberculosis</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>contribution was to make the team aware of the social sciences of the research. Which is so important for our potential tuberculosis</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>diagnosing method.</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>diagnosing method.</div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><br/></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins class="diffchange diffchange-inline"><br/></ins><br/></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>We also proposed a debate for the Meeting of Young Minds, organized by the Rathenau institute, on the first day of the Jamboree. We held</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>We also proposed a debate for the Meeting of Young Minds, organized by the Rathenau institute, on the first day of the Jamboree. We held</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>a debate about the H5N1 research and whether scientific research may be censored. With this debate we won the Meeting of Young Minds Award!</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>a debate about the H5N1 research and whether scientific research may be censored. With this debate we won the Meeting of Young Minds Award!</div></td></tr>
<tr><td colspan="2" class="diff-lineno">Line 33:</td>
<td colspan="2" class="diff-lineno">Line 33:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <tr></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <tr></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <td><a href="https://2012.igem.org/Team:TU-Delft/Ethics/Daan" target="_blank"> </div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <td><a href="https://2012.igem.org/Team:TU-Delft/Ethics/Daan" target="_blank"> </div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div> <img src="https://static.igem.org/mediawiki/igem.org/1/17/Daan.png" height="130" width="<del class="diffchange diffchange-inline">189</del>"/></a></td></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div> <img src="https://static.igem.org/mediawiki/igem.org/1/17/Daan.png" height="130" width="<ins class="diffchange diffchange-inline">140</ins>"/></a></td></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <td><a href="https://2012.igem.org/Team:TU-Delft/Ethics/Rathenau" target="_blank"> </div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <td><a href="https://2012.igem.org/Team:TU-Delft/Ethics/Rathenau" target="_blank"> </div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div> <img src="https://static.igem.org/mediawiki/igem.org/6/67/Rathenau1.jpg" height="130" width="<del class="diffchange diffchange-inline">189</del>"/></a></td></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div> <img src="https://static.igem.org/mediawiki/igem.org/6/67/Rathenau1.jpg" height="130" width="<ins class="diffchange diffchange-inline">140</ins>"/></a></td></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> </tr></table></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> </tr></table></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></center></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></center></div></td></tr>
</table>
Ijacobs
http://2012.igem.org/wiki/index.php?title=Team:TU-Delft/Ethics&diff=292973&oldid=prev
Ijacobs at 00:15, 27 October 2012
2012-10-27T00:15:16Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 00:15, 27 October 2012</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 12:</td>
<td colspan="2" class="diff-lineno">Line 12:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><p>Our ethics is divided in two parts</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><p>Our ethics is divided in two parts</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><ul></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><ul></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div> <li> <del class="diffchange diffchange-inline">Embedded </del>Humanist Daan Schuurbiers</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div> <li> <ins class="diffchange diffchange-inline">Our </ins>Humanist Daan Schuurbiers</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <li> Rathenau Debate 'Meeting of Young Minds'</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> <li> Rathenau Debate 'Meeting of Young Minds'</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></ul></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></ul></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"><br/></ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>We are working together with Daan Schuurbiers the director of a consultancy for responsible innovation. Daan's main</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>We are working together with Daan Schuurbiers the director of a consultancy for responsible innovation. Daan's main</div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div>contribution was to make the team aware of the social sciences of the research. <del class="diffchange diffchange-inline">That are </del>so important for our potential tuberculosis</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>contribution was to make the team aware of the social sciences of the research. <ins class="diffchange diffchange-inline">Which is </ins>so important for our potential tuberculosis</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>diagnosing method.</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>diagnosing method.</div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"><br/></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">We also proposed a debate for the Meeting of Young Minds, organized by the Rathenau institute, on the first day of the Jamboree. We held</ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">a debate about the H5N1 research and whether scientific research may be censored. With this debate we won the Meeting of Young Minds Award!</ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"><br/></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"><center></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"><h3>Please click on the photo's to see the project</h3></center></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"><table id="tbtext"></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> <tr></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> <th>Daan Schuurbiers</th></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> <th>Meeting of Young Minds</th></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> </tr></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> <tr></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> <td><a href="https://2012.igem.org/Team:TU-Delft/Ethics/Daan" target="_blank"> </ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> <img src="https://static.igem.org/mediawiki/igem.org/1/17/Daan.png" height="130" width="189"/></a></td></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> <td><a href="https://2012.igem.org/Team:TU-Delft/Ethics/Rathenau" target="_blank"> </ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> <img src="https://static.igem.org/mediawiki/igem.org/6/67/Rathenau1.jpg" height="130" width="189"/></a></td></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> </tr></table></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></center></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></p></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></p></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
</table>
Ijacobs
http://2012.igem.org/wiki/index.php?title=Team:TU-Delft/Ethics&diff=292590&oldid=prev
Ijacobs at 23:59, 26 October 2012
2012-10-26T23:59:39Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 23:59, 26 October 2012</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 8:</td>
<td colspan="2" class="diff-lineno">Line 8:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><div id="contentbox" style="text-align:justify;"></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><div id="contentbox" style="text-align:justify;"></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><img src="https://static.igem.org/mediawiki/igem.org/e/ea/Ethics.jpg" align="middle" width="<del class="diffchange diffchange-inline">100</del>%"></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><img src="https://static.igem.org/mediawiki/igem.org/e/ea/Ethics.jpg" align="middle" width="<ins class="diffchange diffchange-inline">60</ins>%"></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><p>Our ethics is divided in two parts</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><p>Our ethics is divided in two parts</div></td></tr>
</table>
Ijacobs