Merge branch 'master' into Makefiles

Reviewed-on: Decentrala/website#25

Makefile

@@ -0,0 +1,22 @@
+enmd = $(wildcard src/en/*.md)
+enhtml = $(patsubst src/en/%.md,pages/en/%.html,$(enmd))
+srmd = $(wildcard src/sr/*.md)
+srhtml = $(patsubst src/sr/%.md,pages/sr/%.html,$(srmd))
+
+out: $(enhtml) $(srhtml)
+
+$(srhtml):  $(srmd) | pages/sr/.gitignore
+pages/sr/%.html: src/sr/%.md
+	lowdown $< > $@
+
+$(enhtml): $(enmd) | pages/en/.gitignore
+pages/en/%.html: src/en/%.md
+	lowdown $< > $@
+
+pages/%/.gitignore:
+	mkdir -p $(dir $@)
+	echo '*' > $@
+
+.PHONY: clean
+clean:
+	$(RM) -r pages/

README.md

@@ -2,14 +2,6 @@
 
 Redisign of dmz.rs .
 
-## Setup Python environment
-
-Run 
-
-```
-python -m venv venv
-pip install -r requirements. txt
-```
 ## Build site
 
 Run
@@ -48,11 +40,3 @@ nginx -p . -s stop
 - [x] make english version
   - double check spelling and wording
 - add account and donations page and style them with the site style
-
-## Note
-
-If you in any way change the requirements for the project when submitting, run the command below, so the requirements.txt is updated accordingly.
-
-```
-pip freeze > requirements.txt
-```

build_pages.py

@@ -10,7 +10,8 @@ PAGES = [
     {'name': 'events_archive', 'titleSR': 'Arhiva događaja', 'titleEN': 'Events archive', 'style': 'events'},
     {'name': 'services', 'titleSR': 'Servisi', 'titleEN': 'Services', 'style': 'services'},
     {'name': 'webring', 'titleSR': 'Webring', 'titleEN': 'Webring', 'style': ''},
-    {'name': 'donations', 'titleSR': 'Donacije', 'titleEN': 'Donations', 'style': 'home'},
+    {'name': 'donations', 'titleSR': 'Donacije', 'titleEN': 'Donations', 'style': 'donations'},
+    {'name': 'deconference', 'titleSR': 'Dekonferencija', 'titleEN': 'Deconference', 'style': 'deconference'},
 ]
 
 def buildPage(filename: str, pageTitle: str, pageHtml: str, pageStyle: str, template: str) -> str:

dogadjaji.csv

@@ -1,4 +1,4 @@
-datum, vreme, lokacija, tema, tip,
+datum, vreme, lokacija, tema, tip, link
 20-12-2022, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u računarske mreže, ,
 03-01-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon žurka, hack,
 16-01-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Privatnost na internetu, workshop,
@@ -27,7 +27,7 @@ datum, vreme, lokacija, tema, tip,
 03-05-2023, 12:00, Cvijeta Zuzorić https://www.openstreetmap.org/node/256367543, Otvaranje izložbe (Q&A), ,
 03-05-2023, 18:00, KC Grad https://www.openstreetmap.org/node/4118716889, Linux install fest, workshop,
 04-05-2023, 17:00, Cvijeta Zuzorić https://www.openstreetmap.org/node/256367543, ULUS izložba, discussion,
-04-05-2023, 18:00, Polyhedra https://www.openstreetmap.org/node/4856556781, Uvod u računarske mreže,
+04-05-2023, 18:00, Polyhedra https://www.openstreetmap.org/node/4856556781, Uvod u računarske mreže, ,
 04-05-2023, 21:00, n/a, Online sastanak sa Zajednicom za slobodnu tehnologiju iz Kikinde, meeting,
 05-05-2023, 15:30, Cvijeta Zuzorić https://www.openstreetmap.org/node/256367543, ULUS izložba, discussion workshop,
 06-05-2023, 12:00, Cvijeta Zuzorić https://www.openstreetmap.org/node/256367543, ULUS izložba, discussion workshop,
@@ -54,7 +54,7 @@ datum, vreme, lokacija, tema, tip,
 31-07-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Python - Web development, ,
 01-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lighting talks, lighting,
 07-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Linux ricing, discussion,
-08-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lambda račun, lecture,
+08-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lambda račun #1, lecture,
 14-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Linux distro, discussion,
 15-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Pirati 777 mora, lecture,
 21-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Python, workshop,
@@ -68,7 +68,7 @@ datum, vreme, lokacija, tema, tip,
 18-09-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Cybersecurity - kako početi?, ,
 19-09-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Stop reklamama, discussion,
 25-09-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Email server E02, lecture,
-26-09-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lambda račun E02, lecture,
+26-09-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lambda račun #2, lecture,
 02-10-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Šamirov algoritam za deljenje tajni, lecture,
 03-10-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon, hack,
 09-10-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lighting talks, lighting,
@@ -82,20 +82,20 @@ datum, vreme, lokacija, tema, tip,
 06-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
 07-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Cybersecurity card game, ,
 13-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon, hack,
-14-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku EP01, lecture workshop,
+14-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku #1, lecture workshop, https://forum.dmz.rs/t/uvod-u-elektroniku/342
 20-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Git, lecture,
-21-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku EP02, lecture workshop,
+21-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku #2, lecture workshop, https://forum.dmz.rs/t/uvod-u-elektroniku/342
-27-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Kviz veče,
+27-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Kviz veče, ,
-28-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku EP03, lecture workshop,
+28-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku #3, lecture workshop, https://forum.dmz.rs/t/uvod-u-elektroniku/342
 04-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lighting talks, lighting,
 05-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Idejno-politička diskusija, discussion,
 10-12-2023, 16:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon, hack,
 11-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Home made portable IDS, ,
-12-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku E04, lecture workshop,
+12-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku #4, lecture workshop, https://forum.dmz.rs/t/uvod-u-elektroniku/342
-18-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, lecture workshop,
+18-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, lecture workshop, https://forum.dmz.rs/t/arduino-radionica/382
 19-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, NetHack video igra, ,
 25-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Degoogled phone, ,
-26-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku E05, lecture workshop,
+26-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku #5, lecture workshop, https://forum.dmz.rs/t/uvod-u-elektroniku/342
 08-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Druženje, ,
 09-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Decentrala sysadmin (obuka), ,
 15-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon (Task manager), hack,
@@ -106,7 +106,7 @@ datum, vreme, lokacija, tema, tip,
 30-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Intro to 3D printing, lecture,
 05-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon, hack,
 06-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
-12-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Kompajleri i trojanci, lecture,
+12-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Kompajleri i trojanci, lecture, https://ubavic.rs/kompajleri_i_trojanci/
 13-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, AI diskusija, discussion,
 19-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Godot game engine, lecture,
 20-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Svet van Linuxa, lecture,
@@ -115,36 +115,36 @@ datum, vreme, lokacija, tema, tip,
 04-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon, hack,
 05-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
 09-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin Decentrala obuka, ,
-11-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop,
+11-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop, https://forum.dmz.rs/t/arduino-radionica/382
 12-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Home made SOC build, ,
 18-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Regex, lecture,
 19-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u PCB, ,
-25-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop,
+25-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop, https://forum.dmz.rs/t/arduino-radionica/382
 26-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, (La)TeX, lecture,
-01-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, La Jetée, movie,
+01-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, La Jetée (1962), movie, https://en.wikipedia.org/wiki/La_Jet%C3%A9e
 01-04-2024, 20:00, DC Krov https://www.openstreetmap.org/node/10594728522, Decentrala sastanak (ideološki), meeting,
 02-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
 02-04-2024, 21:00, DC Krov https://www.openstreetmap.org/node/10594728522, Decentrala sastanak (strateški), meeting,
-08-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Teorija čvorova, lecture,
+08-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Teorija čvorova, lecture, https://forum.dmz.rs/t/teorija-cvorova/494
-09-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop,
+09-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop, https://forum.dmz.rs/t/arduino-radionica/382
 15-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hakaton / Radna akcija, hack,
 16-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, HomeMade SoC #2, lecture,
 22-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Stencil - šabloni za grafite, workshop,
-23-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop,
+23-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop, https://forum.dmz.rs/t/arduino-radionica/382
 24-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (Proxmox VMs i ssh), workshop,
 29-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Chat aplikacije, discussion,
 30-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Mesečna revizija Decentrale, meeting,
 30-04-2024, 20:00, DC Krov https://www.openstreetmap.org/node/10594728522, Radna grupa Konferencija, meeting,
 06-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (proxmox instalacija), workshop,
 07-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Free software vs open source, lecture,
-13-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Alphaville (1965), movie,
+13-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Alphaville (1965), movie, https://en.wikipedia.org/wiki/Alphaville_(film)
 14-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
 20-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (ssl cronjob scp), lecture,
 21-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hakaton (radna akcija), hack,
 27-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Home-made SoC #3, lecture,
 28-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Mesečna revizija, meeting,
 02-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (ejabberd/xmpp server), workshop,
-03-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Pi (1998), movie,
+03-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Pi (1998), movie, https://en.wikipedia.org/wiki/Pi_(film)
 04-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardverski hakaton, hack,
 09-06-2024, 14:00, DC Krov https://www.openstreetmap.org/node/10594728522, Game Jam, hack,
 10-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Obrada prirodnih jezika kroz Python, lecture,
@@ -153,16 +153,60 @@ datum, vreme, lokacija, tema, tip,
 18-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Softverski hakaton, hack,
 24-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Home-made SoC #4, lecture,
 25-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Mesečna bleja i revizija, meeting,
-29-06-2024, 20:00, Dunavski park https://osm.org/go/xf3SLRlmR-, Uticaj tehnologije na prirodu, discussion,
+29-06-2024, 20:00, Dunavski park https://osm.org/go/xf3SLRlmR-, Uticaj tehnologije na prirodu, discussion, https://forum.dmz.rs/t/uticaj-tehnologije-na-prirodu/616
 30-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (ldap server/nalozi korisnika), workshop,
-01-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, 1984 (1956), movie
+01-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, 1984 (1956), movie,
 02-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Open-source SoC, lecture,
 07-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka: SQL Server, lecture,
 08-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
 09-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hakaton, hack,
 12-07-2024, 15:00, KC Gnezdo https://osm.org/go/xftd8rbl2, Uticaj tehnologije na kulturu, lecture,
-14-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Napadi na vestacku inteligenciju, lecture discussion
+14-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Napadi na veštačku inteligenciju, lecture discussion,
-29-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, OnionShare, lecture
+29-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, OnionShare, lecture, https://forum.dmz.rs/t/plan-za-jul-2024/612/17?u=mkevac
-30-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, CryptoPals #1, workshop
+30-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, CryptoPals #1, workshop, https://forum.dmz.rs/t/cryptopals-u-decentrali/620
-15-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, GETÖSEFÖHN and FERTILIZER, music
+05-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, CryptoPals #2, workshop, https://forum.dmz.rs/t/cryptopals-u-decentrali/620
-15-09-2024, 12:00, KC Magacin https://www.openstreetmap.org/node/1226456745#map=19/44.81314/20.45378, Dekonferencija, conference,
+06-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Intro to Zig, lecture, https://forum.dmz.rs/t/intro-to-zig-or-30-reasons-you-should-start-using-zig/696
+12-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, CryptoPals #3, workshop, https://forum.dmz.rs/t/cryptopals-u-decentrali/620
+13-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardware hackathon, hack, https://wiki.dmz.rs/decentrala/dogadjaji/hakaton
+15-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, GETÖSEFÖHN, music, https://forum.dmz.rs/t/fwd-gig-in-july-august/626
+19-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, CryptoPals #4, workshop, https://forum.dmz.rs/t/cryptopals-u-decentrali/620
+20-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Open Street Map, hack, https://forum.dmz.rs/t/hakaton-avgust-2024/682
+26-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting, https://wiki.dmz.rs/decentrala/dogadjaji/lightningtalks
+27-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin vezbe, workshop, https://wiki.dmz.rs/en/sysadmin
+02-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Clerks (1994), movie, https://en.wikipedia.org/wiki/Clerks_(film)
+03-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Python vezbe, workshop, https://radionice.dmz.rs/python/
+09-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hakaton, hack, https://wiki.dmz.rs/decentrala/dogadjaji/hakaton
+10-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardverski hakaton, hack, https://wiki.dmz.rs/decentrala/dogadjaji/hakaton
+14-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Priprema za Dekonferenciju, meeting, https://dmz.rs/deconference
+15-09-2024, 11:00, KC Magacin https://www.openstreetmap.org/node/1226456745#map=19/44.81314/20.45378, Dekonferencija, conference, https://dmz.rs/deconference
+16-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting, https://wiki.dmz.rs/decentrala/dogadjaji/lightningtalks
+17-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Linux install day, workshop, https://en.wikipedia.org/wiki/Linux_user_group#Installfests
+23-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Linux ricing , workshop, https://excaliburzero.gitbooks.io/an-introduction-to-linux-ricing/content/ricing.html
+24-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Strateški sastanak, meeting, https://forum.dmz.rs/t/decentrala-sastanak/13/113
+30-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u ekonomiju, lecture, https://forum.dmz.rs/t/uvod-u-ekonomiju/719
+01-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Jam session, music, https://forum.dmz.rs/t/jam-session/741
+04-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Ludum Dare doček teme, meeting, https://forum.dmz.rs/t/ludum-dare-56-game-jam/749/1
+05-10-2024, 00:00, DC Krov https://www.openstreetmap.org/node/10594728522, Ludum Dare gamejam, hack, https://forum.dmz.rs/t/ludum-dare-56-game-jam/749/1
+06-10-2024, 00:00, DC Krov https://www.openstreetmap.org/node/10594728522, Ludum Dare gamejam, hack, https://forum.dmz.rs/t/ludum-dare-56-game-jam/749/1
+07-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Predstavljanje igrica, lecture, https://forum.dmz.rs/t/ludum-dare-56-game-jam/749/1
+08-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, In browser dev tools, lecture, https://forum.dmz.rs/t/in-browser-dev-tools-kako-rade-veb-stranice/751
+14-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Radio hakaton, hack, https://forum.dmz.rs/t/745
+15-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, LAN party, party, https://forum.dmz.rs/t/lan-party/126
+21-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Algebra - Grupe, lecture, https://forum.dmz.rs/t/746
+22-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin vežbe, workshop, https://wiki.dmz.rs/en/sysadmin
+28-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardverski hakaton, hack, https://wiki.dmz.rs/en/decentrala/dogadjaji/hakaton
+29-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Radionica lemljenja, workshop, https://forum.dmz.rs/t/lemljenje/777/1
+30-10-2024, 18:00, Matematički fakultet (Učionica 251) https://www.openstreetmap.org/node/12291697569, Linux install day, workshop, https://forum.dmz.rs/t/linux-install-day/803
+4-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin vežbe, workshop, https://wiki.dmz.rs/en/sysadmin
+5-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, SYSTEMD - da/ne/zašto ne i alternative, lecture, https://forum.dmz.rs/t/plan-za-novembar-2024/785/4?u=wingaxe
+11-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting, https://wiki.dmz.rs/decentrala/dogadjaji/lightningtalks
+12-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Don’t be afraid of pointers, lecture, https://forum.dmz.rs/t/ne-boj-se-pointera-dont-be-afraid-of-pointers-predavanje/807
+13-11-2024, 18:00, Matematički fakultet (Učionica 153) https://www.openstreetmap.org/node/12291697569, Makefiles (en), lecture,
+18-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Intro to Security Auditing, lecture,
+19-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, LAN party, party, https://forum.dmz.rs/t/lan-party/126
+20-11-2024, 18:00, Matematički fakultet (Učionica 153) https://www.openstreetmap.org/node/12291697569, 30 reasons to use Zig, lecture, https://forum.dmz.rs/t/intro-to-zig-or-30-reasons-you-should-start-using-zig/696
+25-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardverski Hackaton, hack, https://wiki.dmz.rs/en/decentrala/dogadjaji/hakaton
+26-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Tiny Keyboards Explained - 28 keys are enough, lecture,
+27-11-2024, 18:00, Matematički fakultet (N251) https://www.openstreetmap.org/node/12291697569, OpenGL šejderi #1: Osnove, lecture,
+04-12-2024, 18:00, Matematički fakultet (N251) https://www.openstreetmap.org/node/12291697569, OpenGL šejderi #2: SDF renderovanje, lecture,
+11-12-2024, 18:00, Matematički fakultet (N251) https://www.openstreetmap.org/node/12291697569, OpenGL šejderi #3: Kompleksna analiza, lecture,

image_poster.py

@@ -60,7 +60,10 @@ def drawPoster(events, bg, fg, month:int):
 
     height = 990
 
-    draw.text((165, height), "Radionice pocinju u 19h u DC Krovu", font=fontIosevkaSmall, fill=fg)
+    draw.text((165, height), "Pondeljkom i utorkom u 19h u DC Krovu", font=fontIosevkaSmall, fill=fg)
+    height += 200
+
+    draw.text((165, height), "Sredom u 18h na MATF-u", font=fontIosevkaSmall, fill=fg)
     height += 200
 
     draw.text((165, height), "Svi dogadjaji su uvek besplatni", font=fontIosevkaSmall, fill=fg)

pages/en/about.html

@@ -1,12 +0,0 @@
-<h1>About us</h1>
-<dl>
-  <dt>Statute:</dt>
-  <dd> We make decisions by direct democracy. Our statute can be found at <a href="/en/statute"> statute page</a></dd>
-
-  <dt>Contact:</dt>
-  <dd>
-    You can send mail to <a href="mailto:dmz@dmz.rs">dmz@dmz.rs</a> or you can register on <a href="https://forum.dmz.rs">our Forum</a>.
-    Also, we are available on the <a href="https://balkan.fedive.rs/@decentrala">Fediverse!</a>
-    If you find a bug on the site, please do tell us. We would be very grateful.
-  </dd>
-</dl>

pages/en/account.html

@@ -1,8 +0,0 @@
-<h1>Account</h1>
-<p>If you have created an account on dmz.rs, you can use our XMPP and e-mail server, as well as other services that support LDAP login.<p>
-<p>For more on XMPP see <a href="https://wiki.dmz.rs/en/tutorial/conversations">this tutorial</a>. <p>
-<p>You can see settings for the <a href="https://www.thunderbird.net">Thundebird</a> mail client on this <a href="/img/mailsettings.png">image</a>.<p>
-
-<p><a href="/account/register/">Register</a><p>
-<p><a href="/account/unregister/">Delete account</a><p>
-<p><a href="/account/changepassword/">Change password</a><p>

pages/en/donations.html

@@ -1,9 +0,0 @@
-<h1>Donations</h1>
-<dd>
-    Decentrala accepts donations exclusively from persons and without any obligations.
-  We are independent and we try to keep it that way.
-  You can donate old hardware (laptops, phones, PC components) to us, and we will find a use for it in Decentrala or give it to people who need it.
-    Also, you can donate bitcoin and monero by sending to the following addresses:
-    <p>Bitcoin: bc1qjhsfgq79wuzzv32yml9zglwzf9qcwfj3atuy74</p>
-    <p>Monero: 8BESz45LnxrgCwZP32KieiN1D4LinCfsS1YjdFHfGXrVCmPs35167QsW1gd7qbff4UAtBbT6oWrkbfZnJm71HornVRiRZFS</p>
-</dd>

pages/en/events.html

@@ -1,3 +0,0 @@
-<h1>Events</h1>
-<p>Following list contains all forthcoming events. Held events are listed in <a href="/en/events_archive">archive</a>.</p><br>
-<p>We also provide <a href="https://dmz.rs/events.ical">ical file</a></p><br>

pages/en/events_archive.html

@@ -1,2 +0,0 @@
-<h1>Events archive</h1>
-<p>All events that we organized so far. You can find future events on <a href="/en/events">Events page</a></p><br>

pages/en/index.html

@@ -1,27 +0,0 @@
-<h1>Welcome!</h1>
-<p>
-  We are <em>Decentrala</em> - a group of enthusiasts gathered around the idea of decentralization and knowledge sharing.
-  Here are some more facts about us:
-</p>
-<dl>
-
-  <dt>Motivation:</dt>
-<dd>Decentralization promotes <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#odrzivost">sustanability</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#dostupnost">availability</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#pristupacnost">accesability</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#nezavisnost">autonomy</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#privatnost">privacy</a> and <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#sloboda">freedom</a>. On those networks we have less <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#manipulacija">manipulation</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#propaganda">propaganda</a>, ads, and <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#neopterecenost-paznje-sporednim-stvarima">are not designed to lock your attention (dumbing down)</a>.
-    <a href="https://forum.dmz.rs/t/zasto-nam-je-decentralizacija-bitna/506/1">Tell us why decentralization is important to you</a>
-  </dd>
-  <dt>Knowledge:</dt>
-  <dd>
-    All our workshops are free and open to everyone.
-    Also, if you have something to share, feel free to announce the event  on the <a href="https://forum.dmz.rs"></a>Forum</a>.
-  </dd>
-  <dt>Actions:</dt>
-  <dd>From time to time we organize actions, hackathons, crypto parties, exhibitions, etc.</dd>
-  <dt>Services:</dt>
-  <dd>Our servers run various services (like e-mail, git, wiki, etc...) that are open to everyone.</dd>
-</dl>
-<p>
-  If you are still interested, you can create an <a href="/en/account">account</a>
-  on our server which will enable the use of all our <a href="/en/services">services</a>.
-  If you want to see first how it all looks, you can come to one of our
-  <a href="/en/events">event</a>, and meet us there!
-</p>

pages/en/services.html

@@ -1,59 +0,0 @@
-<h1>Services</h1>
-<table>
-  <tr>
-    <th>Service</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td><a href="/account">E-mail</a></td>
-    <td>E-mail account that you can use with any e-mail client (for example, with the <a href="https://www.thunderbird.net/">Thunderbird</a>).</td>
-  </tr>
-  <tr>
-    <td><a href="https://forum.dmz.rs/">Forum</a></td>
-    <td>Forum for general discussion and <a href="/events">event</a> organization.</td>
-  </tr>
-  <tr>
-    <td><a href="/account">Chat</a></td>
-    <td>
-      We have our XMPP server, on which you can make an account.
-      If you already have an account, you can find us at group <a href="decentrala@conference.dmz.rs">decentrala@conference.dmz.rs</a>.
-    </td>
-  </tr>
-  <tr>
-    <td><a href="https://gitea.dmz.rs/">Git</a></td>
-    <td><a href="https://gitea.io/en-us/">Gitea</a> instance on which we host our code and resources (including the code for this site).
-    </td>
-  </tr>
-  <tr>
-    <td><a href="https://wiki.dmz.rs/">Wiki</a></td>
-    <td><a href="https://js.wiki/">Wiki.js</a> instance on which we publish documentation for our projects,
-      <a href="/events">events</a> resources, and tutorials.
-    </td>
-  </tr>
-  <tr>
-    <td><a href="https://nextcloud.dmz.rs/">Nextcloud</a></td>
-    <td><a href="https://nextcloud.com/">Nextcloud</a> instance on which we organize tasks we need to do and use as calandar.
-    </td>
-  </tr>
-  <tr>
-    <td><a href="https://search.dmz.rs/">Search</a></td>
-    <td><a href="https://github.com/hnhx/librex/">LibreX</a> instance used for Web searching.</td>
-  </tr>
-  <tr>
-    <td><a href="https://pastebin.dmz.rs/">Pastebin</a></td>
-    <td><a href="https://privatebin.info/">PrivateBin</a> instance we use for sharing text files</td>
-  </tr>
-  <tr>
-    <td><a href="ssh://soft.dmz.rs:2222/">Soft Serve</a></td>
-    <td>
-      <a href="https://github.com/charmbracelet/soft-serve">Soft Serve</a> instance that we use as a replacement for the Gitea service.
-      Soft Serve works entirely from the terminal.
-    </td>
-  </tr>
-</table>
-<p>
-  These are some of the services we currently maintain on our servers.
-  To use these services, you can register for each service separately,
-  or you can create a unique <a href="/en/account">account</a>
-  on our server and use all services with the same account.
-</p>

pages/en/statute.html

@@ -1,32 +0,0 @@
-<h1>Statute</h1>
-<p>O pravilima i statutu Decentrale odlucuje nezavisno glasacko telo u kome se odluke donose se na principima direktne demokratije, dogovorom ili najmanje dvotrećinskom većinom ukupnog broja članova kolektiva.</p>
-<br>
-<p>Delovi statua mogu biti definisati kao nepromenjivi i protiv nepromenjivog delova statua se ne može glasati.</p>
-<br>
-<p>Sastanak glasačkog tela je validan ukoliko mu prisustvuje najmanje troje članova glasačkog tela.</p>
-<br>
-<p>Decentrala o zahtevima za prijem u članstvo odlučuje dvotrećinskom većinom prisutnog članstva kolektiva.</p>
-<br>
-<p>Za ukidanje članstva u kolektivu pojedinac se moze sam iskljuciti u bilo kom momentu ili moze biti izglasan sa dvotrećinskom većinom prisutnog članova.</p>
-<br>
-<p>Ne postoji ograničenje broja članova glasačkog tela.</p>
-<br>
-<p>Trenutni članovi glasačkog tela su pod pseudonimom stvn, z01a, anonionman, byte, goodv1bes, fram3d</p>
-<br>
-<p>Samo članovi koji su fizički prisutni imaju pravo glasa.</p>
-<br>
-<p>Decentrala je zajednica okupljena oko decentralizacije tehnologija i širenja znanja. Decentralizacija uključuje ravnopravnost korišćenja tehnologije, slobodnog softvera, privatnost i bezbednost.</p>
-<br>
-<p>Decentrala prihvata donacije iskljucivo od fizičkog lica, bez uslova i obaveza.</p>
-<br>
-<p>Svaki pojedinac i grupa ima pravo da sprovodi akcije u duhu ciljeva Decentrale koje su definisane statutom, ako su prethodno objavljeni i objašnjeni na javnim digitalnim kanalima komunikacije Decentrale.</p>
-<br>
-<p>Ako član glasačkog tela nije prisutan tokom tri uzastopna sastanka automatski je isključen iz glasačkog tela.</p>
-<br>
-<p>Član moze biti ponovo ukljucen u glasacko telo po vec definisanoj proceduri dodavanja novog clana, ako je prisutan na tom sastanku.</p>
-<br>
-<p> Vreme i mesto sastanka skupštine Decentrale se mora najaviti bar nedelju dana pred vremena sastanka na forumu Decentrale.</p>
-<br>
-<p> Sastanak glasačkog tela treba se održati barem jednom u dva meseca.</p>
-<br>
-<p> Na sastanku glasačkog tela se jedino moze glasati o tačkama koje su najavljene na forumu Decentrale, bar nedelju dana pre vremena sastanka.</p>

pages/en/webring.html

@@ -1,5 +0,0 @@
-<h1>Webring</h1>
-<ul>
-  <li><a href="https://pionir.org">Pionir school</a></li>
-  <li><a href="https://tilda.center">Tilda Center</a></li>
-</ul>

pages/sr/about.html

@@ -1,10 +0,0 @@
-<h1>O nama</h1>
-<dl>
- <dt>Statut:</dt>
-  <dd> Sve odluke se donose po principu direktne demokratije. Nas statut mozete pogledati na <a href="/statute">stranici za statut</a>. </dd>
-
- <dt>Kontakt:</dt>
-  <dd>Možeš nam poslati mejl na adresu <a href="mailto:dmz@dmz.rs">dmz@dmz.rs</a> ili se možeš pridružiti našem <a href="https://forum.dmz.rs">Forumu</a>.</dd>
-  <dd>Takođe smo dostupni i na <a href="https://balkan.fedive.rs/@decentrala">Fediversu!</a></dd>
-  <dd>U slučaju da pronađeš <em>bug</em> na sajtu, bili bismo ti jako zahvalni ako nam ga prijaviš.</dd>
-</dl>

pages/sr/account.html

@@ -1,8 +0,0 @@
-<h1>Nalog</h1>
-<p>Ako si napravio nalog na dmz.rs možeš koristiti naš XMPP i e-mail server, kao i ostale servise koji podržavaju LDAP login.<p>
-<p>Za više o XMPP-u pogledaj <a href="https://wiki.dmz.rs/en/tutorial/conversations-srpski">tutorial</a>. <p>
-<p>Podešavanja za <a href="https://www.thunderbird.net">Thundebird</a> mail klijent možeš pogledati na <a href="/img/mailsettings.png">slici</a>.<p>
-
-<p><a href="/account/register/">Registruj se</a><p>
-<p><a href="/account/unregister/">Izbriši nalog</a><p>
-<p><a href="/account/changepassword/">Promeni lozinku</a><p>

pages/sr/donations.html

@@ -1,9 +0,0 @@
-<h1>Donacije</h1>
-<dd>
-    Decentrala prihvata donacije isključivo od fizičkih lica i bez obaveza.
-  Nezavisni smo i trudimo se da to održimo.
-  Možeš nam donirati stari hardver (laptopove, telefone, PC komponente), a mi ćemo mu naći upotrebu u Decentrali ili dati ljudima kojima je potreban.
-    Takođe možeš donirati bitcoin i monero, slanjem na naredne adrese:
-    <p>Bitcoin: bc1qjhsfgq79wuzzv32yml9zglwzf9qcwfj3atuy74</p>
-    <p>Monero: 8BESz45LnxrgCwZP32KieiN1D4LinCfsS1YjdFHfGXrVCmPs35167QsW1gd7qbff4UAtBbT6oWrkbfZnJm71HornVRiRZFS</p>
-</dd>

pages/sr/events.html

@@ -1,4 +0,0 @@
-<h1>Događaji</h1>
-<p>Naredna lista sadrži sve predstojeće događaje. Za listu održanih događaja pogledaj <a href="/events_archive">arhivu</a>.</p><br>
-<p>Događaje možeš učitati i sa <a href="https://dmz.rs/events.ical">ical</a> datotekom.</p><br>
-

pages/sr/events_archive.html

@@ -1,2 +0,0 @@
-<h1>Arhiva događaja</h1>
-<p>Svi događaji koje smo do sada organzivali. Predstojeće događaje možeš naći <a href="/events">ovde</a></p><br>

pages/sr/index.html

@@ -1,27 +0,0 @@
-<h1>Dobrodošli!</h1>
-<p>
-  Mi smo <em>Decentrala</em> - grupa entuzijasta okupljena oko ideja decentralizacije i slobodnog širenja znanja.
-  Zvuči interesantno? Evo još nekih stvari o nama:
-</p>
-<dl>
-  <dt>Motivacija:</dt>
-  <dd>Decentralizacijom postizemo <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#odrzivost">odrzivost</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#dostupnost">dostupnost</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#pristupacnost">pristupacnost</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#nezavisnost">nezavisnost</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#privatnost">privatnost</a> i <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#sloboda">slobodu</a>. Na ovim mrezama ima manje <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#manipulacija">manipulacije</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#propaganda">propagande</a>, reklama, i <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#neopterecenost-paznje-sporednim-stvarima">nisu dizajnirane za zadrzavanje paznje (zaglupljivanje)</a>.
-    <a href="https://forum.dmz.rs/t/zasto-nam-je-decentralizacija-bitna/506/1">Recite zasto je vama decentralizacija bitna</a>
-  </dd>
-  <dt>Znanje:</dt>
-  <dd>Sve naše radionice su besplatne i otvorene za sve zainteresovane.
-    Ako želiš nešto da podeliš najavi se na našem <a href="https://forum.dmz.rs">Forumu</a> i održi radionicu kod nas!
-  </dd>
-  <dt>Akcije:</dt>
-  <dd>Povremeno organizujemo različite akcije, hakatone, crypto-partije, izložbe i slične događaje otvorene za sve
-    zainteresovane. </dd>
-  <dt>Servisi:</dt>
-  <dd>Na našim serverima pokrećemo razne servise (email, git, wiki i druge) koji su otvoreni za sve i koji se mogu
-    koristiti sa ili bez našeg naloga.</dd>
-</dl>
-<p>
-  Ako si i dalje zainteresovan, možeš napraviti <a href="/account">nalog</a> na našem serveru koji će ti
-  omogućiti korišćenje svih naših <a href="/services">servisa</a>.
-  Ako želiš prvo da vidiš kako to sve izgleda u realnosti, možeš doći na neki od naših <a
-    href="/events">događaja</a>, i tu nas upoznati!
-</p>

pages/sr/services.html

@@ -1,65 +0,0 @@
-<h1>Servisi</h1>
-<table>
-  <tr>
-    <th>Servis</th>
-    <th>Opis</th>
-  </tr>
-  <tr>
-    <td><a href="/account">E-mail</a></td>
-    <td>E-mail nalog koji možeš da koristiš sa bilo kojim email
-      klijentom generalne namene (na primer <a href="https://www.thunderbird.net/">Thunderbird</a>-om).</td>
-  </tr>
-  <tr>
-    <td><a href="https://forum.dmz.rs/">Forum</a></td>
-    <td>Forum na kom obično organizujemo naše <a href="/events">događaje</a>.
-    </td>
-  </tr>
-  <tr>
-    <td><a href="/account">Chat</a></td>
-    <td>Održavamo sopstveni XMPP server, na kojem možeš da napraviš nalog.
-      Ako već poseduješ nalog možeš da nas nađeš u grupi <a
-        href="decentrala@conference.dmz.rs">decentrala@conference.dmz.rs</a>.
-    </td>
-  </tr>
-  <tr>
-    <td><a href="https://gitea.dmz.rs/">Git</a></td>
-    <td><a href="https://gitea.io/en-us/">Gitea</a> instanca na kojoj držimo kôd kao i ostale resurse za naše
-      <a href="/projects">projekte</a>, <a href="/events">događaje</a>, kao i projekte naših
-      prijatelja.
-      Ovo može biti dom tvog sledećeg projekta. Bolji od Github-a.
-    </td>
-  </tr>
-  <tr>
-    <td><a href="https://wiki.dmz.rs/">Wiki</a></td>
-    <td><a href="https://js.wiki/">Wiki.js</a> instanca koju koristimo da dokumentujemo naše
-      <a href="/projects">projekte</a> kao i ostale <a href="/events">događaje</a>.
-    </td>
-  </tr>
-  <tr>
-    <td><a href="https://nextcloud.dmz.rs/">Nextcloud</a></td>
-    <td><a href="https://nextcloud.com/">Nextcloud</a> instanca koju koristimo da zapisujemo stvari koje planiramo da uradimo i kao kalendar.
-    </td>
-  </tr>
-  <tr>
-  </tr>
-  <tr>
-    <td><a href="https://search.dmz.rs/">Search</a></td>
-    <td><a href="https://github.com/hnhx/librex/">LibreX</a> instanca koju koristimo za pretraživanje Interneta.
-      Bolji od Google-a.
-    </td>
-  </tr>
-  <tr>
-    <td><a href="https://pastebin.dmz.rs/">Pastebin</a></td>
-    <td><a href="https://privatebin.info/">PrivateBin</a> instanca koju koristimo za brzo deljenje tekstualnih fajlova
-    </td>
-  </tr>
-  <tr>
-    <td><a href="ssh://soft.dmz.rs:2222/">Soft Serve</a></td>
-    <td><a href="https://github.com/charmbracelet/soft-serve">Soft Serve</a> instanca koju koristimo kao zamenu za Gitea servis.
-      Soft Serve radi potpuno iz terminala
-    </td>
-  </tr>
-</table>
-<p>Ovo su neki od servisa koje trenutno održavamo na našim serverima. Da bi koristio ove servise, <em>možeš</em> da se
-  registuješ na svaki servis posebno, a možeš i da napraviš jedinstveni <a href="/account">nalog</a> na našem
-  serveru i da koristiš sve servise sa istim nalogom.</p>

pages/sr/statute.html

@@ -1,32 +0,0 @@
-<h1>Statut</h1>
-<p>O pravilima i statutu Decentrale odlucuje nezavisno glasacko telo u kome se odluke donose se na principima direktne demokratije, dogovorom ili najmanje dvotrećinskom većinom ukupnog broja članova kolektiva.</p>
-<br>
-<p>Delovi statua mogu biti definisati kao nepromenjivi i protiv nepromenjivog delova statua se ne može glasati.</p>
-<br>
-<p>Sastanak glasačkog tela je validan ukoliko mu prisustvuje najmanje troje članova glasačkog tela.</p>
-<br>
-<p>Decentrala o zahtevima za prijem u članstvo odlučuje dvotrećinskom većinom prisutnog članstva kolektiva.</p>
-<br>
-<p>Za ukidanje članstva u kolektivu pojedinac se moze sam iskljuciti u bilo kom momentu ili moze biti izglasan sa dvotrećinskom većinom prisutnog članova.</p>
-<br>
-<p>Ne postoji ograničenje broja članova glasačkog tela.</p>
-<br>
-<p>Trenutni članovi glasačkog tela su pod pseudonimom stvn, z01a, anonionman, byte, goodv1bes, fram3d</p>
-<br>
-<p>Samo članovi koji su fizički prisutni imaju pravo glasa.</p>
-<br>
-<p>Decentrala je zajednica okupljena oko decentralizacije tehnologija i širenja znanja. Decentralizacija uključuje ravnopravnost korišćenja tehnologije, slobodnog softvera, privatnost i bezbednost.</p>
-<br>
-<p>Decentrala prihvata donacije iskljucivo od fizičkog lica, bez uslova i obaveza.</p>
-<br>
-<p>Svaki pojedinac i grupa ima pravo da sprovodi akcije u duhu ciljeva Decentrale koje su definisane statutom, ako su prethodno objavljeni i objašnjeni na javnim digitalnim kanalima komunikacije Decentrale.</p>
-<br>
-<p>Ako član glasačkog tela nije prisutan tokom tri uzastopna sastanka automatski je isključen iz glasačkog tela.</p>
-<br>
-<p>Član moze biti ponovo ukljucen u glasacko telo po vec definisanoj proceduri dodavanja novog clana, ako je prisutan na tom sastanku.</p>
-<br>
-<p> Vreme i mesto sastanka skupštine Decentrale se mora najaviti bar nedelju dana pred vremena sastanka na forumu Decentrale.</p>
-<br>
-<p> Sastanak glasačkog tela treba se održati barem jednom u dva meseca.</p>
-<br>
-<p> Na sastanku glasačkog tela se jedino moze glasati o tačkama koje su najavljene na forumu Decentrale, bar nedelju dana pre vremena sastanka.</p>

pages/sr/webring.html

@@ -1,5 +0,0 @@
-<h1>Webring</h1>
-<ul>
-  <li><a href="https://pionir.org">Slobodna škola Pionir</a></li>
-  <li><a href="https://tilda.center">Tilda Centar</a></li>
-</ul>

prep.py

@@ -15,6 +15,7 @@ TYPES_DICT = {
     "meeting": ("sastanak", "meeting"),
     "conference": ("konferencija", "conference"),
     "music": ("svirka", "gig"),
+    "party": ("zabava", "entertainment"),
 }
 
 def load_events(csv_path:str) -> list[dict]:
@@ -29,11 +30,16 @@ def load_events(csv_path:str) -> list[dict]:
             event_location = event[2]
             event_title = event[3]
             types =  event[4].split()
+            try:
+                link = event[5]
+            except IndexError:
+                link = ""
             current_event = {"date":event_date_parsed,
                              "time":event_time,
                              "location": event_location,
                              "title":event_title.strip(),
-                             "types": types }
+                             "types": types,
+                             "link": link}
             events.append(current_event)
         return events
 
@@ -47,6 +53,9 @@ def build_html(events: list[dict], dayNames: list[str], typesNames: dict) -> str
         time = event["time"]+"h"
         event_html = []
         event_html.append(f"<div class='date'>{date} {time}</div>")
+        if event["link"] != "":
+            event_html.append(f"<div class='title'><a href=\"{event['link']}\">{title}</a></div>")
+        else:
             event_html.append(f"<div class='title'>{title}</div>")
         if "https://" in location:
             place,link = location.split("https://")
@@ -83,6 +92,7 @@ def build_ical(events: list[dict]) -> str:
         location = event["location"]
         date = event["date"]
         time = event["time"]
+        url = event["link"]
 
         uid = str(date.month).zfill(2) + str(date.day).zfill(2) + time[:2]
         date = str(date.year) + str(date.month).zfill(2) + str(date.day).zfill(2) 
@@ -96,6 +106,7 @@ def build_ical(events: list[dict]) -> str:
         event_template = event_template.replace("<!--CREATED-->", created)
         event_template = event_template.replace("<!--DATE-->", date)
         event_template = event_template.replace("<!--TITLE-->", title)
+        event_template = event_template.replace("<!--URL-->", url)
 
         events_ical += event_template
     # Footer

site/styles/deconference.css

@@ -0,0 +1,11 @@
+dl {
+  padding: 1rem 0;
+}
+
+dt {
+  font-weight: bold;
+}
+
+dd {
+  margin: 0 0 1rem 1rem;
+}

site/styles/donations.css

@@ -0,0 +1,14 @@
+p {
+  margin-bottom: 1.5rem;
+}
+
+li {
+  padding-left: 1.5rem;
+}
+
+li i {
+  word-break: break-all;
+  font-size: 1rem;
+}
+
+

site/styles/services.css

@@ -20,3 +20,7 @@ td {
   padding: 0 1rem 1rem 1rem;
   vertical-align: top;
 }
+
+td a {
+  word-break: keep-all;
+}

site/styles/statute.css

@@ -0,0 +1,10 @@
+h2 {
+  margin: 1.5rem 0;
+  font-weight: normal;
+  font-size: 1.4em;
+  font-variant-caps: small-caps;
+}
+
+p {
+  padding-bottom: 1.5rem;
+}

site/styles/style.css

@@ -20,6 +20,7 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
+  word-break: break-word;
 }
 
 html,

src/en/about.md

@@ -0,0 +1,7 @@
+# About us
+
+Statute: We make decisions by direct democracy. Our statute can be found at [statute page](/en/statute)Contact:
+ You can send mail to [dmz@dmz.rs](mailto:dmz@dmz.rs) or you can register on [our Forum](https://forum.dmz.rs).
+ Also, we are available on the [Fediverse!](https://balkan.fedive.rs/@decentrala)
+ If you find a bug on the site, please do tell us. We would be very grateful.
+

src/en/account.md

@@ -0,0 +1,14 @@
+# Account
+
+If you have created an account on dmz.rs, you can use our XMPP and e-mail server, as well as other services that support LDAP login.
+
+For more on XMPP see [this tutorial](https://wiki.dmz.rs/en/tutorial/conversations).
+
+You can see settings for the [Thundebird](https://www.thunderbird.net) mail client on this [image](/img/mailsettings.png).
+
+[Register](/account/register/)
+
+[Delete account](/account/unregister/)
+
+[Change password](/account/changepassword/)
+

src/en/deconference.md

@@ -0,0 +1,44 @@
+# Deconference
+
+## [Program](\#program)
+
+11:00 Otvaranje
+
+12:00 [Cryptoparty](https://wiki.dmz.rs/en/decentrala/dogadjaji/cryptoparty)
+
+14:00 [Hakaton](https://wiki.dmz.rs/en/decentrala/dogadjaji/hakaton)
+
+16:00 [Lightning talks](https://wiki.dmz.rs/en/decentrala/dogadjaji/lightningtalks)
+
+18:00 Diskusije
+
+20:00 [Cryptoparty](https://wiki.dmz.rs/en/decentrala/dogadjaji/cryptoparty)
+
+22:00 Kraj
+
+## [What?](\#what)
+
+Deconference is the inaugural conference organized by [Decentrala](https://dmz.rs), a Belgrade hackerspace. It serves as a platform for individuals to present and discuss ideas related to decentralization in all its forms.
+
+## [When & Where?](\#when-and-where)
+
+Deconference will take place all day on Sunday, September 15, 2024, at Cultural Center Magacin, located at [Kraljevića Marka 4-8, Belgrade](https://osm.org/go/xf3Fz31te?node=1226456745). The evening prior, a social gathering will be hosted at [Community Center Krov](https://dckrov.rs/), located at [Kraljice Marije 47, Belgrade](https://osm.org/go/xf3HQQdIH).
+
+## [Why?](\#why)
+
+Decentrala was founded by a small group of enthusiasts united by the idea of technological decentralization. Over the past year and a half, we've organized over 160 events—lectures, workshops, discussions, hackathons—aimed at democratizing technological knowledge and educating people about privacy, open source principles, the right to repair (and how to repair), digital assets, and usage rights. Since day one, our approach has been to inform individuals about alternatives rather than impose opinions upon them.
+
+Through engaging with diverse visitors, many from non-technical backgrounds, we've come to realize that decentralization encompasses more than just "open technology." Many activists and organizations today advocate for various forms of decentralization. Therefore, we welcome stories about decentralization from diverse perspectives.
+
+## [Who?](\#who)
+
+Deconference is an open platform for anyone interested in discussing, demonstrating, or exploring decentralization. You can register your event by emailing [dekonferencija@dmz.rs](mailto:dekonferencija@dmz.rs) up until the day of the Deconference (September 15).
+
+We will update this section as topics are confirmed.
+
+## [How?](\#how)
+
+The Deconference is funded by the organizers' private assets. Like all of Decentrala's activities, Deconference is free for all attendees. Unfortunately, we are unable to provide grants to lecturers or presenters.
+
+Decentrala accepts donations exclusively from individuals.
+

src/en/donations.md

@@ -0,0 +1,33 @@
+# Donations
+
+Decentrala accepts donations exclusively from the natural person and without
+any obligations. We are independent and we try to keep it that way.
+
+
+We accept old hardware (laptops, phones, PC components), which we would fix
+and find a use for it in Decentrala or donate to people in need
+(permacomputing).
+
+
+Support can also be contributing to our
+[wiki](https://wiki.dmz.rs) page, projects on
+[gitea](https://gitea.dmz.rs), writing
+documentation, reporting and/or fixing bugs, typos, translations, etc.
+
+
+If you aqure some kind of knowldege you would like to share with the
+Decentrala's participants, you can do it as a forum post, wiki page, or
+participate in one of our events, probably host one.
+
+
+Simple usage of our software also counts as a contribution, because that way
+you will join the decetralization.
+
+
+Also, we accept donations in bitcoin and monero to the following addresses:
+
+
+- Bitcoin: _bc1qjhsfgq79wuzzv32yml9zglwzf9qcwfj3atuy74_
+- Monero:
+   _8BESz45LnxrgCwZP32KieiN1D4LinCfsS1YjdFHfGXrVCmPs35167QsW1gd7qbff4UAtBbT6oWrkbfZnJm71HornVRiRZFS_
+

src/en/events.md

@@ -0,0 +1,6 @@
+# Events
+
+Following list contains all forthcoming events. Held events are listed in [archive](/en/events_archive).
+
+We also provide [ical file](https://dmz.rs/events.ical)
+

src/en/events_archive.md

@@ -0,0 +1,4 @@
+# Events archive
+
+All events that we organized so far. You can find future events on [Events page](/en/events)
+

src/en/index.md

@@ -0,0 +1,16 @@
+# Welcome!
+
+We are _Decentrala_ \- a group of enthusiasts gathered around the idea of decentralization and knowledge sharing.
+Here are some more facts about us:
+
+Motivation:Decentralization promotes [sustainability](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#odrzivost), [availability](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#dostupnost), [accesibility](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#pristupacnost), [autonomy](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#nezavisnost), [privacy](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#privatnost) and [freedom](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#sloboda). On those networks we have less [manipulation](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#manipulacija), [propaganda](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#propaganda), ads, and [are not designed to lock your attention (dumbing down)](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#neopterecenost-paznje-sporednim-stvarima).
+ [Tell us why decentralization is important to you](https://forum.dmz.rs/t/zasto-nam-je-decentralizacija-bitna/506/1)Knowledge:
+ All our workshops are free and open to everyone.
+ Also, if you have something to share, feel free to announce the event on the Forum.
+ Actions:From time to time we organize actions, hackathons, crypto parties, exhibitions, etc.Services:Our servers run various services (like e-mail, git, wiki, etc...) that are open to everyone.
+
+If you are still interested, you can create an [account](/en/account)
+on our server which will enable the use of all our [services](/en/services).
+If you want to see first how it all looks, you can come to one of our
+[event](/en/events), and meet us there!
+

src/en/services.md

@@ -0,0 +1,18 @@
+# Services
+
+ServiceDescription[E-mail](/account)E-mail account that you can use with any e-mail client (for example, with the [Thunderbird](https://www.thunderbird.net/)).[Forum](https://forum.dmz.rs/)Forum for general discussion and [event](/events) organization.[Chat](/account)
+ We have our XMPP server, on which you can make an account.
+ If you already have an account, you can find us at group [decentrala@conference.dmz.rs](decentrala@conference.dmz.rs).
+ [Git](https://gitea.dmz.rs/)[Gitea](https://gitea.io/en-us/) instance on which we host our code and resources (including the code for this site).
+ [Wiki](https://wiki.dmz.rs/)[Wiki.js](https://js.wiki/) instance on which we publish documentation for our projects,
+ [events](/events) resources, and tutorials.
+ [Nextcloud](https://nextcloud.dmz.rs/)[Nextcloud](https://nextcloud.com/) instance on which we organize tasks we need to do and use as calandar.
+ [Search](https://search.dmz.rs/)[LibreX](https://github.com/hnhx/librex/) instance used for Web searching.[Pastebin](https://pastebin.dmz.rs/)[PrivateBin](https://privatebin.info/) instance we use for sharing text files[Soft Serve](ssh://soft.dmz.rs:2222/)[Soft Serve](https://github.com/charmbracelet/soft-serve) instance that we use as a replacement for the Gitea service.
+ Soft Serve works entirely from the terminal.
+
+
+These are some of the services we currently maintain on our servers.
+To use these services, you can register for each service separately,
+or you can create a unique [account](/en/account)
+on our server and use all services with the same account.
+

src/en/statute.md

@@ -0,0 +1,68 @@
+# Statute
+
+Decentrala je zajednica okupljena oko decentralizacije tehnologija i širenja
+znanja. Decentralizacija uključuje ravnopravnost korišćenja tehnologije,
+slobodnog softvera, privatnost i bezbednost.
+
+
+Decentrala prihvata donacije iskljucivo od fizičkog lica, bez uslova i
+obaveza.
+
+
+Delovi statua mogu biti definisati kao nepromenjivi i protiv nepromenjivog
+delova statua se ne može glasati.
+
+
+Svaki pojedinac i grupa ima pravo da sprovodi akcije u duhu ciljeva
+Decentrale koje su definisane statutom, ako su prethodno objavljeni i
+objašnjeni na javnim digitalnim kanalima komunikacije Decentrale.
+
+
+O pravilima i statutu Decentrale odlucuje nezavisno glasacko telo u kome se
+odluke donose se na principima direktne demokratije, dogovorom ili najmanje
+dvotrećinskom većinom ukupnog broja članova kolektiva.
+
+
+## Glasacko telo
+
+Decentrala o zahtevima za prijem u članstvo odlučuje dvotrećinskom većinom
+prisutnog članstva kolektiva.
+
+
+Samo članovi koji su fizički prisutni imaju pravo glasa.
+
+Ne postoji ograničenje broja članova glasačkog tela.
+
+Za ukidanje članstva u kolektivu pojedinac se moze sam iskljuciti u bilo kom
+momentu ili moze biti izglasan sa dvotrećinskom većinom prisutnog članova.
+
+
+Ako član glasačkog tela nije prisutan tokom tri uzastopna sastanka
+automatski je isključen iz glasačkog tela.
+
+
+Član moze biti ponovo ukljucen u glasacko telo po vec definisanoj proceduri
+dodavanja novog clana, ako je prisutan na tom sastanku.
+
+
+Trenutni članovi glasačkog tela su pod pseudonimom fram3d, climatechanged,
+anonionman, goodv1bes, coja, vuk, bora, mad3v, wingaxe, nothke, duchman,
+texhno, txrpe, fl3ka, euffrat.
+
+
+## Sastanci
+
+Sastanak glasačkog tela je validan ukoliko mu prisustvuje najmanje troje
+članova glasačkog tela.
+
+
+Vreme i mesto sastanka skupštine Decentrale se mora najaviti bar nedelju
+dana pred vremena sastanka na forumu Decentrale.
+
+
+Na sastanku glasačkog tela se jedino moze glasati o tačkama koje su
+najavljene na forumu Decentrale, bar nedelju dana pre vremena sastanka.
+
+
+Sastanak glasačkog tela treba se održati barem jednom u dva meseca.
+

src/en/webring.md

@@ -0,0 +1,5 @@
+# Webring
+
+- [Pionir school](https://pionir.org)
+- [Tilda Center](https://tilda.center)
+

src/sr/about.md

@@ -0,0 +1,4 @@
+# O nama
+
+Statut: Sve odluke se donose po principu direktne demokratije. Nas statut mozete pogledati na [stranici za statut](/statute). Kontakt:Možeš nam poslati mejl na adresu [dmz@dmz.rs](mailto:dmz@dmz.rs) ili se možeš pridružiti našem [Forumu](https://forum.dmz.rs).Takođe smo dostupni i na [Fediversu!](https://balkan.fedive.rs/@decentrala)U slučaju da pronađeš _bug_ na sajtu, bili bismo ti jako zahvalni ako nam ga prijaviš.
+

src/sr/account.md

@@ -0,0 +1,14 @@
+# Nalog
+
+Ako si napravio nalog na dmz.rs možeš koristiti naš XMPP i e-mail server, kao i ostale servise koji podržavaju LDAP login.
+
+Za više o XMPP-u pogledaj [tutorial](https://wiki.dmz.rs/en/tutorial/conversations-srpski).
+
+Podešavanja za [Thundebird](https://www.thunderbird.net) mail klijent možeš pogledati na [slici](/img/mailsettings.png).
+
+[Registruj se](/account/register/)
+
+[Izbriši nalog](/account/unregister/)
+
+[Promeni lozinku](/account/changepassword/)
+

src/sr/blog.md

@@ -1 +1,2 @@
 Ova stranica je trenutno u izradi...
+

src/sr/deconference.md

@@ -0,0 +1,44 @@
+# Dekonferencija
+
+## [Program](\#program)
+
+11:00 Otvaranje
+
+12:00 [Cryptoparty](https://wiki.dmz.rs/en/decentrala/dogadjaji/cryptoparty)
+
+14:00 [Hakaton](https://wiki.dmz.rs/en/decentrala/dogadjaji/hakaton)
+
+16:00 [Lightning talks](https://wiki.dmz.rs/en/decentrala/dogadjaji/lightningtalks)
+
+18:00 Diskusije
+
+20:00 [Cryptoparty](https://wiki.dmz.rs/en/decentrala/dogadjaji/cryptoparty)
+
+22:00 Kraj
+
+## [Šta?](\#what)
+
+Dekonferencija je prva konferencija organizovana od strane [Decentrale](https://dmz.rs), Beogradskog hakerspejsa. Dekonferencija služi kao platforma za predstavljanje i diskusiju ideja decentralizacije u svim svojim oblicima.
+
+## [Kad & Gde?](\#when-and-where)
+
+Dekonferencija će se održati u nedelju, 15.-og Septembra, 2024, u Kulturnom Centru Magacin, na adresi [Kraljevića Marka 4-8, Beograd](https://osm.org/go/xf3Fz31te?node=1226456745). Veče pre, održaće se druženje povodom organizovanja konferencije u prostorijama [Društvenog Centra Krov](https://dckrov.rs/), na adresi [Kraljice Marije 47, Beograd](https://osm.org/go/xf3HQQdIH).
+
+## [Zašto?](\#why)
+
+Decentrala je osnovana od strane male grupe entuzijasta udružene oko ideje decentralizacije tehnologije. Poslednjih godinu i po, organizovali smo više od 160 događaja—predavanja, radionica, diskusija, hakatona—sa ciljem demokratizacije tehnološkog znanja i edukacije o privatnosti, open source principa, prava na popravku (i kako popraviti), digitalna svojina, i pravo korišćenja. Od prvog dana, naš pristup je bio da informišemo pojedince o alternativama umesto da im namećemo naše mišljenje.
+
+Vremenom, angažovanjem sa raznovrsnim posetiocima, od kojih su mnogi iz ne-tehničkih sfera, shvatili smo da decentralizacija obuhvata više od samo "otvorene tehnologije." Mnogi aktivisti i organizacije se danas zalažu za različite oblike decentralizacije. Zato, smatramo da su dobrodošle priče decentralizacije iz različitih perspektiva.
+
+## [Ko?](\#who)
+
+Dekonferencija je otvorena platforma za sve zainteresovane za diskusiju, demonstraciju, ili istraživanje decentralizacije. Možete registrovati vaš događaj slanjem email-a na [dekonferencija@dmz.rs](mailto:dekonferencija@dmz.rs) do dana Dekonferencije (15.-ti Septembar).
+
+Osvežićemo ovaj deo kako se teme događaja potvrde.
+
+## [Kako?](\#how)
+
+Dekonferencija je finansirana od strane ličnih sredstava organizatora. Kao i sve aktivnosti Decentrale, Dekonferencija je besplatna svima. Nažalost, nismo u stanju da pružimo subvencije predavačima.
+
+Decentrala prihvata donacije isključivo od fizičkih lica.
+

src/sr/donations.md

@@ -0,0 +1,32 @@
+# Donacije
+
+Decentrala prihvata donacije isključivo od fizičkih lica i bez obaveza.
+Nezavisni smo i trudimo se da to održimo.
+
+
+Prihvatamo stari hardver (laptopove, telefone, PC komponente), koje
+popravljamo i nalazimo mu dalju upotrebu u Decentrali ili ga doniramo dalje,
+onima kojima je potreban (permacomputing).
+
+
+Podrska takodje moze biti i u vidu doprinosa na nasoj
+[wiki](https://wiki.dmz.rs) strani, projektima na
+[gitea](https://gitea.dmz.rs), pisanjem
+dokumentacije i prijavom i ispravkom bugova, typos, prevoda, itd.
+
+
+Ako posedujete neko znanje koje bi zeleli da podelite sa ucesnicima
+Decentrale, to mozete uraditi u vidu forum posta, wiki strane ili
+ucestvovanjem na evenotovima, drizanjem predavanja.
+
+
+Jednostavno koriscenje naseg softwera se takodje racuna kao doprinos, posto
+bi se time pridruzili decentralizaciji.
+
+
+Takođe primamo donacije u bitcoinu i moneru na adresama:
+
+- Bitcoin: _bc1qjhsfgq79wuzzv32yml9zglwzf9qcwfj3atuy74_
+- Monero:
+   _8BESz45LnxrgCwZP32KieiN1D4LinCfsS1YjdFHfGXrVCmPs35167QsW1gd7qbff4UAtBbT6oWrkbfZnJm71HornVRiRZFS_
+

src/sr/events.md

@@ -0,0 +1,6 @@
+# Događaji
+
+Naredna lista sadrži sve predstojeće događaje. Za listu održanih događaja pogledaj [arhivu](/events_archive).
+
+Događaje možeš učitati i sa [ical](https://dmz.rs/events.ical) datotekom.
+

src/sr/events_archive.md

@@ -0,0 +1,4 @@
+# Arhiva događaja
+
+Svi događaji koje smo do sada organzivali. Predstojeće događaje možeš naći [ovde](/events)
+

src/sr/index.md

@@ -0,0 +1,16 @@
+# Dobrodošli!
+
+Mi smo _Decentrala_ \- grupa entuzijasta okupljena oko ideja decentralizacije i slobodnog širenja znanja.
+Zvuči interesantno? Evo još nekih stvari o nama:
+
+Motivacija:Decentralizacijom postizemo [odrzivost](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#odrzivost), [dostupnost](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#dostupnost), [pristupacnost](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#pristupacnost), [nezavisnost](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#nezavisnost), [privatnost](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#privatnost) i [slobodu](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#sloboda). Na ovim mrezama ima manje [manipulacije](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#manipulacija), [propagande](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#propaganda), reklama, i [nisu dizajnirane za zadrzavanje paznje (zaglupljivanje)](https://wiki.dmz.rs/en/zastojedecentralizacijabitna#neopterecenost-paznje-sporednim-stvarima).
+ [Recite zasto je vama decentralizacija bitna](https://forum.dmz.rs/t/zasto-nam-je-decentralizacija-bitna/506/1)Znanje:Sve naše radionice su besplatne i otvorene za sve zainteresovane.
+ Ako želiš nešto da podeliš najavi se na našem [Forumu](https://forum.dmz.rs) i održi radionicu kod nas!
+ Akcije:Povremeno organizujemo različite akcije, hakatone, crypto-partije, izložbe i slične događaje otvorene za sve
+ zainteresovane. Servisi:Na našim serverima pokrećemo razne servise (email, git, wiki i druge) koji su otvoreni za sve i koji se mogu
+ koristiti sa ili bez našeg naloga.
+
+Ako si i dalje zainteresovan, možeš napraviti [nalog](/account) na našem serveru koji će ti
+omogućiti korišćenje svih naših [servisa](/services).
+Ako želiš prvo da vidiš kako to sve izgleda u realnosti, možeš doći na neki od naših [događaja](/events), i tu nas upoznati!
+

src/sr/services.md

@@ -0,0 +1,24 @@
+# Servisi
+
+ServisOpis[E-mail](/account)E-mail nalog koji možeš da koristiš sa bilo kojim email
+ klijentom generalne namene (na primer [Thunderbird](https://www.thunderbird.net/)-om).[Forum](https://forum.dmz.rs/)Forum na kom obično organizujemo naše [događaje](/events).
+ [Chat](/account)Održavamo sopstveni XMPP server, na kojem možeš da napraviš nalog.
+ Ako već poseduješ nalog možeš da nas nađeš u grupi [decentrala@conference.dmz.rs](decentrala@conference.dmz.rs).
+ [Git](https://gitea.dmz.rs/)[Gitea](https://gitea.io/en-us/) instanca na kojoj držimo kôd kao i ostale resurse za naše
+ [projekte](/projects), [događaje](/events), kao i projekte naših
+ prijatelja.
+ Ovo može biti dom tvog sledećeg projekta. Bolji od Github-a.
+ [Wiki](https://wiki.dmz.rs/)[Wiki.js](https://js.wiki/) instanca koju koristimo da dokumentujemo naše
+ [projekte](/projects) kao i ostale [događaje](/events).
+ [Nextcloud](https://nextcloud.dmz.rs/)[Nextcloud](https://nextcloud.com/) instanca koju koristimo da zapisujemo stvari koje planiramo da uradimo i kao kalendar.
+ [Search](https://search.dmz.rs/)[LibreX](https://github.com/hnhx/librex/) instanca koju koristimo za pretraživanje Interneta.
+ Bolji od Google-a.
+ [Pastebin](https://pastebin.dmz.rs/)[PrivateBin](https://privatebin.info/) instanca koju koristimo za brzo deljenje tekstualnih fajlova
+ [Soft Serve](ssh://soft.dmz.rs:2222/)[Soft Serve](https://github.com/charmbracelet/soft-serve) instanca koju koristimo kao zamenu za Gitea servis.
+ Soft Serve radi potpuno iz terminala
+
+
+Ovo su neki od servisa koje trenutno održavamo na našim serverima. Da bi koristio ove servise, _možeš_ da se
+registuješ na svaki servis posebno, a možeš i da napraviš jedinstveni [nalog](/account) na našem
+serveru i da koristiš sve servise sa istim nalogom.
+

src/sr/statute.md

@@ -0,0 +1,68 @@
+# Statut
+
+Decentrala je zajednica okupljena oko decentralizacije tehnologija i širenja
+znanja. Decentralizacija uključuje ravnopravnost korišćenja tehnologije,
+slobodnog softvera, privatnost i bezbednost.
+
+
+Decentrala prihvata donacije iskljucivo od fizičkog lica, bez uslova i
+obaveza.
+
+
+Delovi statua mogu biti definisati kao nepromenjivi i protiv nepromenjivog
+delova statua se ne može glasati.
+
+
+Svaki pojedinac i grupa ima pravo da sprovodi akcije u duhu ciljeva
+Decentrale koje su definisane statutom, ako su prethodno objavljeni i
+objašnjeni na javnim digitalnim kanalima komunikacije Decentrale.
+
+
+O pravilima i statutu Decentrale odlucuje nezavisno glasacko telo u kome se
+odluke donose se na principima direktne demokratije, dogovorom ili najmanje
+dvotrećinskom većinom ukupnog broja članova kolektiva.
+
+
+## Glasacko telo
+
+Decentrala o zahtevima za prijem u članstvo odlučuje dvotrećinskom većinom
+prisutnog članstva kolektiva.
+
+
+Samo članovi koji su fizički prisutni imaju pravo glasa.
+
+Ne postoji ograničenje broja članova glasačkog tela.
+
+Za ukidanje članstva u kolektivu pojedinac se moze sam iskljuciti u bilo kom
+momentu ili moze biti izglasan sa dvotrećinskom većinom prisutnog članova.
+
+
+Ako član glasačkog tela nije prisutan tokom tri uzastopna sastanka
+automatski je isključen iz glasačkog tela.
+
+
+Član moze biti ponovo ukljucen u glasacko telo po vec definisanoj proceduri
+dodavanja novog clana, ako je prisutan na tom sastanku.
+
+
+Trenutni članovi glasačkog tela su pod pseudonimom fram3d, climatechanged,
+anonionman, goodv1bes, coja, vuk, bora, mad3v, wingaxe, nothke, duchman,
+texhno, txrpe, fl3ka, euffrat.
+
+
+## Sastanci
+
+Sastanak glasačkog tela je validan ukoliko mu prisustvuje najmanje troje
+članova glasačkog tela.
+
+
+Vreme i mesto sastanka skupštine Decentrale se mora najaviti bar nedelju
+dana pred vremena sastanka na forumu Decentrale.
+
+
+Na sastanku glasačkog tela se jedino moze glasati o tačkama koje su
+najavljene na forumu Decentrale, bar nedelju dana pre vremena sastanka.
+
+
+Sastanak glasačkog tela treba se održati barem jednom u dva meseca.
+

src/sr/webring.md

@@ -0,0 +1,5 @@
+# Webring
+
+- [Slobodna škola Pionir](https://pionir.org)
+- [Tilda Centar](https://tilda.center)
+

template/event.ical

@@ -9,5 +9,5 @@ LAST-MODIFIED:<!--CREATED-->
 LOCATION:DC Krov\, Kraljice Marije 47\, 6\, Beograd\, Serbia
 STATUS:CONFIRMED
 SUMMARY:<!--TITLE-->
-URL;TYPE=URI:https://dmz.rs/events
+URL;TYPE=URI:<!--URL-->
 END:VEVENT

template/page-en.html

@@ -3,6 +3,33 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <!--
+  <pre>
+
+                                *@@* 
+                               *@@@@*
+                                *@@*                               
+                                 ||                         
+                                 ||                      
+                       *@@*     *@@*     *@@*                
+                      *@@@@*===*@@@@*===*@@@@*
+                       *@@*     *@@*     *@@*
+                                 ||     //                              
+                                 ||   //                      
+                                *@@*//                      
+                               *@@@@*                         
+                                *@@*
+
+   ____  _____ ____ _____ _   _ _____ ____      _    _        _    
+  |  _ \| ____/ ___| ____| \ | |_   _|  _ \    / \  | |      / \   
+  | | | |  _|| |   |  _| |  \| | | | | |_) |  / _ \ | |     / _ \  
+  | |_| | |__| |___| |___| |\  | | | |  _ <  / ___ \| |___ / ___ \ 
+  |____/|_____\____|_____|_| \_| |_| |_| \_\/_/   \_\_____/_/   \_\
+
+  </pre>
+  -->
+
   <link rel="stylesheet" href="/styles/reset.css">
   <link rel="stylesheet" href="/styles/style.css">
   <!--ADDITIONAL_STYLE-->

template/page-sr.html

@@ -3,6 +3,33 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <!--
+  <pre>
+
+                                *@@* 
+                               *@@@@*
+                                *@@*                               
+                                 ||                         
+                                 ||                      
+                       *@@*     *@@*     *@@*                
+                      *@@@@*===*@@@@*===*@@@@*
+                       *@@*     *@@*     *@@*
+                                 ||     //                              
+                                 ||   //                      
+                                *@@*//                      
+                               *@@@@*                         
+                                *@@*
+
+   ____  _____ ____ _____ _   _ _____ ____      _    _        _    
+  |  _ \| ____/ ___| ____| \ | |_   _|  _ \    / \  | |      / \   
+  | | | |  _|| |   |  _| |  \| | | | | |_) |  / _ \ | |     / _ \  
+  | |_| | |__| |___| |___| |\  | | | |  _ <  / ___ \| |___ / ___ \ 
+  |____/|_____\____|_____|_| \_| |_| |_| \_\/_/   \_\_____/_/   \_\
+
+  </pre>
+  -->
+
   <link rel="stylesheet" href="/styles/reset.css">
   <link rel="stylesheet" href="/styles/style.css">
   <!--ADDITIONAL_STYLE-->