diff --git a/src/camps/templates/bornhack-2016_camp_detail.html b/src/camps/templates/bornhack-2016_camp_detail.html index 0aa72220..4aa9ee31 100644 --- a/src/camps/templates/bornhack-2016_camp_detail.html +++ b/src/camps/templates/bornhack-2016_camp_detail.html @@ -11,7 +11,7 @@
- Bornhack 2016 was the first BornHack. It took place from August 27 to September 3rd 2016 on the Danish island of Bornholm. The tagline of this event was Initial Commit. + BornHack 2016 was the first BornHack. It took place from August 27 to September 3rd 2016 on the Danish island of Bornholm. The tagline of this event was Initial Commit.
diff --git a/src/camps/templates/bornhack-2017_camp_detail.html b/src/camps/templates/bornhack-2017_camp_detail.html index a34bf3f4..330728bd 100644 --- a/src/camps/templates/bornhack-2017_camp_detail.html +++ b/src/camps/templates/bornhack-2017_camp_detail.html @@ -27,7 +27,7 @@
- Bornhack 2017 was the second BornHack. It will take place from August 22nd to August 29th 2017 on the Danish island of Bornholm. + BornHack 2017 was the second BornHack. It will take place from August 22nd to August 29th 2017 on the Danish island of Bornholm.
diff --git a/src/camps/templates/bornhack-2018_camp_detail.html b/src/camps/templates/bornhack-2018_camp_detail.html index ed354816..c2126b1c 100644 --- a/src/camps/templates/bornhack-2018_camp_detail.html +++ b/src/camps/templates/bornhack-2018_camp_detail.html @@ -27,7 +27,7 @@
- Bornhack 2018 was the third BornHack. It will take place from August 16th to August 23rd 2018 on the Danish island of Bornholm. + BornHack 2018 was the third BornHack. It will take place from August 16th to August 23rd 2018 on the Danish island of Bornholm.
diff --git a/src/camps/templates/bornhack-2019_camp_detail.html b/src/camps/templates/bornhack-2019_camp_detail.html index 3285bf89..c16ee3c7 100644 --- a/src/camps/templates/bornhack-2019_camp_detail.html +++ b/src/camps/templates/bornhack-2019_camp_detail.html @@ -35,7 +35,7 @@
- Bornhack 2019 will be the fourth BornHack. It will take place from Thursday the 8th of August to Thursday the 15th of August 2019 at a our new venue on the Danish island of Funen. + BornHack 2019 will be the fourth BornHack. It will take place from Thursday the 8th of August to Thursday the 15th of August 2019 at a our new venue on the Danish island of Funen.
diff --git a/src/camps/templates/bornhack-2020_camp_detail.html b/src/camps/templates/bornhack-2020_camp_detail.html index fc990cbd..9e35cf66 100644 --- a/src/camps/templates/bornhack-2020_camp_detail.html +++ b/src/camps/templates/bornhack-2020_camp_detail.html @@ -28,7 +28,7 @@
- Bornhack 2019 will be the fourth BornHack. It will take place from Thursday the 8th of August to Thursday the 15th of August 2019 at a our new venue on the Danish island of Funen. + BornHack 2019 will be the fourth BornHack. It will take place from Thursday the 8th of August to Thursday the 15th of August 2019 at a our new venue on the Danish island of Funen.
diff --git a/src/camps/templates/bornhack-2021_camp_detail.html b/src/camps/templates/bornhack-2021_camp_detail.html index fc990cbd..9e35cf66 100644 --- a/src/camps/templates/bornhack-2021_camp_detail.html +++ b/src/camps/templates/bornhack-2021_camp_detail.html @@ -28,7 +28,7 @@
- Bornhack 2019 will be the fourth BornHack. It will take place from Thursday the 8th of August to Thursday the 15th of August 2019 at a our new venue on the Danish island of Funen. + BornHack 2019 will be the fourth BornHack. It will take place from Thursday the 8th of August to Thursday the 15th of August 2019 at a our new venue on the Danish island of Funen.
diff --git a/src/program/templates/emails/update_eventproposal.html b/src/program/templates/emails/update_eventproposal.html index d3855fc6..dad21861 100644 --- a/src/program/templates/emails/update_eventproposal.html +++ b/src/program/templates/emails/update_eventproposal.html @@ -1,6 +1,6 @@ Hello!

-Event "{{ proposal.name }}" for {{ proposal.camp }} was just updated! +Event "{{ proposal.title }}" for {{ proposal.camp }} was just updated!

More info here. diff --git a/src/program/templates/emails/update_eventproposal.txt b/src/program/templates/emails/update_eventproposal.txt index f29ba96a..8c3d6351 100644 --- a/src/program/templates/emails/update_eventproposal.txt +++ b/src/program/templates/emails/update_eventproposal.txt @@ -1,6 +1,6 @@ Hello! -Event "{{ proposal.name }}" for {{ proposal.camp }} was just updated! +Event "{{ proposal.title }}" for {{ proposal.camp }} was just updated! More info: https://bornhack.dk/admin/program/eventproposal/{{ proposal.uuid }}/change/ diff --git a/src/requirements/production.txt b/src/requirements/production.txt index 971a1f69..e28049df 100644 --- a/src/requirements/production.txt +++ b/src/requirements/production.txt @@ -3,7 +3,7 @@ channels==2.2.0 channels-redis==2.3.2 commonmark==0.9.0 -Pillow==6.0.0 +Pillow==6.1.0 PyPDF2==1.26.0 Unidecode==1.1.1 asyncio==3.4.3 @@ -13,7 +13,7 @@ django-allauth==0.39.1 django-allauth-2fa==0.6 django-bleach==0.5.3 django-bootstrap3==11.1.0 -django-extensions==2.1.9 +django-extensions==2.2.1 django-wkhtmltopdf==3.2.0 django-reversion==3.0.4 django-betterforms==1.2 diff --git a/src/static_src/img/sponsors/CSIS_PRI_LOGO_TURQUOISE_RGB_2x.jpg b/src/static_src/img/sponsors/CSIS_PRI_LOGO_TURQUOISE_RGB_2x.jpg new file mode 100644 index 00000000..fb7a15c2 Binary files /dev/null and b/src/static_src/img/sponsors/CSIS_PRI_LOGO_TURQUOISE_RGB_2x.jpg differ diff --git a/src/static_src/img/sponsors/DKUUGlogo_2x.jpeg b/src/static_src/img/sponsors/DKUUGlogo_2x.jpeg new file mode 100644 index 00000000..429e9a59 Binary files /dev/null and b/src/static_src/img/sponsors/DKUUGlogo_2x.jpeg differ diff --git a/src/static_src/img/sponsors/DM_Logo_RGB_2x.png b/src/static_src/img/sponsors/DM_Logo_RGB_2x.png new file mode 100644 index 00000000..69b81498 Binary files /dev/null and b/src/static_src/img/sponsors/DM_Logo_RGB_2x.png differ diff --git a/src/static_src/img/sponsors/danskit_2x.png b/src/static_src/img/sponsors/danskit_2x.png new file mode 100644 index 00000000..86eff363 Binary files /dev/null and b/src/static_src/img/sponsors/danskit_2x.png differ diff --git a/src/static_src/img/sponsors/djangodanmark-logo_2x.png b/src/static_src/img/sponsors/djangodanmark-logo_2x.png new file mode 100644 index 00000000..45d1c0c9 Binary files /dev/null and b/src/static_src/img/sponsors/djangodanmark-logo_2x.png differ diff --git a/src/static_src/img/sponsors/epson_2x.png b/src/static_src/img/sponsors/epson_2x.png new file mode 100755 index 00000000..d8fd37dc Binary files /dev/null and b/src/static_src/img/sponsors/epson_2x.png differ diff --git a/src/static_src/img/sponsors/letsgo_2x.png b/src/static_src/img/sponsors/letsgo_2x.png new file mode 100644 index 00000000..b62b700d Binary files /dev/null and b/src/static_src/img/sponsors/letsgo_2x.png differ diff --git a/src/static_src/img/sponsors/prosa_2x.png b/src/static_src/img/sponsors/prosa_2x.png new file mode 100644 index 00000000..2e2a76dc Binary files /dev/null and b/src/static_src/img/sponsors/prosa_2x.png differ diff --git a/src/static_src/img/sponsors/prosa_ung_2x.png b/src/static_src/img/sponsors/prosa_ung_2x.png new file mode 100644 index 00000000..68b1c09d Binary files /dev/null and b/src/static_src/img/sponsors/prosa_ung_2x.png differ diff --git a/src/static_src/img/sponsors/siteimprove_2x.png b/src/static_src/img/sponsors/siteimprove_2x.png new file mode 100644 index 00000000..8037e796 Binary files /dev/null and b/src/static_src/img/sponsors/siteimprove_2x.png differ diff --git a/src/static_src/img/sponsors/spiir_2x.png b/src/static_src/img/sponsors/spiir_2x.png new file mode 100644 index 00000000..657cb1ff Binary files /dev/null and b/src/static_src/img/sponsors/spiir_2x.png differ