From 1b527d99ed24f43493f7e9f42b7ec3331c9fbaab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?murat=20emir=20cabaro=C4=9Flu?= Date: Sun, 4 Apr 2021 22:59:53 +0300 Subject: [PATCH] =?UTF-8?q?data=20dizini=202021=20y=C4=B1l=C4=B1=20i=C3=A7?= =?UTF-8?q?in=20temizlendi=20ve=20d=C3=BCzenlendi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/categories.yml | 35 +-------------------- data/footer.yml | 2 +- data/formats.yml | 16 ++-------- data/info.yml | 6 ++-- data/live.yml | 4 +-- data/rooms.yml | 15 ++------- data/schedule.yml | 73 ++++++++----------------------------------- data/slots.yml | 76 ++------------------------------------------- data/team.yml | 62 ------------------------------------ 9 files changed, 26 insertions(+), 263 deletions(-) diff --git a/data/categories.yml b/data/categories.yml index 704da92..de53e7f 100644 --- a/data/categories.yml +++ b/data/categories.yml @@ -1,36 +1,3 @@ - key: freedom name: "Free software and freedom" - id: 3c7ab24d-59c1-5118-b6fa-ef679a376100 -- key: decentralization - name: "Decentralization" - id: e3fdfb05-1630-5c56-bc5d-501217ad62e3 -- key: social-inequalities - name: "Social Inequalities" - id: a31d8be2-8f03-553d-b07b-ee30e2d13a6e -- key: free-knowledge - name: "Free knowledge" - id: b425f929-b026-52e9-87f4-89b30ec542d1 -- key: privacy - name: "Privacy" - id: bb5eeaca-3d8d-5858-b4a9-63d90a11a792 -- key: feminism - name: "Feminism in digital spaces" - id: 9edfb0de-db78-5e18-831d-d0c56d751515 -- key: art - name: "Free art" - id: cff3cdbc-52e9-5d5a-8f98-927ee005f59b -- key: _wtf - name: "\U0001F381 WTF" - id: 8ab523e2-022d-5d16-924c-da4477ddb881 -- key: keynote - name: Keynote -- key: lunch - name: Lunch -- key: office-hours - name: Office Hours -- key: open - name: Ouverture -- key: party - name: Party -- key: pause - name: Pause + id: 3c7ab24d-59c1-5118-b6fa-ef679a376100 \ No newline at end of file diff --git a/data/footer.yml b/data/footer.yml index d5de1f7..413261d 100644 --- a/data/footer.yml +++ b/data/footer.yml @@ -31,5 +31,5 @@ content: - title: footer_become_partners links: - nameKey: footer_become_partners_label - url: /ozgurkon-sponsor.pdf + url: /kit/OzgurKon_sponsorship_en_.pdf newTab: true \ No newline at end of file diff --git a/data/formats.yml b/data/formats.yml index a440cc2..d9894c4 100644 --- a/data/formats.yml +++ b/data/formats.yml @@ -1,18 +1,6 @@ -- key: conference - name: 'Conference ' - id: 4c0d8a93-a0fb-5fe4-ab31-7cc56e05e942 - key: talk name: Talk - key: short-talk name: Short Talk -- key: office-hours - name: Office Hours -- key: open - name: Ouverture -- key: party - name: Party -- key: pause - name: Pause -- key: quickie - name: Quickie - id: f1f4eb00-ff40-57ea-805a-b3aa3ce5f6e6 +- key: panel + name: panel \ No newline at end of file diff --git a/data/info.yml b/data/info.yml index 4ff2f27..c2d8ef6 100644 --- a/data/info.yml +++ b/data/info.yml @@ -1,5 +1,5 @@ id: HJRThubF4uYPkb7jSUxi -name: ÖzgürFest 2020 +name: ÖzgürFest 2021 address: formattedAddress: 'İstanbul, Türkiye' locality: @@ -12,5 +12,5 @@ address: lat: 40.9904 lng: 29.02918 dates: - start: '2019-10-03T10:00:00.000Z' - end: '2019-10-03T10:00:00.000Z' + start: '2021-05-15T10:00:00.000Z' + end: '2021-05-16T10:00:00.000Z' diff --git a/data/live.yml b/data/live.yml index d7671a4..619b4db 100644 --- a/data/live.yml +++ b/data/live.yml @@ -1,8 +1,8 @@ - name: "Akgül" - url: "https://live.ozgurkon.org/live/show.m3u8" + url: "https://live.ozgurkon.org" navId: "akgul" - name: "Uçkan" - url: "https://live.ozgurkon.org/live/show2.m3u8" + url: "https://live.ozgurkon.org" navId: "uckan" diff --git a/data/rooms.yml b/data/rooms.yml index 998fffc..8c656d2 100644 --- a/data/rooms.yml +++ b/data/rooms.yml @@ -1,18 +1,7 @@ -- key: lunchroom - label: Cenareo - description: Hall sponsors / Salle déjeuner - skip: true -- key: halls - label: Halls - description: Halls - skip: true -- key: office-hours - label: Cenareo - description: Office-hours -- key: room1 +- key: akgul label: Akgül description: In memory of Mustafa Akgül -- key: room2 +- key: uckan label: Uçkan description: In memory of Özgür Uçkan diff --git a/data/schedule.yml b/data/schedule.yml index 1467c24..037587f 100644 --- a/data/schedule.yml +++ b/data/schedule.yml @@ -1,71 +1,24 @@ -- day: '2020-05-16' - start: '10:30' +- day: '2021-05-15' + start: '10:00' rooms: - - room: room1 + - room: akgul slots: - slot: open talk: open - - slot: keynote-open - talk: keynote_open - - slot: slot-1 - talk: art-with-free-software - - slot: slot-2 - talk: ai - - slot: slot-3 - talk: surveillance-regimes-uk-turkey - - slot: slot-4 - talk: public_money_public_code - - slot: slot-5 - talk: Cancelled - - slot: slot-6 - talk: societal-inequities - - slot: slot-7 - talk: wikipedia-gender-gaps - - room: room2 + - room: uckan slots: - - slot: st-1 - talk: unexpected-adventure - - slot: st-2 - talk: kadin-yazilimci - + - slot: open + talk: open -- day: '2020-05-17' +- day: '2020-05-16' start: '10:00' rooms: - - room: room1 + - room: akgul slots: - - slot: keynote-open - talk: kimin-ozgurlugu - - slot: slot-1 - talk: should-i-stay-or-go - - slot: slot-2 - talk: food-vs-hardware - - slot: slot-3 - talk: ozgurluk-celiskisi - - slot: slot-4 - talk: dijital-esitsizlikler - - slot: slot-5 - talk: how-wikipedia-covid19 - - slot: slot-6 - talk: the-network-and-things-you-dont-control - - slot: slot-7 - talk: privacy - - slot: keynote-close - talk: closing - - slot: party - talk: meeting - - room: room2 + - slot: open + talk: open + - room: uckan slots: - - slot: slot-1 - talk: decentralized-web - - slot: slot-2 - talk: let-there-be-copies-tr - - slot: slot-3 - talk: event-sourcing - - slot: slot-4 - talk: let-there-be-copies - - slot: slot-5 - talk: yercizenler - - slot: slot-6 - talk: what-is-a-leak + - slot: open + talk: open diff --git a/data/slots.yml b/data/slots.yml index 1be96b9..6ac1917 100644 --- a/data/slots.yml +++ b/data/slots.yml @@ -1,78 +1,6 @@ - key: open - start: '10:30' + start: '10:00' duration: 60 row: start: 1 - end: 2 -- key: keynote-open - start: '11:00' - duration: 50 - row: - start: 2 - end: 4 -- key: slot-1 - start: '12:00' - duration: 50 - row: - start: 4 - end: 6 -- key: slot-2 - start: '13:00' - duration: 50 - row: - start: 6 - end: 8 -- key: slot-3 - start: '14:00' - duration: 50 - row: - start: 8 - end: 10 -- key: slot-4 - start: '15:00' - duration: 50 - row: - start: 10 - end: 12 -- key: slot-5 - start: '16:00' - duration: 50 - row: - start: 12 - end: 14 -- key: slot-6 - start: '17:00' - duration: 50 - row: - start: 14 - end: 16 -- key: slot-7 - start: '18:00' - duration: 50 - row: - start: 16 - end: 18 -- key: keynote-close - start: '19: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 - row: - start: 12 - end: 13 -- key: st-2 - start: '16:30' - duration: 999 - row: - start: 13 - end: 14 + end: 2 \ No newline at end of file diff --git a/data/team.yml b/data/team.yml index a60c22b..923c958 100644 --- a/data/team.yml +++ b/data/team.yml @@ -1,65 +1,3 @@ -- title: Özcan Oğuz - type: core - subtitle: Özgür Yazılım Derneği - photo: ooguz.jpg - socials: - - link: 'https://twitter.com/ooguz' - name: Twitter - key: ooguz - -- title: Neslihan Turan - type: core - subtitle: Özgür Yazılım Derneği - photo: nesli.jpg - socials: - - link: 'https://twitter.com/neslihannturan' - name: Twitter - key: nesli - -- title: Alper Atmaca - type: core - subtitle: Özgür Yazılım Derneği - photo: alper_atmaca.jpg - socials: - - link: 'https://omegahukuk.com' - name: Site - key: alper - -- title: Cemre Demircioğlu - type: core - subtitle: Özgür Yazılım Derneği - photo: cemre.jpg - socials: - - link: 'https://twitter.com/cemredemrcioglu' - name: Twitter - key: cemre - -- title: Murat Cabaroğlu - type: volunteers - subtitle: Özgür Yazılım Derneği - photo: murat.jpg - socials: - - link: 'https://www.twitter.com/mrtmrcbr' - name: Twitter - key: murat - -- title: Mustafa Yontar - type: volunteers - subtitle: Özgür Yazılım Derneği - photo: mustafa_yontar.jpg - socials: - - link: 'https://twitter.com/elasticroot' - name: Twitter - -- title: Armağan Güven - type: volunteers - subtitle: Özgür Yazılım Derneği - photo: armagan.jpg - socials: - - link: 'https://twitter.com/OzgurKonorg' - name: Twitter - key: armagan - - title: You! type: volunteers subtitle: You are welcome if you want to join us!