diff --git a/content/sessions/_index.md b/content/sessions/_index.md
index 7c3fe10..751e6f7 100644
--- a/content/sessions/_index.md
+++ b/content/sessions/_index.md
@@ -4,13 +4,9 @@ menu:
main:
weight: 30
-talkType: "nop"
draft: false
---
{{% hero %}}
-
-
-{{% /hero %}}
-
+{{% /hero %}}
\ No newline at end of file
diff --git a/content/sessions/_index.tr.md b/content/sessions/_index.tr.md
index 4a35ce6..55335ab 100644
--- a/content/sessions/_index.tr.md
+++ b/content/sessions/_index.tr.md
@@ -4,12 +4,9 @@ menu:
main:
weight: 30
-talkType: "nop"
draft: false
---
{{% hero %}}
-
-
-{{% /hero %}}
+{{% /hero %}}
\ No newline at end of file
diff --git a/content/sessions/after.md b/content/sessions/after.md
new file mode 100644
index 0000000..acce297
--- /dev/null
+++ b/content/sessions/after.md
@@ -0,0 +1,11 @@
+---
+key: after
+title: After Party
+id: 6E03tbU6L5w0IyjMi7yF
+language: English
+format: opening
+tags:
+ - after-party
+draft: false
+---
+Lets have fun together
\ No newline at end of file
diff --git a/content/sessions/alper.md b/content/sessions/alper.md
index 5e931af..da16849 100644
--- a/content/sessions/alper.md
+++ b/content/sessions/alper.md
@@ -3,9 +3,9 @@ key: alper
title: "İstanbul'un İmece Bilgisayar Ağı: Freifunk Istanbul"
id: 6E03tbU6L5w0IyjMi7yF
language: Turkish
-format: keynote
+format: short-talk
tags:
- - freedom
+ - decentralization
speakers:
- alper-atmaca
draft: false
diff --git a/content/sessions/ayse-gulcin.md b/content/sessions/ayse-gulcin.md
index 4d7ecb2..8e0e61e 100644
--- a/content/sessions/ayse-gulcin.md
+++ b/content/sessions/ayse-gulcin.md
@@ -3,9 +3,9 @@ key: ayse-gulcin
title: "İyi bir yazılımcı olursanız belki bir gün şirinleri bile görebilir misiniz?"
id: 6E03tbU6L5w0IyjMi7yF
language: Turkish
-format: keynote
+format: talk
tags:
- - freedom
+ - equality
speakers:
- ayse
- gulcin
diff --git a/content/sessions/aysuda.md b/content/sessions/aysuda.md
index d99e2e7..f5b64a6 100644
--- a/content/sessions/aysuda.md
+++ b/content/sessions/aysuda.md
@@ -3,9 +3,9 @@ key: aysuda
title: "School Closures and Social Inequality during the Pandemic"
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: talk
tags:
- - freedom
+ - academic
speakers:
- aysuda-kolemen
draft: false
diff --git a/content/sessions/eylul.md b/content/sessions/eylul.md
index f783992..a0a4b88 100644
--- a/content/sessions/eylul.md
+++ b/content/sessions/eylul.md
@@ -3,9 +3,9 @@ key: eylul
title: "Teaching the art with the FLOSS - teaching photography using FLOSS tools with the culture"
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: talk
tags:
- - freedom
+ - free-art
speakers:
- eylul-dogruel
draft: false
diff --git a/content/sessions/gokce-basbug.md b/content/sessions/gokce-basbug.md
index b4a6ecd..85f9bef 100644
--- a/content/sessions/gokce-basbug.md
+++ b/content/sessions/gokce-basbug.md
@@ -3,9 +3,9 @@ key: gokce
title: "Why Covid Vaccine should be a people's vaccine?"
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: short-talk
tags:
- - free-health
+ - covid
speakers:
- gokce-basbug
draft: false
diff --git a/content/sessions/greg.md b/content/sessions/greg.md
index 0005293..59e1b3f 100644
--- a/content/sessions/greg.md
+++ b/content/sessions/greg.md
@@ -3,9 +3,9 @@ key: greg
title: "DRM, EME, and your freedom"
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: talk
tags:
- - freedom
+ - drm
speakers:
- greg-farough
draft: false
diff --git a/content/sessions/kathy.md b/content/sessions/kathy.md
index 945b4c7..87514fd 100644
--- a/content/sessions/kathy.md
+++ b/content/sessions/kathy.md
@@ -3,9 +3,9 @@ key: kathy
title: "Do more with microcontrollers -- MicroBlocks makes it easier for everyone!"
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: short-talk
tags:
- - freedom
+ - edu
speakers:
- kathy-giori
draft: false
diff --git a/content/sessions/libregc.md b/content/sessions/libregc.md
index 01d0cb1..ef998c4 100644
--- a/content/sessions/libregc.md
+++ b/content/sessions/libregc.md
@@ -1,13 +1,13 @@
---
-key: libregc
+key: libregraphic
title: "Q&A with Libre Graphics Club/CEL"
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: panel
tags:
- - freedom
+ - free-art
speakers:
- - libre-graphics-club
+ - libregc
draft: false
---
LIBRE GRAPHICS CLUB (LGC) is a collaboratively created website and an online repository of teaching-learning materials about Free Software for graphics and visual communication.
diff --git a/content/sessions/mola.md b/content/sessions/mola.md
deleted file mode 100644
index c2fec68..0000000
--- a/content/sessions/mola.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-key: break
-title: Coffee break
-id: 6E03tbU6L5w0IyjMi7yF
-language: English
-format: keynote
-tags:
- - break
-speakers:
- - ozcan
-draft: false
----
-Break
\ No newline at end of file
diff --git a/content/sessions/nesli-ugurcan.md b/content/sessions/nesli-ugurcan.md
index 398ffb2..ce1c5b9 100644
--- a/content/sessions/nesli-ugurcan.md
+++ b/content/sessions/nesli-ugurcan.md
@@ -3,9 +3,9 @@ key: nesli-ugurcan
title: "Cancellasak da mı saklasak?"
id: 6E03tbU6L5w0IyjMi7yF
language: Turkish
-format: keynote
+format: talk
tags:
- - freedom
+ - equality
speakers:
- neslihan-turan
- ugurcan-ergun
diff --git a/content/sessions/onur-arslan.md b/content/sessions/onur-arslan.md
index 2d56d40..5e7520d 100644
--- a/content/sessions/onur-arslan.md
+++ b/content/sessions/onur-arslan.md
@@ -3,9 +3,9 @@ key: onur
title: "Academic Freedom and Universities in Turkey"
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: short-talk
tags:
- - freedom
+ - academic
speakers:
- onur-arslan
draft: false
diff --git a/content/sessions/open.md b/content/sessions/open.md
index 2323484..8f3d85a 100644
--- a/content/sessions/open.md
+++ b/content/sessions/open.md
@@ -3,11 +3,9 @@ key: open
title: Opening talk
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: opening
tags:
- opening
-speakers:
- - ozcan
draft: false
---
Opening talk of ÖzgürKon 2021
\ No newline at end of file
diff --git a/content/sessions/ozcan-ugur.md b/content/sessions/ozcan-ugur.md
index 700eb47..eeca5fb 100644
--- a/content/sessions/ozcan-ugur.md
+++ b/content/sessions/ozcan-ugur.md
@@ -3,9 +3,9 @@ key: ozcan-ugur
title: "Özgür yazılımlardan nasıl para kazanılır?"
id: 6E03tbU6L5w0IyjMi7yF
language: Turkish
-format: keynote
+format: talk
tags:
- - freedom
+ - experience-sharing
speakers:
- ozcan-oguz
- ugur-arici
diff --git a/content/sessions/ozgur.md b/content/sessions/ozgur.md
index e046607..ef87dcc 100644
--- a/content/sessions/ozgur.md
+++ b/content/sessions/ozgur.md
@@ -3,9 +3,9 @@ key: ozgur
title: "GNU Taler: the electronic equivalent of coin"
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: short-talk
tags:
- - freedom
+ - decentralization
speakers:
- ozgur-kesim
draft: false
diff --git a/content/sessions/pinar-dag.md b/content/sessions/pinar-dag.md
index 4db914d..db535bb 100644
--- a/content/sessions/pinar-dag.md
+++ b/content/sessions/pinar-dag.md
@@ -3,9 +3,9 @@ key: pinar
title: "Open Data in the Time of Coronavirus (COVID-19)"
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: short-talk
tags:
- - freedom
+ - covid
speakers:
- pinar-dag
draft: false
diff --git a/content/sessions/pouhiou.md b/content/sessions/pouhiou.md
index 77b7f0b..00cbc88 100644
--- a/content/sessions/pouhiou.md
+++ b/content/sessions/pouhiou.md
@@ -3,9 +3,9 @@ key: framasoft
title: "We (try to) Dégoogleify The Internet, Ask Us Anything!"
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: talk
tags:
- - freedom
+ - privacy
speakers:
- pouhiou
draft: false
diff --git a/content/sessions/rima.md b/content/sessions/rima.md
index 9f37d4b..14b2e6a 100644
--- a/content/sessions/rima.md
+++ b/content/sessions/rima.md
@@ -3,9 +3,9 @@ key: rima
title: "Building Solidarity-centered community spaces and building new models of care and safety in uncertain times: Wisdom from Team CommUNITY"
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: talk
tags:
- - freedom
+ - equality
speakers:
- rima-sghaier
draft: false
diff --git a/content/sessions/seckin.md b/content/sessions/seckin.md
index 6e16640..f914490 100644
--- a/content/sessions/seckin.md
+++ b/content/sessions/seckin.md
@@ -3,9 +3,9 @@ key: seckin
title: "Equal oppurtunities in chess education and accessibility"
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: short-talk
tags:
- - freedom
+ - accessibility
speakers:
- seckin-serpil
draft: false
diff --git a/content/sessions/sezi-ecenur.md b/content/sessions/sezi-ecenur.md
index 4e662fa..c73e323 100644
--- a/content/sessions/sezi-ecenur.md
+++ b/content/sessions/sezi-ecenur.md
@@ -3,14 +3,14 @@ key: sezi-ecenur
title: "Becoming Newbie"
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: short-talk
tags:
- - freedom
+ - experience-sharing
speakers:
- ecenur-can
- selin-sezi-elevli
draft: false
---
-We have not smelt soldier when we were child or when we were child we didn't have "commodore 64". We're just newbies.
+We have not smelt solder when we were child or when we were child we didn't have "commodore 64". We're just newbies.
As two newbies, we're going to talk our journey in this session. How we became newbies, how we've faced to challenges. How we decided to interested in free software also included in this session.
\ No newline at end of file
diff --git a/content/sessions/sumana.md b/content/sessions/sumana.md
index 54f524e..7327765 100644
--- a/content/sessions/sumana.md
+++ b/content/sessions/sumana.md
@@ -3,9 +3,9 @@ key: sumana
title: "Stand-up comedy about FLOSS"
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: short-talk
tags:
- - freedom
+ - entertaining
speakers:
- sumana-harihareswara
draft: false
diff --git a/content/sessions/webber.md b/content/sessions/webber.md
index 66105c3..6314a3b 100644
--- a/content/sessions/webber.md
+++ b/content/sessions/webber.md
@@ -3,11 +3,12 @@ key: webber
title: "Building Blocks for Crafting Freedom"
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: talk
tags:
- - freedom
+ - entertaining
speakers:
- morgan-lemmer-webber
+ - chris-lemmer-webber
draft: false
---
Chris and Morgan Lemmer-Webber, co-hosts of the podcast FOSS and Crafts, discuss how limiting access to the foundational elements of any skillset limits our ability to create and our freedom of expression.
diff --git a/content/sessions/yer-cizenler.md b/content/sessions/yer-cizenler.md
index 5e7a72b..268cc8f 100644
--- a/content/sessions/yer-cizenler.md
+++ b/content/sessions/yer-cizenler.md
@@ -3,11 +3,13 @@ key: yer-cizenler
title: "Free and Open Mapping Tools in Emergencies"
id: 6E03tbU6L5w0IyjMi7yF
language: English
-format: keynote
+format: short-talk
tags:
- - freedom
+ - accessibility
speakers:
- can-unen
+ - orkut-murat
+ - oguzhan-er
draft: false
---
This talk will cover the utilization of open geospatial data collection and management tools in emergency situations, emphasising the significance of the coordination between national and international actors and open mapping communities. The case to be presented will be the community-driven data efforts following the Aegean Sea Earthquake in October 2020.
diff --git a/content/speakers/_index.md b/content/speakers/_index.md
index e57c4c2..56a7d1d 100644
--- a/content/speakers/_index.md
+++ b/content/speakers/_index.md
@@ -9,10 +9,6 @@ draft: false
{{% hero %}}
-
- Submit a presentation
-
-
{{% /hero %}}
diff --git a/content/speakers/_index.tr.md b/content/speakers/_index.tr.md
index 1fecb4c..dd85dc9 100644
--- a/content/speakers/_index.tr.md
+++ b/content/speakers/_index.tr.md
@@ -9,8 +9,4 @@ draft: false
{{% hero %}}
-
- Konuşma önerin
-
-
{{% /hero %}}
diff --git a/content/speakers/alper-atmaca.md b/content/speakers/alper-atmaca.md
new file mode 100644
index 0000000..3541ffc
--- /dev/null
+++ b/content/speakers/alper-atmaca.md
@@ -0,0 +1,9 @@
+---
+key: alper-atmaca
+name: Alper Atmaca
+id: D1UJEdrxhHQowlM2LoIusKF26ir2
+feature: true
+company: 'Lawyer'
+city: 'Istanbul, Turkey'
+photoURL: /2021/images/speakers/alper_atmaca.jpg
+---
\ No newline at end of file
diff --git a/content/speakers/ayse-bilge-gunduz.md b/content/speakers/ayse.md
similarity index 91%
rename from content/speakers/ayse-bilge-gunduz.md
rename to content/speakers/ayse.md
index 26e9ca3..e49ca5a 100644
--- a/content/speakers/ayse-bilge-gunduz.md
+++ b/content/speakers/ayse.md
@@ -5,7 +5,7 @@ id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
company: 'Scientist'
city: 'Istanbul, Turkey'
-photoURL: /images/speakers/aysebilge.jpeg
+photoURL: /2021/images/speakers/aysebilge.jpeg
socials:
- icon: twitter
link: 'https://twitter.com/abilgegunduz'
diff --git a/content/speakers/aysuda-kolemen.md b/content/speakers/aysuda-kolemen.md
index 94d972d..8b7f45a 100644
--- a/content/speakers/aysuda-kolemen.md
+++ b/content/speakers/aysuda-kolemen.md
@@ -4,7 +4,7 @@ name: Aysuda Kölemen
id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
company: 'Academician'
-photoURL: /images/speakers/aysuda.jpg
+photoURL: /2021/images/speakers/aysuda.jpg
city: 'Istanbul, Turkey'
socials:
- link: 'https://twitter.com/camusyarari'
diff --git a/content/speakers/can-unen.md b/content/speakers/can-unen.md
index bd299ac..4669cfc 100644
--- a/content/speakers/can-unen.md
+++ b/content/speakers/can-unen.md
@@ -4,11 +4,8 @@ name: Can Ünen
id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
company: 'Yer Çizenler'
-photoURL: /images/speakers/can.jpg
+photoURL: /2021/images/speakers/can.jpg
city: 'Istanbul, Turkey'
-socials:
- - link: 'https://twitter.com/camusyarari'
- name: Twitter
---
Has bachelor's degree in civil engineering and doctorate in geomatics. Currently a lecturer at MEF University. Member of the OpenStreetMap community since 2012. Founding member of Yer Çizenler, and the chair of board since 2018. Also a voting member of Humanitarian Openstreetmap Team (HOT) and associate member of the Openstreetmap Foundation (OSMF).
diff --git a/content/speakers/chris-lemmer-webber.md b/content/speakers/chris-lemmer-webber.md
new file mode 100644
index 0000000..c5b9688
--- /dev/null
+++ b/content/speakers/chris-lemmer-webber.md
@@ -0,0 +1,14 @@
+---
+key: chris-lemmer-webber
+name: Chris Lemmer-Webber
+id: D1UJEdrxhHQowlM2LoIusKF26ir2
+feature: true
+company: 'Developer'
+city: 'USA'
+photoURL: /2021/images/speakers/christopher_lemmer-webber.png
+socials:
+ - icon: twitter
+ link: 'https://twitter.com/dustyweb'
+ name: dustyweb
+---
+Christopher Lemmer Webber is a long-time user freedom advocate. Their degree in interdisciplinary humanities with a focus on philosophy and ethics has informed their approach to free and open source software and free culture. They are mostly known for their work co-authoring and co-editing the ActivityPub distributed social network protocol. In previous times of their life they worked as tech lead at Creative Commons, co-founded MediaGoblin, started and ran the Liberated Pixel Cup, and kicked off the work on CC BY-SA 4.0 and GPL compatibility. These days their primary work is on Spritely, a project to improve the security of federated social networks and bridge them with virtual worlds. When they aren't programming, they enjoy cooking, sketching, and making ASCII art.
\ No newline at end of file
diff --git a/content/speakers/ecenur-can.md b/content/speakers/ecenur-can.md
index 84d5f4b..74f1c1a 100644
--- a/content/speakers/ecenur-can.md
+++ b/content/speakers/ecenur-can.md
@@ -4,7 +4,7 @@ name: Ecenur Can
id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
company: 'Student'
-photoURL: /images/speakers/ecenur.jpg
+photoURL: /2021/images/speakers/ecenur.jpg
city: 'Istanbul, Turkey'
socials:
- link: 'https://twitter.com/ecenur_can'
diff --git a/content/speakers/eylul-dogruel.md b/content/speakers/eylul-dogruel.md
index 7de36cc..05c51d0 100644
--- a/content/speakers/eylul-dogruel.md
+++ b/content/speakers/eylul-dogruel.md
@@ -5,7 +5,7 @@ id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
company: 'Artist'
city: 'Istanbul, Turkey'
-photoURL: /images/speakers/eylyl.jpg
+photoURL: /2021/images/speakers/eylyl.jpg
socials:
- icon: twitter
link: 'https://www.twitter.com/eyluldogruel'
diff --git a/content/speakers/gokce-basbug.md b/content/speakers/gokce-basbug.md
index a748f04..642e5a5 100644
--- a/content/speakers/gokce-basbug.md
+++ b/content/speakers/gokce-basbug.md
@@ -5,10 +5,10 @@ id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
company: 'Academician'
city: 'Seoul, South Korea'
-photoURL: /images/speakers/gokce.jpg
+photoURL: /2021/images/speakers/gokce.jpg
socials:
- icon: twitter
- link: 'https://www.twitter.com/eyluldogruel'
- name: eyluldogruel
+ link: 'https://www.twitter.com/BasbugGokce'
+ name: BasbugGokce
---
Gokce Basbug is an Assistant Professor at Sungkyunkwan University in Seoul, South Korea. He completed his Ph.D. at the MIT Sloan School of Management. His research focuses on work and organizations.
diff --git a/content/speakers/greg-farough.md b/content/speakers/greg-farough.md
index 25c4f58..db50107 100644
--- a/content/speakers/greg-farough.md
+++ b/content/speakers/greg-farough.md
@@ -5,6 +5,6 @@ id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
company: 'Defective by Design'
city: 'Boston, USA'
-photoURL: /images/speakers/greg.jpg
+photoURL: /2021/images/speakers/greg.jpg
---
Greg Farough is the campaigns manager of the Free Software Foundation, a nonprofit that advocates every computer user's basic right to software that respects their freedom. They have been an active participant in the free software movement from the ripe age of sixteen, and have previously worked as a goat herder, union organizer, and tutor of Attic Greek.
diff --git a/content/speakers/gulcin-yildirim-jelinek.md b/content/speakers/gulcin.md
similarity index 95%
rename from content/speakers/gulcin-yildirim-jelinek.md
rename to content/speakers/gulcin.md
index ccba136..bb47d20 100644
--- a/content/speakers/gulcin-yildirim-jelinek.md
+++ b/content/speakers/gulcin.md
@@ -5,7 +5,7 @@ id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
company: 'DevOps Engineer'
city: 'Prague, Czechia'
-photoURL: /images/speakers/gulcin.jpeg
+photoURL: /2021/images/speakers/gulcin.jpeg
socials:
- icon: twitter
link: 'https://twitter.com/apatheticmagpie'
diff --git a/content/speakers/kathy-giori.md b/content/speakers/kathy-giori.md
index 16fae2c..3bb5759 100644
--- a/content/speakers/kathy-giori.md
+++ b/content/speakers/kathy-giori.md
@@ -5,10 +5,10 @@ id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
company: 'Hardware hacker'
city: 'San Francisco, USA'
-photoURL: /images/speakers/kathy.jpeg
+photoURL: /2021/images/speakers/kathy.jpeg
socials:
- icon: twitter
- link: 'https://twitter.com/apatheticmagpie'
- name: apatheticmagpie
+ link: 'https://twitter.com/kgiori'
+ name: kgiori
---
Kathy fills her desk with hardware, especially microcontroller boards that can be programmed using MicroBlocks, a learning tool for physical computing. While at Mozilla, she worked on the WebThings Project, which complements MicroBlocks to enable learners to build their own "Internet of Things" (IoT) devices and manage them over the web. Prior to Mozilla, she held senior roles at Arduino, Qualcomm Atheros, a few startups, and more. She is super keen on equity of access to all students across the globe to obtain a good STEM education. She received her bachelor's degree in Electrical Engineering from the University of Minnesota, and her master's in EE from Stanford University. When not at a computer, she can usually be found exploring the great outdoors of northern California.
diff --git a/content/speakers/libregc.md b/content/speakers/libregc.md
new file mode 100644
index 0000000..f748cb7
--- /dev/null
+++ b/content/speakers/libregc.md
@@ -0,0 +1,13 @@
+---
+key: libregc
+name: Libre Graphic Club
+id: D1UJEdrxhHQowlM2LoIusKF26ir2
+feature: true
+city: 'New York City, USA'
+photoURL: /2021/images/speakers/LGC_team.jpg
+---
+LIBRE GRAPHICS CLUB (LGC) is a collaboratively created website and an online repository of teaching-learning materials about Free Software for graphics and visual communication.
+
+The idea was conceived in 2013 after one of the LGC members joined Libre Graphics Meeting in Madrid and had met already mature community of software developers, artist and designers using the software and creating their own. As evidenced in this sound-bite: “The very close interaction among developers with artists and designers is priceless. The opportunity to exchange ideas with other project leaders and programmers focused on graphics is something that you can’t find in other event around the world.” Gustav Gonzalez, Tupi Project; the event left a strong impression and led to long list of baby steps leading to this platform.
+
+Funded by the Arts Council England, this iteration is focused on development and delivery of pilot programme of online sessions form April to August 2021, focusing on artists, community organisers and activists who may be interested in expanding their digital tool-set for graphics and visual communication.
\ No newline at end of file
diff --git a/content/speakers/morgan-webber.md b/content/speakers/morgan-lemmer-webber.md
similarity index 86%
rename from content/speakers/morgan-webber.md
rename to content/speakers/morgan-lemmer-webber.md
index 5577e87..a7116eb 100644
--- a/content/speakers/morgan-webber.md
+++ b/content/speakers/morgan-lemmer-webber.md
@@ -5,10 +5,10 @@ id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
company: 'Academician, Art historian'
city: 'USA'
-photoURL: /images/speakers/morgan.png
+photoURL: /2021/images/speakers/morgan.png
socials:
- icon: twitter
- link: 'https://twitter.com/apatheticmagpie'
- name: apatheticmagpie
+ link: 'https://twitter.com/mlemweb'
+ name: mlemweb
---
Morgan Lemmer-Webber is an art historian, avid crafter, and FOSS user and advocate. She has a PhD in Art History from the University of Wisconsin, Madison. A lifelong exploration of various handcrafts and media inspired her dissertation research on women and textile production in the Roman empire. Morgan is also interested in the intersection of FOSS and academia, particularly in the context of digital humanities research. She built the original digitization of the William Ramsay ledger as a custom static site generator in Python.
diff --git a/content/speakers/neslihan-turan.md b/content/speakers/neslihan-turan.md
new file mode 100644
index 0000000..edb5977
--- /dev/null
+++ b/content/speakers/neslihan-turan.md
@@ -0,0 +1,16 @@
+---
+key: neslihan-turan
+name: Neslihan Turan
+id: D1UJEdrxhHQowlM2LoIusKF26ir2
+feature: true
+company: 'developer'
+city: 'Istanbul, Turkey'
+photoURL: /2021/images/speakers/nesli.jpg
+socials:
+ - icon: twitter
+ link: 'https://twitter.com/neslihannturan'
+ name: neslihannturan
+---
+I am a wikipedian and code contributor of Wikimedia projects. I believe knowledge belongs everyone, should be shared and can not be controlled. I am a member of Free Software Association Turkey, defending free software, digital privacy, freedom of expression.
+
+I care about diversity and equality for everyone as a feminist. I believe the struggle for equality is as important in digital places as in physical areas. Thus, I work on projects to close the gender gap in digital areas. I localized Women in Red project in Turkish Vikipedi and I facilitate some edit-a-thons in this scope.
\ No newline at end of file
diff --git a/content/speakers/oguzhan-er.md b/content/speakers/oguzhan-er.md
new file mode 100644
index 0000000..f553f93
--- /dev/null
+++ b/content/speakers/oguzhan-er.md
@@ -0,0 +1,13 @@
+---
+key: oguzhan-er
+name: Oguzhan Er
+id: D1UJEdrxhHQowlM2LoIusKF26ir2
+feature: true
+company: 'Yer Çizenler'
+city: 'Istanbul, Turkey'
+photoURL: /2021/images/speakers/oguzhan_er.jpg
+socials:
+ - icon: twitter
+ link: 'https://twitter.com/oguzhan_err'
+ name: oguzhan_err
+---
\ No newline at end of file
diff --git a/content/speakers/onur-arslan.md b/content/speakers/onur-arslan.md
index 47a6560..e9131cd 100644
--- a/content/speakers/onur-arslan.md
+++ b/content/speakers/onur-arslan.md
@@ -5,10 +5,6 @@ id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
company: 'Researcher, Anthropologist'
city: 'California, USA'
-photoURL: /images/speakers/onur.jpg
-socials:
- - icon: twitter
- link: 'https://twitter.com/apatheticmagpie'
- name: apatheticmagpie
+photoURL: /2021/images/speakers/onur.jpg
---
Onur Arslan is a PhD candidate at UC Davis, in the anthropology department. He graduated from Istanbul University with a Bachelor of Arts in Political Science and International Relations in 2012. He received his MA degree in Philosophy and Social Thought program at Istanbul Bilgi University. He is interested in exploring the ways in which technoscientific practices and arrangements shape power relations and knowledge production.
diff --git a/content/speakers/orkut-murat.md b/content/speakers/orkut-murat.md
new file mode 100644
index 0000000..4846e1b
--- /dev/null
+++ b/content/speakers/orkut-murat.md
@@ -0,0 +1,13 @@
+---
+key: orkut-murat
+name: Orkut Murat Yılmaz
+id: D1UJEdrxhHQowlM2LoIusKF26ir2
+feature: true
+company: 'Yer Çizenler'
+city: 'Istanbul, Turkey'
+photoURL: /2021/images/speakers/orkut_murat_yılmaz.jpg
+socials:
+ - icon: twitter
+ link: 'https://twitter.com/orkutmurat'
+ name: orkutmurat
+---
\ No newline at end of file
diff --git a/content/speakers/oyd.md b/content/speakers/oyd.md
new file mode 100644
index 0000000..4cf51e5
--- /dev/null
+++ b/content/speakers/oyd.md
@@ -0,0 +1,12 @@
+---
+key: oyd
+name: Özgür Yazılım derneği
+id: D1UJEdrxhHQowlM2LoIusKF26ir2
+feature: true
+city: 'Istanbul, Turkey'
+photoURL: /2021/images/speakers/oyd.svg
+socials:
+ - icon: twitter
+ link: 'https://twitter.com/oydorgtr'
+ name: oydorgtr
+---
\ No newline at end of file
diff --git a/content/speakers/ozcan-oguz.md b/content/speakers/ozcan-oguz.md
new file mode 100644
index 0000000..f4ba904
--- /dev/null
+++ b/content/speakers/ozcan-oguz.md
@@ -0,0 +1,13 @@
+---
+key: ozcan-oguz
+name: Özcan Oğuz
+id: D1UJEdrxhHQowlM2LoIusKF26ir2
+feature: true
+company: 'Developer'
+city: 'Istanbul, Turkey'
+photoURL: /2021/images/speakers/ooguz.jpg
+socials:
+ - icon: twitter
+ link: 'https://twitter.com/ooguz'
+ name: ooguz
+---
\ No newline at end of file
diff --git a/content/speakers/ozgur-kesim.md b/content/speakers/ozgur-kesim.md
index 9b5e9a2..6c5dc25 100644
--- a/content/speakers/ozgur-kesim.md
+++ b/content/speakers/ozgur-kesim.md
@@ -5,10 +5,6 @@ id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
company: 'Mathematician'
city: 'Berlin, F. Germany'
-photoURL: /images/speakers/ozgur.jpg
-socials:
- - icon: twitter
- link: 'https://twitter.com/ugurcan377'
- name: ugurcan377
+photoURL: /2021/images/speakers/ozgur.jpg
---
Özgür Kesim 23 senedir bilgi teknolojileri güvenlik bölümünde çalışıyor. Türkiye'de doğmuş, Almanya'da büyümüş matematikçi son çocuğu da üniversiteye okumak için evden ayrıldıktan sonra, yeni zorumlara girişmek için GNU Taler üzerine Berlin'deki Freie Unıversität'de PhD hazırlıyor.
diff --git a/content/speakers/pinar-dag.md b/content/speakers/pinar-dag.md
new file mode 100644
index 0000000..b818aff
--- /dev/null
+++ b/content/speakers/pinar-dag.md
@@ -0,0 +1,13 @@
+---
+key: pinar-dag
+name: Pınar Dağ
+id: D1UJEdrxhHQowlM2LoIusKF26ir2
+feature: true
+company: 'Data journalist'
+city: 'Istanbul, Turkey'
+photoURL: /2021/images/speakers/pina_dag.jpg
+socials:
+ - icon: twitter
+ link: 'https://twitter.com/pinardag'
+ name: pinardag
+---
\ No newline at end of file
diff --git a/content/speakers/pouhiou.md b/content/speakers/pouhiou.md
index 6ba07bd..9e0a605 100644
--- a/content/speakers/pouhiou.md
+++ b/content/speakers/pouhiou.md
@@ -5,11 +5,11 @@ id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
company: 'Co-director at Framasoft'
city: 'Toulouse, France'
-photoURL: /images/speakers/pouhiou.jpg
+photoURL: /2021/images/speakers/pouhiou.png
socials:
- icon: twitter
link: 'https://twitter.com/pouhiou'
- name: apatheticmagpie
+ name: pouhiou
---
Co director of the French not-for-profit Framasoft.
diff --git a/content/speakers/rima-sghaier.md b/content/speakers/rima-sghaier.md
index 3408164..56c4e37 100644
--- a/content/speakers/rima-sghaier.md
+++ b/content/speakers/rima-sghaier.md
@@ -5,11 +5,11 @@ id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
company: 'Independent Researcher'
city: 'Milano, Italy'
-photoURL: /images/speakers/rima.jpg
+photoURL: /2021/images/speakers/rima.jpg
socials:
- icon: twitter
link: 'https://twitter.com/RimaSghaier'
- name: apatheticmagpie
+ name: RimaSghaier
---
Rima Sghaier, MENA regional lead with Team CommUNITY.
She is an independent researcher who works at the intersection of technology and human rights, particularly in the Middle East and North Africa.
diff --git a/content/speakers/seckin-serpil.md b/content/speakers/seckin-serpil.md
index 14921d9..0ad36a0 100644
--- a/content/speakers/seckin-serpil.md
+++ b/content/speakers/seckin-serpil.md
@@ -3,12 +3,8 @@ key: seckin-serpil
name: Turgay Seçkin Serpil
id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
-company: 'Comedian, Programmer'
-city: 'New York City, USA'
-photoURL: /images/speakers/seckin.jpg
-socials:
- - icon: twitter
- link: 'https://twitter.com/RimaSghaier'
- name: apatheticmagpie
+company: 'FIDE, Lawyer'
+city: 'Istanbul, Turkey'
+photoURL: /2021/images/speakers/seckin.jpg
---
Turgay Seçkin Serpil is a lawyer, and FIDE Disabled Commission since 2018. He is a trainer and activist on this area.
diff --git a/content/speakers/selin-sezi-elevli.md b/content/speakers/selin-sezi-elevli.md
new file mode 100644
index 0000000..1f4f9e0
--- /dev/null
+++ b/content/speakers/selin-sezi-elevli.md
@@ -0,0 +1,13 @@
+---
+key: selin-sezi-elevli
+name: Selin Sezi Elevli
+id: D1UJEdrxhHQowlM2LoIusKF26ir2
+feature: true
+company: 'Student'
+city: 'Ankara, Turkey'
+photoURL: /2021/images/speakers/sezi.jpg
+socials:
+ - icon: twitter
+ link: 'https://twitter.com/selinsezi'
+ name: selinsezi
+---
\ No newline at end of file
diff --git a/content/speakers/sumana-harihareswara.md b/content/speakers/sumana-harihareswara.md
index 59f4577..aa49f90 100644
--- a/content/speakers/sumana-harihareswara.md
+++ b/content/speakers/sumana-harihareswara.md
@@ -5,10 +5,10 @@ id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
company: 'Comedian, Programmer'
city: 'New York City, USA'
-photoURL: /images/speakers/sumana.jpg
+photoURL: /2021/images/speakers/sumana.jpg
socials:
- icon: twitter
- link: 'https://twitter.com/RimaSghaier'
- name: apatheticmagpie
+ link: 'https://twitter.com/brainwane'
+ name: brainwane
---
Sumana Harihareswara is a project manager, programmer, and standup comedian who leads Changeset Consulting, a consultancy that helps legacy open source projects level up -- and is working on a book to teach what she's learned about that (with projects like pip, Autoconf, and HTTPS Everywhere). She's earned an Open Source Citizen Award and a Google Open Source Peer Bonus, certified as a Carpentries instructor, and participated in Recurse Center in 2013 and 2014. She lives in New York City and microblogs at https://mastodon.social/@brainwane/ .
diff --git a/content/speakers/ugur-arici.md b/content/speakers/ugur-arici.md
new file mode 100644
index 0000000..7e50b00
--- /dev/null
+++ b/content/speakers/ugur-arici.md
@@ -0,0 +1,13 @@
+---
+key: ugur-arici
+name: Uğur Arıcı
+id: D1UJEdrxhHQowlM2LoIusKF26ir2
+feature: true
+company: 'Developer'
+city: 'Istanbul, Turkey'
+photoURL: /2021/images/speakers/ugur.jpg
+socials:
+ - icon: twitter
+ link: 'https://twitter.com/ugursus'
+ name: ugursus
+---
\ No newline at end of file
diff --git a/content/speakers/ugurcan-ergun.md b/content/speakers/ugurcan-ergun.md
index d7ee686..480a1d9 100644
--- a/content/speakers/ugurcan-ergun.md
+++ b/content/speakers/ugurcan-ergun.md
@@ -5,7 +5,7 @@ id: D1UJEdrxhHQowlM2LoIusKF26ir2
feature: true
company: 'Developer'
city: 'Tokyo, Japan'
-photoURL: /images/speakers/ugurcan.jpg
+photoURL: /2021/images/speakers/ugurcan.jpg
socials:
- icon: twitter
link: 'https://twitter.com/ugurcan377'
diff --git a/content/speakers/you.md b/content/speakers/you.md
deleted file mode 100644
index 0ad0663..0000000
--- a/content/speakers/you.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-key: you
-name: You
-id: D1UJEdrxhHQowlM2LoIusKF26ir2
-feature: true
-photoURL: /2021/images/speakers/you.jpg
----
\ No newline at end of file
diff --git a/data/categories.yml b/data/categories.yml
index de53e7f..a8aac07 100644
--- a/data/categories.yml
+++ b/data/categories.yml
@@ -1,3 +1,36 @@
- key: freedom
name: "Free software and freedom"
+ id: 3c7ab24d-59c1-5118-b6fa-ef679a376100
+- key: free-art
+ name: "Free Art"
+ id: 3c7ab24d-59c1-5118-b6fa-ef679a376100
+- key: accessibility
+ name: "Accessibility"
+ id: 3c7ab24d-59c1-5118-b6fa-ef679a376100
+- key: privacy
+ name: "Privacy"
+ id: 3c7ab24d-59c1-5118-b6fa-ef679a376100
+- key: entertaining
+ name: "Entertaining and free software"
+ id: 3c7ab24d-59c1-5118-b6fa-ef679a376100
+- key: covid
+ name: "COVID-19"
+ id: 3c7ab24d-59c1-5118-b6fa-ef679a376100
+- key: decentralization
+ name: "Decentralization"
+ id: 3c7ab24d-59c1-5118-b6fa-ef679a376100
+- key: experience-sharing
+ name: "Experience sharing"
+ id: 3c7ab24d-59c1-5118-b6fa-ef679a376100
+- key: equality
+ name: "Equality, community"
+ id: 3c7ab24d-59c1-5118-b6fa-ef679a376100
+- key: edu
+ name: "Education, hardware"
+ id: 3c7ab24d-59c1-5118-b6fa-ef679a376100
+- key: academic
+ name: "Academic Freedom"
+ id: 3c7ab24d-59c1-5118-b6fa-ef679a376100
+- key: drm
+ name: "DRM, Licenses"
id: 3c7ab24d-59c1-5118-b6fa-ef679a376100
\ No newline at end of file
diff --git a/data/formats.yml b/data/formats.yml
index d9894c4..3cf063e 100644
--- a/data/formats.yml
+++ b/data/formats.yml
@@ -1,6 +1,9 @@
- key: talk
name: Talk
+ time: 60
- key: short-talk
name: Short Talk
- key: panel
- name: panel
\ No newline at end of file
+ name: panel
+- key: opening
+ name: Opening
\ No newline at end of file
diff --git a/data/schedule.yml b/data/schedule.yml
index 24d3bd0..fbd7062 100644
--- a/data/schedule.yml
+++ b/data/schedule.yml
@@ -5,25 +5,25 @@
slots:
- slot: open
talk: open
- - slot: ilk-yarim
+ - slot: std-onbir-1
talk: gokce
- - slot: ilk-yarim-2
+ - slot: std-onbir-2
talk: ozgur
- - slot: oniki
+ - slot: std-oniki
talk: aysuda
- - slot: onuc
+ - slot: std-onuc
talk: rima
- - slot: mola
+ - slot: std-ondort-1
talk: break
- - slot: ondortotuz
+ - slot: std-ondort-2
talk: sezi-ecenur
- - slot: onbes
+ - slot: std-onbes
talk: framasoft
- - slot: onalti
+ - slot: std-onalti
talk: webber
- - slot: onyedi
- talk: libregc
- - slot: onsekiz
+ - slot: std-onyedi
+ talk: libregraphic
+ - slot: std-onsekiz
talk: ozcan-ugur
- day: '2020-05-30'
@@ -31,27 +31,29 @@
rooms:
- room: akgul
slots:
- - slot: onbir-tek
+ - slot: snd-onbir
talk: nesli-ugurcan
- - slot: oniki-2
+ - slot: snd-oniki
talk: ayse-gulcin
- - slot: onuc-1
+ - slot: snd-onuc-1
talk: alper
- - slot: onuc-2
+ - slot: snd-onuc-2
talk: pinar
- - slot: mola
+ - slot: snd-ondort-1
talk: mola
- - slot: ondortotuz
+ - slot: snd-ondort-2
talk: onur
- - slot: onbes
+ - slot: snd-onbes
talk: eylul
- - slot: onalti-1
+ - slot: snd-onalti-1
talk: yer-cizenler
- - slot: onalti-2
+ - slot: snd-onalti-2
talk: seckin
- - slot: onyedi
+ - slot: snd-onyedi
talk: greg
- - slot: onsekiz-1
+ - slot: snd-onsekiz-1
talk: kathy
- - slot: onsekiz-2
- talk: sumana
\ No newline at end of file
+ - slot: snd-onsekiz-2
+ talk: sumana
+ - slot: after
+ talk: after
\ No newline at end of file
diff --git a/data/slots.yml b/data/slots.yml
index 82152d4..4afc25d 100644
--- a/data/slots.yml
+++ b/data/slots.yml
@@ -3,136 +3,144 @@
duration: 30
row:
start: 1
- end: 2
-- key: ilk-yarim
+ end: 3
+- key: std-onbir-1
start: '11:00'
duration: 30
row:
- start: 2
- end: 3
-- key: ilk-yarim-2
+ start: 3
+ end: 5
+- key: std-onbir-2
start: '11:30'
duration: 30
row:
- start: 3
- end: 4
-- key: oniki
+ start: 5
+ end: 7
+- key: std-oniki
start: '12:00'
duration: 50
row:
- start: 4
- end: 6
-- key: onuc
+ start: 7
+ end: 9
+- key: std-onuc
start: '13:00'
duration: 50
row:
- start: 6
- end: 8
-- key: mola
+ start: 9
+ end: 11
+- key: std-ondort-1
start: '14:00'
duration: 30
row:
- start: 8
- end: 9
-- key: ondortotuz
+ start: 11
+ end: 13
+- key: std-ondort-2
start: '14:30'
duration: 30
row:
- start: 9
- end: 11
-- key: onbes
+ start: 13
+ end: 15
+- key: std-onbes
start: '15:00'
duration: 50
row:
- start: 11
- end: 13
-- key: onalti
+ start: 15
+ end: 17
+- key: std-onalti
start: '16:00'
duration: 50
row:
- start: 13
- end: 15
-- key: onyedi
+ start: 17
+ end: 19
+- key: std-onyedi
start: '17:00'
duration: 50
row:
- start: 15
- end: 17
-- key: onsekiz
+ start: 19
+ end: 21
+- key: std-onsekiz
start: '18:00'
duration: 50
row:
- start: 17
- end: 19
-- key: onbir-tek
+ start: 21
+ end: 23
+
+
+- key: snd-onbir
start: '11:00'
duration: 50
row:
start: 1
end: 3
-- key: onuc-1
+- key: snd-oniki
+ start: '12:00'
+ duration: 50
+ row:
+ start: 3
+ end: 5
+- key: snd-onuc-1
start: '13:00'
duration: 30
row:
- start: 3
- end: 4
-- key: onuc-2
+ start: 5
+ end: 7
+- key: snd-onuc-2
start: '13:30'
duration: 30
row:
- start: 4
- end: 5
-- key: onalti-1
- start: '16:00'
+ start: 7
+ end: 9
+- key: snd-ondort-1
+ start: '14:00'
duration: 30
row:
- start: 13
- end: 14
-- key: onalti-2
- start: '16:30'
+ start: 9
+ end: 11
+- key: snd-ondort-2
+ start: '14:30'
duration: 30
row:
- start: 14
+ start: 11
+ end: 13
+- key: snd-onbes
+ start: '15:00'
+ duration: 50
+ row:
+ start: 13
end: 15
-- key: onsekiz-1
- start: '18:00'
+- key: snd-onalti-1
+ start: '16:00'
duration: 30
row:
- start: 17
- end: 18
-- key: onsekiz-2
- start: '18:30'
+ start: 15
+ end: 17
+- key: snd-onalti-2
+ start: '16:30'
duration: 30
row:
- start: 18
+ start: 17
end: 19
-- key: oniki-2
- start: '12:00'
+- key: snd-onyedi
+ start: '17:00'
duration: 50
row:
- start: 3
- end: 5
-- key: keynote-close
- start: '19:00'
+ start: 19
+ end: 21
+- key: snd-onsekiz-1
+ start: '18:00'
duration: 30
row:
- start: 18
- end: 19
-- key: party
- start: '19:30'
- duration: 999
- row:
- start: 19
- end: 22
-- key: st-1
- start: '16:00'
- duration: 999
+ start: 21
+ end: 23
+- key: snd-onsekiz-2
+ start: '18:30'
+ duration: 30
row:
- start: 12
- end: 13
-- key: st-2
- start: '16:30'
+ start: 23
+ end: 25
+- key: after
+ start: '19:00'
duration: 999
row:
- start: 13
- end: 14
+ start: 25
+ end: 27
\ No newline at end of file
diff --git a/static/images/speakers/LGC_team.jpg b/static/images/speakers/LGC_team.jpg
new file mode 100644
index 0000000..175696a
Binary files /dev/null and b/static/images/speakers/LGC_team.jpg differ
diff --git a/static/images/speakers/christopher_lemmer-webber.png b/static/images/speakers/christopher_lemmer-webber.png
new file mode 100644
index 0000000..1e4d6fa
Binary files /dev/null and b/static/images/speakers/christopher_lemmer-webber.png differ
diff --git a/static/images/speakers/oguzhan_er.jpg b/static/images/speakers/oguzhan_er.jpg
new file mode 100644
index 0000000..95fd235
Binary files /dev/null and b/static/images/speakers/oguzhan_er.jpg differ
diff --git a/static/images/speakers/orkut_murat_yılmaz.jpg b/static/images/speakers/orkut_murat_yılmaz.jpg
new file mode 100644
index 0000000..f98f6f2
Binary files /dev/null and b/static/images/speakers/orkut_murat_yılmaz.jpg differ
diff --git a/static/images/speakers/oyd.svg b/static/images/speakers/oyd.svg
new file mode 100644
index 0000000..4758c2f
--- /dev/null
+++ b/static/images/speakers/oyd.svg
@@ -0,0 +1,168 @@
+
+
diff --git a/static/images/speakers/pina_dag.jpg b/static/images/speakers/pina_dag.jpg
new file mode 100644
index 0000000..5d36759
Binary files /dev/null and b/static/images/speakers/pina_dag.jpg differ
diff --git a/static/images/speakers/pouhiou.jpg b/static/images/speakers/pouhiou.jpg
deleted file mode 100644
index e513b6f..0000000
Binary files a/static/images/speakers/pouhiou.jpg and /dev/null differ
diff --git a/static/images/speakers/pouhiou.png b/static/images/speakers/pouhiou.png
new file mode 100644
index 0000000..b9f885d
Binary files /dev/null and b/static/images/speakers/pouhiou.png differ