Compare commits

...
This repository has been archived on 2025-03-02. You can view files and clone it, but cannot push or open issues or pull requests.

51 commits

Author SHA1 Message Date
Daniel Molkentin 5351719af6 Merge branch 'staging' into production 2023-11-07 20:52:54 +01:00
Daniel Molkentin b54aae79f7
Merge pull request #14 from cccb/staging
Update production
2023-10-25 00:31:02 +02:00
Daniel Molkentin 0ca6400f2a
Merge pull request #7 from cccb/staging-to-prod
WIP: Switch on new homepage in prod
2023-10-25 00:30:08 +02:00
XenGi 32af508b9a
Merge pull request #9 from cccb/staging
Update release.yml
2023-06-14 12:31:56 +02:00
XenGi 74bda97bfc
Merge pull request #8 from cccb/staging
🚀
2023-06-14 12:28:39 +02:00
XenGi 20a422bc65
Update convert_page.sh 2023-06-14 12:24:12 +02:00
XenGi 30a9143fe6
Merge branch 'production' into staging-to-prod 2023-06-14 12:23:03 +02:00
Daniel Molkentin 52e402128a Merge branch 'staging' into 'production'
Staging

See merge request cccb/www!44
2023-01-28 20:19:24 +00:00
Daniel Molkentin f27ba8cf7c Merge branch 'staging' into 'production'
Updates and typo fixes

See merge request cccb/www!42
2022-06-19 19:40:26 +00:00
atoth d16624565a Merge branch 'staging' into 'production'
Korrektur Tippfehler

See merge request cccb/www!41
2022-06-13 21:44:02 +00:00
Daniel Molkentin 097b2134e2 Merge branch 'staging' into 'production'
Datengarten

See merge request cccb/www!40
2022-06-13 20:28:09 +00:00
atoth 2531732327 Merge branch 'staging' into 'production'
Update from staging to production

See merge request cccb/www!39
2022-05-22 20:30:58 +00:00
Daniel Molkentin 5962f0c805 Merge branch 'staging' into 'production'
Staging

See merge request cccb/www!38
2021-07-04 22:50:55 +00:00
atoth 0fcbb50477 Merge branch 'staging' into 'production'
Mailadresse geändert, weil hardcodet anstatt aus dem selben Datensatz wie im Footer

See merge request cccb/www!37
2021-07-01 14:31:20 +00:00
atoth 091927ea0f Merge branch 'staging' into 'production'
Staging

See merge request cccb/www!36
2021-07-01 14:11:28 +00:00
atoth 04cf3ff8de Merge branch 'staging' into 'production'
Typo danimo gefixt

See merge request cccb/www!35
2020-12-31 00:03:23 +01:00
atoth d487b829d0 Merge branch 'staging' into 'production'
Staging

See merge request cccb/www!34
2020-12-31 00:00:04 +01:00
Daniel Molkentin f3caba4095 Merge branch 'staging' into 'production'
Staging anfahrt.md

See merge request cccb/www!33
2020-05-23 16:50:47 +02:00
Daniel Molkentin 6a65098c27 Merge branch 'staging' into 'production'
Anti-Viren-Paket

See merge request cccb/www!32
2020-03-12 23:38:20 +01:00
Carina f7f3d0077a Merge branch 'staging' into 'production'
CR: Keine kreative Pause mehr

See merge request cccb/www!31
2020-03-06 11:56:53 +01:00
Daniel Molkentin 3c84f0753a Merge branch 'staging' into 'production'
CR: Fix start and end times

See merge request cccb/www!30
2020-02-27 16:50:50 +01:00
Daniel Molkentin 077e90c9a6 Merge branch 'staging' into 'production'
Chaosradio Dates

See merge request cccb/www!28
2020-02-27 14:41:00 +01:00
Daniel Molkentin 194bf7c313 Merge branch 'staging' into 'production'
DG107: URL to recording

See merge request cccb/www!27
2020-02-12 11:35:11 +01:00
Daniel Molkentin a258f94a61 Merge branch 'staging' into 'production'
Update DG107 from Staging

See merge request cccb/www!26
2020-02-04 23:23:30 +01:00
Carina bbb05ca227 Merge branch 'staging' into 'production'
Add upcoming Datengarten and fix title schema for last one

See merge request cccb/www!24
2020-02-02 21:27:05 +01:00
Daniel Molkentin 4309e9301b Merge branch 'staging' into 'production'
Hinweise auf Lastschrift entfernt

See merge request cccb/www!23
2020-01-28 17:04:05 +01:00
Daniel Molkentin 02fc98af46 Merge branch 'staging' into 'production'
datengarten: Fix listing order

See merge request cccb/www!22
2020-01-23 17:59:47 +01:00
Daniel Molkentin 34a95f41ff Merge branch 'staging' into 'production'
Videos fuer DG105 und 106

See merge request cccb/www!21
2020-01-23 17:53:54 +01:00
Daniel Molkentin dbd7b7c093 Merge branch 'staging' into 'production'
Neue Beitragsordnung

See merge request cccb/www!20
2020-01-19 22:31:48 +01:00
Carina 880272aa65 Merge branch 'staging' into 'production'
Added link to slides.

See merge request cccb/www!19
2020-01-15 21:41:06 +01:00
Daniel Molkentin bb960dbfdc Merge branch 'staging' into 'production'
Add dg106

See merge request cccb/www!18
2020-01-13 11:22:43 +01:00
Waschtl 00c5a5448c Merge branch 'staging' into 'production'
removed hint to Doppelmitgliedschaft, corrected membership fee

See merge request cccb/www!17
2020-01-12 14:56:40 +01:00
Daniel Molkentin 36c90dba48 Merge branch 'staging' into 'production'
dg105: Fix tags

See merge request cccb/www!16
2019-12-04 21:40:50 +01:00
Daniel Molkentin b7651631ad Merge branch 'staging' into 'production'
Staging to production for dg105

See merge request cccb/www!15
2019-12-04 16:56:49 +01:00
Daniel Molkentin 54af520ff8 Merge branch 'staging' into 'production'
Add tags

See merge request cccb/www!14
2019-11-04 22:32:12 +01:00
Daniel Molkentin 41415dc693 Merge branch 'staging' into 'production'
Staging

See merge request cccb/www!13
2019-11-04 22:17:15 +01:00
Daniel Molkentin 66419dce2e Merge branch 'staging' into 'production'
Fixes to DG102, updated README

See merge request cccb/www!12
2019-09-04 21:50:34 +02:00
Carina 3cca7294c8 Merge branch 'staging' into 'production'
Merge staging in production

See merge request cccb/www!11
2019-09-04 19:08:15 +02:00
Daniel Molkentin 0f52d2c435 Merge branch 'staging' into 'production'
Merge staging

See merge request cccb/www!10
2019-08-14 12:13:52 +02:00
Daniel Molkentin 8719b884e0 Merge branch 'staging' into 'production'
Neue Satzung, Beitragsordnung

See merge request cccb/www!9
2019-08-03 17:20:54 +02:00
Carina aa5a9cc544 Merge branch 'staging' into 'production'
Merge staging in production

See merge request cccb/www!7
2019-07-04 18:51:42 +02:00
Daniel Molkentin 9a67ec22f9 Merge branch 'staging' into 'production'
Update dg100, video for dg99

See merge request cccb/www!6
2019-06-11 22:15:49 +02:00
Daniel Molkentin e4771499ca Merge branch 'staging' into 'production'
dg100

See merge request cccb/www!5
2019-06-07 16:02:25 +02:00
Daniel Molkentin 56b3bf14ae Merge branch 'staging' into 'production'
dg99

See merge request cccb/www!4
2019-05-13 13:13:51 +02:00
Daniel Molkentin bfd564c2c1 Merge branch 'staging' into 'production'
Staging

See merge request cccb/www!3
2019-03-17 19:09:01 +01:00
Daniel Molkentin 3127cb5007 Merge branch 'staging' into 'production'
Staging

See merge request cccb/www!2
2019-03-15 04:08:18 +01:00
Daniel Molkentin 6d63004173 Ensure artifacts expire 2019-03-14 23:01:32 +01:00
Daniel Molkentin fb95b705bc Merge branch 'staging' 2019-03-14 21:02:51 +01:00
Daniel Molkentin f7a56196f4 Merge branch 'staging' 2019-03-14 00:01:51 +01:00
Daniel Molkentin 55d13a94e7 Adjust hugo params for master 2019-03-13 23:48:35 +01:00
Daniel Molkentin 49d5646b15 Allow specifying per-branch parameters 2019-03-13 23:46:54 +01:00

View file

@ -1 +1 @@
--baseURL=https://staging.berlin.ccc.de/
--baseURL=https://berlin.ccc.de/