From 12ce76026f35bc77c40c51b88972cf31e67e9cbf Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Feb 2021 00:09:28 -0700 Subject: [PATCH 1/5] Update ComposeModal, show filter warning for unsupported browsers --- resources/assets/js/components/ComposeModal.vue | 2 +- storage/app/.gitignore | 1 + storage/app/backups/.gitignore | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 storage/app/backups/.gitignore diff --git a/resources/assets/js/components/ComposeModal.vue b/resources/assets/js/components/ComposeModal.vue index 606427265..729cc03aa 100644 --- a/resources/assets/js/components/ComposeModal.vue +++ b/resources/assets/js/components/ComposeModal.vue @@ -1131,7 +1131,7 @@ export default { // this is where the magic happens var ua = navigator.userAgent.toLowerCase(); if(ua.indexOf('firefox') == -1 && ua.indexOf('chrome') == -1) { - // swal('Oops!', 'Your browser does not support the filter feature. Please use Chrome or Firefox if you want to apply a filter.', 'error'); + swal('Oops!', 'Your browser does not support the filter feature.', 'error'); return; } diff --git a/storage/app/.gitignore b/storage/app/.gitignore index 5e39b5eed..693e05ed8 100755 --- a/storage/app/.gitignore +++ b/storage/app/.gitignore @@ -1,4 +1,5 @@ * +!backups/ !public/ !remcache/ !cities.json diff --git a/storage/app/backups/.gitignore b/storage/app/backups/.gitignore new file mode 100644 index 000000000..d6b7ef32c --- /dev/null +++ b/storage/app/backups/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore From 551365183eba6f83ba2f1a8f210c1a0b88e22bd7 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Feb 2021 00:12:19 -0700 Subject: [PATCH 2/5] Update Hashtag component, fix null infinite loading bug. Fixes #2637 --- resources/assets/js/components/Hashtag.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/components/Hashtag.vue b/resources/assets/js/components/Hashtag.vue index 47ff9f36d..0a792998f 100644 --- a/resources/assets/js/components/Hashtag.vue +++ b/resources/assets/js/components/Hashtag.vue @@ -168,7 +168,7 @@ }).then(res => { let data = res.data; let tags = data.tags.filter(n => { - if(!n || n.length == 0) { + if(!n || n.length == 0 || n.status == null) { return false; } return true; @@ -195,7 +195,7 @@ let data = res.data; if(data.tags.length) { let tags = data.tags.filter(n => { - if(!n || n.length == 0) { + if(!n || n.length == 0 || n.status == null) { return false; } return true; From ae90eef965966f340690ba654d3d597aab0559a0 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Feb 2021 00:14:52 -0700 Subject: [PATCH 3/5] Update filesystems config, add backup driver to store backups on other filesystems --- config/filesystems.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/config/filesystems.php b/config/filesystems.php index e48490f09..0df7cf308 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -81,6 +81,19 @@ return [ 'url' => str_replace(env('DO_SPACES_REGION'),env('DO_SPACES_BUCKET').'.'.env('DO_SPACES_REGION'),str_replace("digitaloceanspaces","cdn.digitaloceanspaces",env('DO_SPACES_ENDPOINT'))), ], + 'backup' => [ + 'driver' => env('PF_BACKUP_DRIVER', 'local'), + 'visibility' => 'private', + 'root' => env('PF_BACKUP_DRIVER', 'local') == 'local' ? + storage_path('app/backups/') : + env('PF_BACKUP_ROOT','/'), + 'key' => env('PF_BACKUP_KEY'), + 'secret' => env('PF_BACKUP_SECRET'), + 'endpoint' => env('PF_BACKUP_ENDPOINT'), + 'region' => env('PF_BACKUP_REGION'), + 'bucket' => env('PF_BACKUP_BUCKET'), + ], + ], ]; From 2962c389ada4af3e0ac2123c32dcf5e260bae709 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Feb 2021 00:18:20 -0700 Subject: [PATCH 4/5] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e30e98935..e8413d3ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,9 @@ - Updated DiscoverComponent, allow unathenicated if enabled. ([a1059a6e](https://github.com/pixelfed/pixelfed/commit/a1059a6e)) - Updated components, improve content warnings. ([a9e98965](https://github.com/pixelfed/pixelfed/commit/a9e98965)) - Updated ComposeModal, prevent tagging empty users. Fixes #2633. ([ceae664c](https://github.com/pixelfed/pixelfed/commit/ceae664c)) +- Updated ComposeModal, show filter warning for unsupported browsers. ([12ce7602](https://github.com/pixelfed/pixelfed/commit/12ce7602)) +- Updated Hashtag component, fix null infinite loading bug. Fixes #2637. ([55136518](https://github.com/pixelfed/pixelfed/commit/55136518)) +- Updated filesystems config, add backup driver to store backups on other filesystems. ([ae90eef9](https://github.com/pixelfed/pixelfed/commit/ae90eef9)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.10.10 (2021-01-28)](https://github.com/pixelfed/pixelfed/compare/v0.10.9...v0.10.10) From d31a1dbcdf8f5e1d3859de35f76c699c45bebac0 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 7 Feb 2021 00:20:26 -0700 Subject: [PATCH 5/5] Update compiled assets --- public/js/compose.js | Bin 109789 -> 109864 bytes public/js/hashtag.js | Bin 14910 -> 14942 bytes public/mix-manifest.json | Bin 2139 -> 2139 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/compose.js b/public/js/compose.js index 5a41d47bbbe4591e6fe909b1c874160e21b84cfc..6da03b4a7b71e7892be1487f018edf8e75f50a4d 100644 GIT binary patch delta 363 zcmcb6lWoN*}KScu@g zXJjlx@N$_LYZ1IpOpKlgo-;FJ5`wpunbDRXW<#u1Mt)gp(e!o9j0)2wSr}ar>e5&k z!&xE&)50eow36EFqFE`(l5Xm60OEmNI{Cg;=j6Rst66gVjr^w{WMPz>7|SURQlg}3 zovD|nk*KMcSgWIylcZmw1eV|2W36{|`#u)NKovjh)STi}h2rwW91SJ^{DNXdB^{;6 z{L&(Yq@w)t;?yFAl>F3Ug}nR{h2qkJg8ZTqg_4X^g|y6^5};gKYGO%gQK}wLPij$7 cev#64K264ECa_DkPt|6WXhe8p>l#K40FfDP`v3p{ delta 283 zcmZ2+i|y`Bwh30O+NDL_N|O!j)dh{RoQjk*tuyuVG!ixS5^HrfS~_sEfJ7(1*Abum z!Ip)k$}!n+a-vQbt8rMqyV7KP4YSQ#xZ7nm+v`jhoZM))noTJuNxuYSoZRLfd%dH~ zAocbdp&Y4(h6YKNDMpj$XoMg*KQsyvoI=eq1n0eGErL^`<%!@N)k;Ee^tEmIVMfPV zW#pHo7ELzLR+v0n+ZCbcg?2bgRgRMh$W_~KvoIQ{Y>(1pY+_;od42l>ZAOVkxZ-JR G88rZXxmiL0 diff --git a/public/js/hashtag.js b/public/js/hashtag.js index 686a783b82e9fe684c9a753538b5fca1a1b6778c..374b06b425a839cfecb4046413f9cc415134a46a 100644 GIT binary patch delta 181 zcmdm2a<629)x_tTtVU@?5lWMdHN4p^Q%p=PQ%onfYFKX;VBEmL;$!F-Jo%TUI)8;% zd61H(b+KNaMxv%(;^uvv;w%C+HF>2uIkvVXdc`G)C8foiukr>mVv4Hq&tL?bwE2*L zhdA64K@GXh`!#a87=t$J8f&ovsR)aCj4U9VCOSy5fLt{(u7kH$Cpy~DOvfNLHdfOb E0HRttn*aa+ delta 174 zcmcatvae)<6`PWFT9T>Ke)6HvH)-eMB6;2UQ delta 59 zcmcaDa9d!5GqXsNg{4_ys(DJ9v8k!0rAdlmnu)>YaAqe)ku)PCpn##FnT4TgnxT23 NNn(n@=Cv&Am;nRT5Xt}m