From 00d820cbedb02b2b3aeea5430a13b0e8d17174de Mon Sep 17 00:00:00 2001 From: Andrea Vos Date: Sun, 4 Jun 2023 19:25:38 +0200 Subject: [PATCH 1/7] [team] fix kevinn appearing twice on the team page --- server/routes/admin.js | 1 + 1 file changed, 1 insertion(+) diff --git a/server/routes/admin.js b/server/routes/admin.js index b3d23f9c4..0abb99ef1 100644 --- a/server/routes/admin.js +++ b/server/routes/admin.js @@ -26,6 +26,7 @@ router.get('/admin/list', handleErrorAsync(async (req, res) => { WHERE p.teamName IS NOT NULL AND p.teamName != '' AND (a.validUntil IS NULL OR a.validUntil > ${now()}) + GROUP BY u.username, p.locale ORDER BY RANDOM() `); From e4832e3a973f3c016b0703d0c79c0804dc7d8622 Mon Sep 17 00:00:00 2001 From: Andrea Vos Date: Wed, 7 Jun 2023 17:59:21 +0200 Subject: [PATCH 2/7] [ads] reduce number of ads, add support for direct banners --- components/AdPlaceholder.vue | 25 ++++++++++++++--- .../en/blog/creating-new-language-version.md | 2 ++ locale/en/config.suml | 1 - locale/en/img/blog/new-version.png | Bin 0 -> 159715 bytes src/adPlaceholders.js | 14 +++++----- src/adsInternal.js | 26 ++++++++++++++++++ src/helpers.js | 2 ++ static/banners/shop-hz.png | Bin 0 -> 64643 bytes static/banners/shop-vt.png | Bin 0 -> 108728 bytes 9 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 locale/en/img/blog/new-version.png create mode 100644 src/adsInternal.js create mode 100644 static/banners/shop-hz.png create mode 100644 static/banners/shop-vt.png diff --git a/components/AdPlaceholder.vue b/components/AdPlaceholder.vue index f061c2aa9..9ad16db6c 100644 --- a/components/AdPlaceholder.vue +++ b/components/AdPlaceholder.vue @@ -1,11 +1,11 @@ -\