Merge pull request 'konuşma başlığını güncelledim' (#25) from mrtmrcbr/ozgurkon-site:derya-duzeltme into master

Reviewed-on: oyd/ozgurkon-site#25

content/_index.md

@@ -14,14 +14,16 @@ menu:
 <h2 id="may-16-17-2020" style="color: #c03e24">May 16-17, 2020</h2>
 <h3 id="online" style="color: #c03e24">Online!</h3>
 
-<a class="btn primary btn-lg" style="margin-top: 1em;" href="/ozgurkon-sponsor.pdf" target="_blank">Become a sponsor</a>
+<!-- <a class="btn primary btn-lg" style="margin-top: 1em;" href="/ozgurkon-sponsor.pdf" target="_blank">Become a sponsor</a>
 
 
 <a class="btn primary btn-lg" href="https://cfp.ozgurkon.org/ozgurfest2020">
     <svg class="icon icon-cfp"><use xlink:href="#cfp"></use></svg>Submit a presentation
+</a> -->
+<a class="btn primary btn-lg" href="/live">
+    <svg class="icon icon-live"><use xlink:href="#live"></use></svg>Watch live
 </a>
 
-
 {{% /jumbo %}}
 
 

content/_index.tr.md

@@ -13,13 +13,15 @@ menu:
 <h2 id="may-16-17-2020" style="color: #c03e24">16-17 Mayıs 2020</h2>
 <h3 id="online" style="color: #c03e24">Çevrimiçi!</h3>
 
-<a class="btn primary btn-lg" style="margin-top: 1em;" href="/ozgurkon-sponsor-tr.pdf" target="_blank">Sponsor olun</a>
+<!-- <a class="btn primary btn-lg" style="margin-top: 1em;" href="/ozgurkon-sponsor-tr.pdf" target="_blank">Sponsor olun</a>
 
 <a class="btn primary btn-lg" href="https://cfp.ozgurkon.org/ozgurfest2020">
     <svg class="icon icon-cfp"><use xlink:href="#cfp"></use></svg>Konuşma önerin
+</a> -->
+<a class="btn primary btn-lg" href="/live">
+    <svg class="icon icon-live"><use xlink:href="#live"></use></svg>Canlı izleyin
 </a>
 
-
 {{% /jumbo %}}
 
 <!-- ... -->

content/live/_index.md

@@ -0,0 +1,37 @@
+---
+title: Live
+draft: false
+---
+
+
+
+
+<!-- <script src="https://vjs.zencdn.net/7.7.6/video.js"></script>
+
+<div class="hero">
+  <video
+    id="ozgurkon-live"
+    class="video-js"
+    controls
+    preload="auto"
+    width="960"
+    height="540"
+    poster="/ozgurkon.jpg"
+    data-setup="{}" controls>
+  <source src="rtmp://live.ozgurkon.org:1936/live/live" type="rtmp/flv">
+    <p class="vjs-no-js">
+      To view this video please enable JavaScript, and consider upgrading to a
+      web browser that
+      <a href="https://videojs.com/html5-video-support/" target="_blank"
+        >supports HTML5 video</a
+      >
+    </p>
+  </video>
+</div>
+<script>
+<script>
+var player = videojs('ozgurkon-live');
+player.play();
+  player.hlsQualitySelector();
+</script> -->
+

content/live/_index.tr.md

@@ -0,0 +1,3 @@
+---
+title: Canlı
+---

content/sessions/_bager.md

@@ -1,6 +1,6 @@
 ---
-key: _bager
-title: TBA
+key: food-vs-hardware
+title: Healthy Food vs Healthy Software & Hardware
 id: 6E03tbU6L5w0IyjMi7yF
 language: English
 format: keynote
@@ -10,4 +10,4 @@ speakers:
   - bager
 draft: false
 ---
-TBA
+Personal, family and government nutrition strategies has developed amazingly in the last decades. These strategies are related to allergies, intolerance, diet or just being healthy. We need to understand how they have developed and look for similarities we can create for current software and hardware ecosystems.

content/sessions/event-sourcing.md

@@ -1,6 +1,6 @@
 ---
 key: event-sourcing
-title: Open Source Event Sourcing Framework
+title: Path to Event Sourcing with OpenSource Framework
 id: 6E03tbU6L5w0IyjMi7yF
 language: Turkish
 format: keynote

content/sessions/let-there-be-copies-tr.md

@@ -0,0 +1,16 @@
+---
+key: let-there-be-copies-tr
+title: "[TR] Let there be copies"
+id: 6E03tbU6L5w0IyjMi7yF
+language: English Turkish
+format: keynote
+tags:
+  - free-knowledge
+speakers:
+  - nevit
+draft: false
+---
+Let there be copies!
+
+There is no agreement on what exactly ought to be done, but it is certainly recognised that the current system is neither satisfactory nor sustainable.
+We have more questions than answers. We have to speak about it.

content/sessions/let-there-be-copies.md

@@ -1,6 +1,6 @@
 ---
 key: let-there-be-copies
-title: "Let there be copies"
+title: "[ENG] Let there be copies"
 id: 6E03tbU6L5w0IyjMi7yF
 language: English Turkish
 format: keynote

content/sessions/social-inequalities.md

@@ -5,7 +5,7 @@ id: 6E03tbU6L5w0IyjMi7yF
 language: English
 format: keynote
 tags:
-  - social-inequities
+  - social-inequalities
 speakers:
   - karen
 draft: false

content/sessions/unexpected-adventure.md

@@ -5,7 +5,7 @@ id: 6E03tbU6L5w0IyjMi7yF
 language: English
 format: keynote
 tags:
-  - free-information
+  - free-knowledge
 speakers:
   - ayse
 draft: false

content/sessions/wikipedia-gender-gaps.md

@@ -1,6 +1,6 @@
 ---
 key: wikipedia-gender-gaps
-title: Wikipedia’s gender gaps
+title: The relationship between a COVID-19 case study and Wikipedia's gender gaps
 id: 6E03tbU6L5w0IyjMi7yF
 language: English
 format: keynote

data/live.yml

@@ -0,0 +1,9 @@
+  - name: "Akgül"
+    url: "https://live.ozgurkon.org/live/show.m3u8"
+    navId: "akgul"
+  - name: "Uçkan"
+    url: "https://live.ozgurkon.org/live/show2.m3u8"
+    navId: "uckan"
+
+
+

data/schedule.yml

@@ -16,7 +16,7 @@
         - slot: slot-4
           talk: public_money_public_code
         - slot: slot-5
-          talk: decentralized-web
+          talk: Cancelled
         - slot: slot-6
           talk: societal-inequities
         - slot: slot-7
@@ -39,7 +39,7 @@
         - slot: slot-1
           talk: should-i-stay-or-go
         - slot: slot-2
-          talk: _bager
+          talk: food-vs-hardware
         - slot: slot-3
           talk: ozgurluk-celiskisi
         - slot: slot-4
@@ -57,7 +57,9 @@
     - room: room2
       slots:
         - slot: slot-1
-          talk: open-data
+          talk: decentralized-web
+        - slot: slot-2
+          talk: let-there-be-copies-tr
         - slot: slot-3
           talk: event-sourcing
         - slot: slot-4

static/api.json

@@ -0,0 +1,255 @@
+[
+ {
+   "id": "opening",
+   "speaker": [ "Aral Balkan" ],
+   "title": "Small Tech Foundation",
+   "talk": "Freedom in a time of pandemics",
+   "day": 0,
+   "start": "11:00",
+   "end": "11:50",
+   "lang": "eng",
+   "room": 0
+ },
+ {
+   "id": "d0s1",
+   "speaker": [ "Eylül Doğruel" ],
+   "title": "Independent Artist",
+   "talk": "At the crossroads of practice, education and advocacy: art with free software",
+   "day": 0,
+   "start": "12:00",
+   "end": "12:50",
+   "lang": "und",
+   "room": 0
+ },
+ {
+   "id": "d0s2",
+   "speaker": ["Pınar Yolum"],
+   "title": "Utrecht University",
+   "talk": "AI for preserving privacy",
+   "day": 0,
+   "start": "13:00",
+   "end": "13:50",
+   "lang": "eng",
+   "room": 0
+ },
+ {
+   "id": "d0s3",
+   "speaker": ["John Lubbock"],
+   "title": "Wikimedia UK",
+   "talk": "Surveillance regimes in the UK and Turkey, and how they are responding to the coronavirus",
+   "day": 0,
+   "start": "14:00",
+   "end": "14:50",
+   "lang": "eng",
+   "room": 0
+ },
+ {
+   "id": "d0s4",
+   "speaker": ["Alexander Sander"],
+   "title": "FSFE",
+   "talk": "Public Money Public Code – Global problems need global solutions!",
+   "day": 0,
+   "start": "15:00",
+   "end": "15:50",
+   "lang": "eng",
+   "room": 0
+ },
+ {
+   "id": "d0s5t0",
+   "speaker": ["Tan Siret Akıncı", "Maciaj Krüger"],
+   "title": "Mercode",
+   "talk": "The Absolute State of Decentralized Web compatibility in 2020: The good The Bad and The Ugly",
+   "day": 0,
+   "start": "16:00",
+   "end": "16:50",
+   "lang": "eng",
+   "room": 0
+ },
+ {
+   "id": "d0s5t1",
+   "speaker": ["Ayşe Bilge Gündüz"],
+   "title": "Computer Scientist",
+   "talk": "Unexpected Adventure of a Blog Post",
+   "day": 0,
+   "start": "16:00",
+   "end": "16:25",
+   "lang": "eng",
+   "room": 1
+ },
+ {
+   "id": "d0s5t1v2",
+   "speaker": ["Ayşe Bilge Gündüz", "Gülçin Yıldırım Jelinek"],
+   "title": "Kadın Yazılımcı",
+   "talk": "Kadın Yazılımcı nedir?",
+   "day": 0,
+   "start": "16:30",
+   "end": "17:55",
+   "lang": "eng",
+   "room": 1
+ },
+ {
+   "id": "d0s6",
+   "speaker": ["Karen Sandler"],
+   "title": "Software Freedom Conservancy",
+   "talk": "Societal inequities during COVID-19: Can free software help?",
+   "day": 0,
+   "start": "17:00",
+   "end": "17:50",
+   "lang": "eng",
+   "room": 0
+ },
+ {
+   "id": "d0s7",
+   "speaker": ["Rosie Stephenson-Goodknight"],
+   "title": "Wikimedia",
+   "talk": "Wikipedia's gender gaps",
+   "day": 0,
+   "start": "18:00",
+   "end": "18:50",
+   "lang": "eng",
+   "room": 0
+ },
+ {
+   "id": "d1s0",
+   "speaker": ["Chris Stephenson"],
+   "title": "Bilgi University",
+   "talk": "COVID-19, Özgür Yazılım, ama kimin özgürlüğü?",
+   "day": 1,
+   "start": "11:00",
+   "end": "11:50",
+   "lang": "tur",
+   "room": 0
+ },
+ {
+   "id": "d1s1t0",
+   "speaker": ["Gülçin Yıldırım Jelinek"],
+   "title": "DB and Software Automation Engineer",
+   "talk": "Should I stay or should I go?",
+   "day": 1,
+   "start": "12:00",
+   "end": "12:50",
+   "lang": "eng",
+   "room": 0
+ },
+ {
+   "id": "d1s1t1",
+   "speaker": ["Pınar Dağ"],
+   "title": "Kadir Has University",
+   "talk": "Open/Data in the time of COVID-19",
+   "day": 1,
+   "start": "12:00",
+   "end": "12:50",
+   "lang": "eng",
+   "room": 0
+ },
+ {
+   "id": "d1s2",
+   "speaker": ["Bager Akbay"],
+   "title": "Artist, Educator",
+   "talk": "Healthy Food vs Healthy Software & Hardware",
+   "day": 1,
+   "start": "13:00",
+   "end": "13:50",
+   "lang": "eng",
+   "room": 0
+ },
+ {
+   "id": "d1s3t0",
+   "speaker": ["Fatih Kadir Akın", "Uğur Arıcı", "Özcan Oğuz"],
+   "title": "Developer",
+   "talk": "Özgürlük Çelişkisi: Özgür Yazılım Kullanmamak, Özgür Yazılım Üretmekle Çelişir mi?",
+   "day": 1,
+   "start": "14:00",
+   "end": "14:50",
+   "lang": "tur",
+   "room": 0
+ },
+ {
+   "id": "d1s3t1",
+   "speaker": ["Derya Sezen"],
+   "title": "Kloia",
+   "talk": "Open Source Event Sourcing Framework",
+   "day": 1,
+   "start": "14:00",
+   "end": "14:50",
+   "lang": "eng",
+   "room": 1
+ },
+ {
+   "id": "d1s4t0",
+   "speaker": ["Bilge Narin"],
+   "title": "Hacı Bayram Veli University",
+   "talk": "Dijital eşitsizlikler",
+   "day": 1,
+   "start": "15:00",
+   "end": "15:50",
+   "lang": "tur",
+   "room": 0
+ },
+ {
+   "id": "d1s4t1",
+   "speaker": ["Nevit Dilmen"],
+   "title": "M.D",
+   "talk": "Let there be copies",
+   "day": 1,
+   "start": "15:00",
+   "end": "15:50",
+   "lang": "eng",
+   "room": 1
+ },
+ {
+   "id": "d1s5t0",
+   "speaker": ["Robert Call"],
+   "title": "LibreCMC",
+   "talk": "The network and things you don't control: The little black boxen at the edge of the galaxy",
+   "day": 1,
+   "start": "16:00",
+   "end": "16:50",
+   "lang": "eng",
+   "room": 0
+ },
+ {
+   "id": "d1s5t1",
+   "speaker": ["Dilan Çelik", "Orkut Murat Yılmaz"],
+   "title": "Yer Çizenler",
+   "talk": "Mapping for Everyone: Yer Çizenler",
+   "day": 1,
+   "start": "16:00",
+   "end": "16:50",
+   "lang": "eng",
+   "room": 0
+ },
+ {
+   "id": "d1s6t0",
+   "speaker": ["Netha Hussain"],
+   "title": "Wikimedia",
+   "talk": "How is the Wikipedia responding to COVID-19 crisis?",
+   "day": 1,
+   "start": "17:00",
+   "end": "17:50",
+   "lang": "eng",
+   "room": 0
+ },
+ {
+   "id": "d1s6t1",
+   "speaker": ["Behlül Çalışkan"],
+   "title": "New media researcher",
+   "talk": "What Is a Leak, Who Is a Whistleblower?",
+   "day": 1,
+   "start": "17:00",
+   "end": "17:50",
+   "lang": "eng",
+   "room": 1
+ },
+ {
+   "id": "closing",
+   "speaker": ["Gregory Engels"],
+   "title": "Pirate Parties International",
+   "talk": "Privacy issues in the aftermath of COVID-19",
+   "day": 1,
+   "start": "18:00",
+   "end": "19:00",
+   "lang": "eng",
+   "room": 0
+ }
+]