Commits · main · chaostreffbern / chaostreffbern_website

28 Jun, 2022 2 commits
- Merge branch 'offener_hackerspace' into 'main' · b1865db6
  rexxnor authored Jun 28, 2022
```
wrote an announcement of the day of open hackerspaces

See merge request !255
```
  b1865db6
- updated with a different proposal · 3081bde3
  rexxnor authored Jun 24, 2022
  
  3081bde3
24 Jun, 2022 9 commits
- fixed typo in title · 1612d535
  rexxnor authored Jun 24, 2022
  
  1612d535
- Merge branch 'fix_i18n' into 'main' · 5884eb49
  rexxnor authored Jun 24, 2022
```
updated i18n_subsites Pelican plugin, removed obsolete CI files

See merge request !256
```
  5884eb49
- fixed a typo, better wording · 2b1d6ad4
  rexxnor authored Jun 24, 2022
  
  2b1d6ad4
- Merge branch 'remove_ads' into 'main' · 9645d6b4
  rexxnor authored Jun 24, 2022
```
Remove ads

See merge request !254
```
  9645d6b4
- removed obsolete files, updated README, removed legacy python stuff · 0b983101
  rexxnor authored Jun 24, 2022
  
  0b983101
- updated i18n_subsites Pelican plugin · b672fc9d
  rexxnor authored Jun 24, 2022
  
  b672fc9d
- wrote an announcement of the day of open hackerspaces · 533a5c0c
  rexxnor authored Jun 24, 2022
  
  533a5c0c
- fixed typo · e94d4caa
  rexxnor authored Jun 24, 2022
  
  e94d4caa
- removed obsolete unicode markers, removed ads for restaurants · ed660e25
  rexxnor authored Jun 24, 2022
  
  ed660e25
14 Jun, 2022 2 commits
- Merge branch 'remove-more-ccc-ch' into 'main' · afd7498f
  rexxnor authored Jun 14, 2022
```
remove more ccc-ch stuff

See merge request !253
```
  afd7498f
- remove more ccc-ch stuff · 0df4f411
  glow authored Jun 14, 2022
  
  0df4f411
03 Jun, 2022 3 commits
- Merge branch '2022-gv-protocol' into 'main' · cfdcdab2
  glow authored Jun 03, 2022
```
add 2022 GV protocol

See merge request !252
```
  cfdcdab2
- fixed a small rendering issue with a listing · 639ee9c2
  rexxnor authored Jun 03, 2022
  
  639ee9c2
- add 2022 GV protocol · 70fd7bab
  glow authored Jun 03, 2022
  
  70fd7bab
31 May, 2022 1 commit
- updated requirements to latest pelican version, switchted deploy to main · 7e4c79fb
  rexxnor authored May 31, 2022
  
  7e4c79fb
01 Feb, 2022 2 commits
- Merge branch 'glow-master-patch-02799' into 'master' · bf7371a5
  Saeschu authored Feb 01, 2022
```
Update ccc-ch-austritt.md

See merge request !251
```
  bf7371a5
- Update ccc-ch-austritt.md · d86e7db8
  glow authored Feb 01, 2022
  
  d86e7db8
26 Jan, 2022 2 commits
- Merge branch 'glow-master-patch-36758' into 'master' · a10331ec
  glow authored Jan 26, 2022
```
Small fix for Text

See merge request !250
```
  a10331ec
- Remove reason · 617a38a2
  glow authored Jan 26, 2022
  
  617a38a2
25 Jan, 2022 2 commits
- Merge branch 'ccc-ch-austritt' into 'master' · 709f23c6
  Adrian Stettler authored Jan 25, 2022
```
Add text for ccc-ch-exit

See merge request !249
```
  709f23c6
- Add text for ccc-ch-exit · bb60ee97
  glow authored Jan 25, 2022
  
  bb60ee97
13 Sep, 2021 2 commits
- Merge branch 'unpublish' into 'master' · 63a2c21c
  rexxnor authored Sep 13, 2021
```
Unpublish announcement regarding weekly meetings

See merge request !248
```
  63a2c21c
- Unpublish announcement regarding weekly meetings · 3e30d444
  glow authored Sep 13, 2021
```
As discussed in the last Grundsatzdiskussion

Revert this in a few months, when the situation changes
```
  3e30d444
08 Sep, 2021 8 commits
- Merge branch 'calendar_integration' into 'master' · 146e6222
  rexxnor authored Sep 08, 2021
```
removed agenda sidebar, added calendar page, removed pelican events plugin

See merge request !242
```
  146e6222
- switched to colon instead of a full stop · 98d38639
  rexxnor authored Sep 08, 2021
  
  98d38639
- Merge branch 'calendar_iframe' into 'calendar_integration' · ae2fadc1
  rexxnor authored Sep 08, 2021
```
Integrate Calendar as iFrame

See merge request !247
```
  ae2fadc1
- changed iframe links to embedded nextcloud calendar · 359c0390
  rexxnor authored Sep 08, 2021
  
  359c0390
- remove newline · 181ee8b1
  glow authored Sep 08, 2021
  
  181ee8b1
- Integrate Calendar as iFrame · cf1c567b
  glow authored Sep 08, 2021
```
Jenix has allowed chaostreffbern.ch to embed the page as an iframe. (It
will probably still be blocked on the devserver)
```
  cf1c567b
- Merge branch 'gv-protokoll-2021' into 'master' · 17d93a4d
  rexxnor authored Sep 08, 2021
```
remove duplicate header info

See merge request !245
```
  17d93a4d
- Merge branch 'obsolete_agenda' into 'calendar_integration' · 8456fa05
  rexxnor authored Sep 08, 2021
```
Delete some obsolete files and replace removed links

See merge request !246
```
  8456fa05
07 Sep, 2021 7 commits
- replace links to agenda.html with treff.html · a22d0c7c
  glow authored Sep 08, 2021
  
  a22d0c7c
- remove obsolete files · da3b8c67
  glow authored Sep 08, 2021
  
  da3b8c67
- remove duplicate header info · 5e8c7f57
  glow authored Sep 07, 2021
  
  5e8c7f57
- Merge branch 'width' into 'calendar_integration' · 196979d5
  rexxnor authored Sep 07, 2021
```
small width fix

See merge request !244
```
  196979d5
- small width fix · 87c4ea7f
  glow authored Sep 07, 2021
  
  87c4ea7f
- Merge branch 'gv-protokoll-2021' into 'master' · fb26037d
  rexxnor authored Sep 07, 2021
```
GV Protokoll 2021

See merge request !243
```
  fb26037d
- fix year · 1f53180a
  glow authored Sep 07, 2021
  
  1f53180a