Skip to content

Commit 326ca40

Browse files
ialjaialja
committed
fixing minor merge conflict
2 parents 2e4eb34 + 18068e7 commit 326ca40

15 files changed

Lines changed: 39 additions & 10 deletions

File tree

‎resources/austria/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ <h3>Beginners</h3>
2222
<a href="https://www.touchdevelop.com/">TouchDevelop</a> lets you create apps on iPad, iPhone, Android, PC, Mac, Windows Phone. Our touch-friendly editor makes coding fun, even on your phone or tablet!
2323
Trainings dazu: <a href="https://www.touchdevelop.com/hourofcode2">https://www.touchdevelop.com/hourofcode2</a>.
2424
</li>
25+
<li><a href="http://www.codeavengers.com/javascript/9?l=de">Code Avengers JavaScript Tutorial</a> Die ersten Übungen werden die beibringen wie du ein einfaches „Quiz Spiel“ erstellst. Nach nur fünf Lektionen kannst du dieses bereits erstellen.</li>
2526
</ul>
2627

2728
<h3>Programmers</h3>

‎resources/cyprus/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<li><a href="http://www.ennovation.gr/">Ennovation 2014 (7ος Διεθνής Φοιτητικός Διαγωνισμός στην Ψηφιακή Επιχειρηματικότητα, Καινοτομία και το Ηλεκτρονικό Επιχειρείν) [open 31 May'14]</a></li>
2121
</ul>
2222
</li>
23+
<li><a href="http://www.codeavengers.com/javascript/17?l=el">Μάθε να φτιάχνεις ένα παιχνίδι με την Code Avengers</a> Σε αυτή την 40λεπτη εισαγωγή, θα χρησμοποιήσεις την JavaScript έτσι ώστε να φτιάξεις ένα παιχνίδι το οποίο θα μπορείς να μοιραστείς με τους φίλους σου.</li>
2324
</ul>
2425

2526
<p>Know any other resources? <a href="mailto:{{site.contact.email}}">Send us an email</a> or add links to this page with a <a href="https://github.com/codeeu/codeeu.github.io">Pull request on GitHub</a>!</p>

‎resources/denmark/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<li><a href="http://www.kodeklub.cfdp.dk/">Kodeklub</a> - learn to code using free and visually intuitive tools</a></li>
99
<li><a href="https://docs.google.com/a/okfn.org/spreadsheets/d/1uXvSZWBy-IcWOl0LlUG_2-SxQJzsLOobf2ZddP85GIQ/edit#gid=0">Programmering i skolen</a> - independently produced list of grade schools doing coding-activities (still being expanded, work in progress - join in!)</a></li>
1010
<li><a href="https://docs.google.com/a/okfn.org/document/d/1QyQ5Tm4XEHpizRvju3RBytGsMv6Qv0OM-Gw6cZhXdTU/edit#">Programmering i skolen, projektidé - by <a href="https://twitter.com/mathiaspoulsen">@mathiaspoulsen</a> and <a href="http://twitter.com/mosgaard">@mosgaard</a></a> - grade school teachers planning potential Codeweek activities (work in progress - join in!)</a></li>
11+
<li><a href="http://www.codeavengers.com/javascript/17?l=da">Lær at bygge et spil med Code Avengers</a> I denne 40 minutters introduktion vil du komme til at bruge JavaScript til at bygge et spil som du kan dele med dine venner.</li>
1112
</ul>
1213

1314
<p>Know any other resources? <a href="mailto:{{site.contact.email}}">Send us an email</a> or add links to this page with a <a href="https://github.com/codeeu/codeeu.github.io">Pull request on GitHub</a>!</p>

‎resources/germany/index.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
<li><a href="http://jeder-kann-programmieren.de/">Jeder kann Programmieren</a> - Hier entsteht eine riesige online Plattform, die Coding anhand von Tutorials spielerisch vermitteln will und deutsche Linksammlungen aufbaut.</li>
1717

1818
<li><a href="https://www.allcancode.com/">Allcancode</a> - dieses Computspiel führt euch ans Programmieren heran - in den nächsten Tagen gibt es eine deutsche Version!</li>
19+
1920
<li><a href="http://django-marcador.keimlink.de/de/">django-marcador</a> - ein freies Django Tutorial für Einsteiger</li>
21+
22+
<li><a href="http://www.codeavengers.com/javascript/9?l=de">Code Avengers JavaScript Tutorial</a> Die ersten Übungen werden die beibringen wie du ein einfaches „Quiz Spiel“ erstellst. Nach nur fünf Lektionen kannst du dieses bereits erstellen.</li>
2023
</ul>
2124

2225
<p>Know any other resources? <a href="mailto:{{site.contact.email}}">Send us an email</a> or add links to this page with a <a href="https://github.com/codeeu/codeeu.github.io">Pull request on GitHub</a>!</p>

‎resources/greece/index.html‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,10 @@ <h3>Γενικό υλικό</h3>
6767
<li><a href="http://algo.pk/">algo.pk</a>, μία πλατφόρμα με ασκήσεις και προβλήματα στους αλγόριθμους για προγραμματισμό με τον διερμηνευτή του <a href="http://www.pseudoglossa.gr/">pseudoglossa.gr</a></li>
6868
<li><a href="http://lyk-tragaias.mysch.gr/lightbot/">Lightbot</a>, το παιχνίδι προγραμματισμού lightbot μεταφρασμένο στα Ελληνικά, με επιπλέον πίστες</li>
6969
</ul>
70-
70+
71+
<h3>Code Avengers</h3>
72+
<ul>
73+
<li><a href="http://www.codeavengers.com/javascript/17?l=el">Μάθε να φτιάχνεις ένα παιχνίδι με την Code Avengers</a> Σε αυτή την 40λεπτη εισαγωγή, θα χρησμοποιήσεις την JavaScript έτσι ώστε να φτιάξεις ένα παιχνίδι το οποίο θα μπορείς να μοιραστείς με τους φίλους σου.</li>
74+
</ul>
75+
7176
<p>Know any other resources? <a href="mailto:{{site.contact.email}}">Send us an email</a> or add links to this page with a <a href="https://github.com/codeeu/codeeu.github.io">Pull request on GitHub</a>!</p>

‎resources/hungary/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<li><a href="http://scratch.inf.elte.hu/"> Az ELTE Scratch oldala:</a></li>
99
<li><a href="http://www.kodumuhely.hu/">Koduműhely</a></li>
1010
<li><a href="http://www.amcham.hu/download/002/556/Robotkonyv_KR_BZS.pdf">Egyszerű robotika - magyar nyelvű ingyenes könyv</a></li>
11+
<li><a href="http://www.codeavengers.com/javascript/9?l=hu">Code Avengers JavaScript Tutorial</a> Ez az útmutató megtanítja neked, hogyan csinálj egy JavaScript quiz játékot 5 rövid leckében.</li>
1112
</ul>
1213

1314
<p>Know any other resources? <a href="mailto:{{site.contact.email}}">Send us an email</a> or add links to this page with a <a href="https://github.com/codeeu/codeeu.github.io">Pull request on GitHub</a>!</p>

‎resources/kosovo/index.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
title: Kosovo
44
---
55

6+
<h2>Code Avengers</h2>
67
<ul>
7-
<li>No resources added yet.</li>
8+
<li><a href="http://www.codeavengers.com/javascript/9?l=sr">JavaScript туториал</a> У овом туториалу научићете како да на JavaScript-у направите квиз у 5 кратких лекција.</li>
89
</ul>
910

1011
<p>Know any other resources? <a href="mailto:{{site.contact.email}}">Send us an email</a> or add links to this page with a <a href="https://github.com/codeeu/codeeu.github.io">Pull request on GitHub</a>!</p>

‎resources/lithuania/index.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
title: Lithuania
44
---
55

6+
<h2>Code Avengers</h2>
67
<ul>
7-
<li>No resources added yet.</li>
8+
<li><a href="http://www.codeavengers.com/javascript/9?l=lt">Javascript programavimo valanda</a> Šiose pamokose mokinsimės, kaip su JavaScript sukurti viktorinos žaidimą per 5 trumpas pamokas.</li>
89
</ul>
910

1011
<p>Know any other resources? <a href="mailto:{{site.contact.email}}">Send us an email</a> or add links to this page with a <a href="https://github.com/codeeu/codeeu.github.io">Pull request on GitHub</a>!</p>

‎resources/moldova/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
layout: resource
33
title: Moldova
44
---
5-
5+
<h2>Code Avengers</h2>
66
<ul>
7-
<li>No resources added yet.</li>
7+
<li><a href="http://www.codeavengers.com/javascript/17?l=ro">Învață să faci un joc cu Code Avengers</a> În aceasta lecție introductivă de 40 de minute vei folosi JavaScript pentru a construi un joc pe care îl poți împărți cu prietenii tăi.</li>
88
</ul>
99

1010
<p>Know any other resources? <a href="mailto:{{site.contact.email}}">Send us an email</a> or add links to this page with a <a href="https://github.com/codeeu/codeeu.github.io">Pull request on GitHub</a>!</p>

‎resources/romania/index.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,10 @@ <h2>Resurse în limba română</h2>
1111
<li><a href="http://thor.info.uaic.ro/~acf/java/Cristian_Frasinaru-Curs_practic_de_Java.pdf">Curs practic de Java</a> scrisă de Cristian Frăsinaru este o lucrare de referinţă în limba română şi poate fi salvată direct de la acest link.
1212
</li>
1313
</ul>
14+
15+
<h2>Code Avengers</h2>
16+
<ul>
17+
<li><a href="http://www.codeavengers.com/javascript/17?l=ro">Învață să faci un joc cu Code Avengers</a> În aceasta lecție introductivă de 40 de minute vei folosi JavaScript pentru a construi un joc pe care îl poți împărți cu prietenii tăi.</li>
18+
</ul>
1419

1520
<p>Know any other resources? <a href="mailto:{{site.contact.email}}">Send us an email</a> or add links to this page with a <a href="https://github.com/codeeu/codeeu.github.io">Pull request on GitHub</a>!</p>

0 commit comments

Comments
 (0)