Commit Graph

203 Commits

Author SHA1 Message Date
root
3df4e78885 Merge branch 'master' of https://git.fet.at/bofh/fet2020 2020-09-29 05:27:44 +00:00
root
a5815870bd Merge branch 'master' of /srv/andis 2020-09-29 05:25:08 +00:00
root
9b34f8d8ab build docker compose 2020-09-29 05:24:15 +00:00
18126f263f add initial #fachschaft when a new fet-meeting is created. 2020-09-24 09:49:32 +00:00
77abe560c6 if subtitle is None, it will be replacedwith a no-break space. 2020-09-24 09:02:59 +00:00
864a72e4dc add discord widget 2020-09-23 20:28:39 +00:00
526bfcd989 add 'delete etherpad cookie', optimize the 'checkPadExists' function 2020-09-23 16:47:44 +00:00
99e3034c0d check if etherpad server works and agenda and protocol links are available. 2020-09-22 15:40:45 +00:00
f135cbc82a Merge branch 'master' of https://git.fet.at/bofh/fet2020 2020-09-22 13:08:21 +00:00
60f05afe91 Merge /srv/deploy_1/app 2020-09-22 13:08:02 +00:00
www
4cc6e69e10 fixes for docker 2020-09-22 13:07:38 +00:00
3c74a8d7af Verification if the agenda can be created. 2020-09-18 14:44:57 +00:00
cce38b3f18 make master pep8-ready again 2020-09-18 13:37:50 +00:00
c4a61287e0 Merge /srv/deploy_1/app 2020-09-18 04:30:52 +00:00
49f64b9108 use environ for environment variables 2020-09-18 04:30:35 +00:00
4d5a03c01c remove some unused cookie from etherpad 2020-09-18 04:29:56 +00:00
root (lxc-fetsite-04)
e687621e40 multiple fixes Dockerfile 2020-09-16 19:49:43 +02:00
root (lxc-fetsite-04)
c6a22b91fc small fix to docker 2020-09-16 19:03:27 +02:00
www
e8049d4939 multistage docker 2020-09-13 19:33:48 +00:00
www
823ae5f623 docker file multistage 2020-09-13 18:29:00 +00:00
2da40982ef migrate db 2020-09-13 17:50:14 +00:00
d5f2d3e9c4 del apk 2020-09-13 17:32:32 +00:00
cf4ad7fc46 musldev 2020-09-13 17:30:43 +00:00
612a3c6413 linux headers 2020-09-13 17:29:07 +00:00
e062404893 add gcc 2020-09-13 17:27:40 +00:00
242a2e1663 dep 2020-09-13 17:26:43 +00:00
f687aa44cd reduce dockerfiles 2020-09-13 17:15:41 +00:00
9bd27ef366 django filter 2020-09-13 17:13:44 +00:00
cc33f83614 fix path dockerfile 2020-09-13 17:11:09 +00:00
33b12b9275 django filters 2020-09-13 17:10:21 +00:00
7dd27f863d dockerfile 2020-09-13 17:02:53 +00:00
d46e25393a uwsgi ini 2020-09-13 17:02:45 +00:00
353404b298 fix merge 2020-09-13 08:25:03 +00:00
f223b19923 Merge branch 'master' of https://git.fet.at/bofh/fet2020 2020-09-13 08:23:06 +00:00
0b05b7d513 merged 2020-09-13 08:22:45 +00:00
8522b33025 merged 2020-09-13 08:21:41 +00:00
c0285001d5 agenda api 2020-09-13 08:20:12 +00:00
72b4b7d982 fix master (fix thunbnail url) 2020-09-10 06:43:35 +00:00
ea2efe31f1 make master pep8-ready again 2020-09-10 06:42:59 +00:00
08e1e4eeba Merge branch 'master' of https://git.fet.at/bofh/fet2020 2020-09-10 06:19:34 +00:00
2ce310c81f agenda html 2020-09-10 06:16:40 +00:00
f9e5f50a57 clean-up 2020-09-10 00:40:26 +00:00
c463603e66 Merge branch 'master' of https://git.fet.at/bofh/fet2020 2020-09-09 20:52:27 +00:00
84e81232b0 tweak post api 2020-09-09 20:52:08 +00:00
5e37fd3da9 small changes (wording+word wrap) 2020-09-09 11:18:33 +00:00
4a22a27248 fix master 2020-09-08 16:14:35 +00:00
e62bdb4c88 merge2 2020-09-08 11:55:45 +00:00
dc032e014e merge 2020-09-08 11:55:05 +00:00
326f4670d0 fix has_protocol condition 2020-09-08 11:52:35 +00:00
5bf1ba3807 protocol & grid post show 2020-09-08 11:52:10 +00:00