Merge pull request #3310 from pixelfed/staging

Staging

CHANGELOG.md

@@ -27,6 +27,7 @@
 - Fix private profile feed not loading for owner ([e950b3b2](https://github.com/pixelfed/pixelfed/commit/e950b3b2))
 - Add "Shared by" link to posts that opens a list of accounts that reblogged the post ([e4b4bfc1](https://github.com/pixelfed/pixelfed/commit/e4b4bfc1))
 - Notification filters ([537af6df](https://github.com/pixelfed/pixelfed/commit/537af6df))
+- Full screen preview on photo albums ([ac40fde1](https://github.com/pixelfed/pixelfed/commit/ac40fde1))
 
 ### Updated
 - Updated MediaStorageService, fix remote avatar bug. ([1c20d696](https://github.com/pixelfed/pixelfed/commit/1c20d696))

public/js/manifest.js

@@ -1 +1 @@
-(()=>{"use strict";var e,r,t,o={},s={};function n(e){var r=s[e];if(void 0!==r)return r.exports;var t=s[e]={id:e,loaded:!1,exports:{}};return o[e].call(t.exports,t,t.exports,n),t.loaded=!0,t.exports}n.m=o,e=[],n.O=(r,t,o,s)=>{if(!t){var a=1/0;for(c=0;c<e.length;c++){for(var[t,o,s]=e[c],i=!0,d=0;d<t.length;d++)(!1&s||a>=s)&&Object.keys(n.O).every((e=>n.O[e](t[d])))?t.splice(d--,1):(i=!1,s<a&&(a=s));if(i){e.splice(c--,1);var l=o();void 0!==l&&(r=l)}}return r}s=s||0;for(var c=e.length;c>0&&e[c-1][2]>s;c--)e[c]=e[c-1];e[c]=[t,o,s]},n.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return n.d(r,{a:r}),r},n.d=(e,r)=>{for(var t in r)n.o(r,t)&&!n.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},n.f={},n.e=e=>Promise.all(Object.keys(n.f).reduce(((r,t)=>(n.f[t](e,r),r)),[])),n.u=e=>706===e?"js/home-lzwv62dc.js":483===e?"js/compose-lzwv62dc.js":407===e?"js/post-lzwv62dc.js":332===e?"js/profile-lzwv62dc.js":985===e?"js/dmym-lzwv62dc.js":603===e?"js/dmyh-lzwv62dc.js":38===e?"js/daci-lzwv62dc.js":200===e?"js/dffc-lzwv62dc.js":57===e?"js/dsfc-lzwv62dc.js":855===e?"js/dssc-lzwv62dc.js":void 0,n.miniCssF=e=>({138:"css/spa",170:"css/app",242:"css/appdark",703:"css/admin",994:"css/landing"}[e]+".css"),n.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),n.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},t="pixelfed:",n.l=(e,o,s,a)=>{if(r[e])r[e].push(o);else{var i,d;if(void 0!==s)for(var l=document.getElementsByTagName("script"),c=0;c<l.length;c++){var u=l[c];if(u.getAttribute("src")==e||u.getAttribute("data-webpack")==t+s){i=u;break}}i||(d=!0,(i=document.createElement("script")).charset="utf-8",i.timeout=120,n.nc&&i.setAttribute("nonce",n.nc),i.setAttribute("data-webpack",t+s),i.src=e),r[e]=[o];var f=(t,o)=>{i.onerror=i.onload=null,clearTimeout(p);var s=r[e];if(delete r[e],i.parentNode&&i.parentNode.removeChild(i),s&&s.forEach((e=>e(o))),t)return t(o)},p=setTimeout(f.bind(null,void 0,{type:"timeout",target:i}),12e4);i.onerror=f.bind(null,i.onerror),i.onload=f.bind(null,i.onload),d&&document.head.appendChild(i)}},n.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),n.p="/",(()=>{var e={929:0,242:0,170:0,138:0,703:0,994:0};n.f.j=(r,t)=>{var o=n.o(e,r)?e[r]:void 0;if(0!==o)if(o)t.push(o[2]);else if(/^(138|170|242|703|929|994)$/.test(r))e[r]=0;else{var s=new Promise(((t,s)=>o=e[r]=[t,s]));t.push(o[2]=s);var a=n.p+n.u(r),i=new Error;n.l(a,(t=>{if(n.o(e,r)&&(0!==(o=e[r])&&(e[r]=void 0),o)){var s=t&&("load"===t.type?"missing":t.type),a=t&&t.target&&t.target.src;i.message="Loading chunk "+r+" failed.\n("+s+": "+a+")",i.name="ChunkLoadError",i.type=s,i.request=a,o[1](i)}}),"chunk-"+r,r)}},n.O.j=r=>0===e[r];var r=(r,t)=>{var o,s,[a,i,d]=t,l=0;if(a.some((r=>0!==e[r]))){for(o in i)n.o(i,o)&&(n.m[o]=i[o]);if(d)var c=d(n)}for(r&&r(t);l<a.length;l++)s=a[l],n.o(e,s)&&e[s]&&e[s][0](),e[s]=0;return n.O(c)},t=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})()})();
+(()=>{"use strict";var e,r,t,o={},s={};function n(e){var r=s[e];if(void 0!==r)return r.exports;var t=s[e]={id:e,loaded:!1,exports:{}};return o[e].call(t.exports,t,t.exports,n),t.loaded=!0,t.exports}n.m=o,e=[],n.O=(r,t,o,s)=>{if(!t){var a=1/0;for(c=0;c<e.length;c++){for(var[t,o,s]=e[c],i=!0,d=0;d<t.length;d++)(!1&s||a>=s)&&Object.keys(n.O).every((e=>n.O[e](t[d])))?t.splice(d--,1):(i=!1,s<a&&(a=s));if(i){e.splice(c--,1);var l=o();void 0!==l&&(r=l)}}return r}s=s||0;for(var c=e.length;c>0&&e[c-1][2]>s;c--)e[c]=e[c-1];e[c]=[t,o,s]},n.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return n.d(r,{a:r}),r},n.d=(e,r)=>{for(var t in r)n.o(r,t)&&!n.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},n.f={},n.e=e=>Promise.all(Object.keys(n.f).reduce(((r,t)=>(n.f[t](e,r),r)),[])),n.u=e=>839===e?"js/home-bhtmr32w.js":698===e?"js/compose-bhtmr32w.js":315===e?"js/post-bhtmr32w.js":938===e?"js/profile-bhtmr32w.js":565===e?"js/dmym-bhtmr32w.js":969===e?"js/dmyh-bhtmr32w.js":832===e?"js/daci-bhtmr32w.js":605===e?"js/dffc-bhtmr32w.js":111===e?"js/dsfc-bhtmr32w.js":566===e?"js/dssc-bhtmr32w.js":void 0,n.miniCssF=e=>({138:"css/spa",170:"css/app",242:"css/appdark",703:"css/admin",994:"css/landing"}[e]+".css"),n.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),n.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},t="pixelfed:",n.l=(e,o,s,a)=>{if(r[e])r[e].push(o);else{var i,d;if(void 0!==s)for(var l=document.getElementsByTagName("script"),c=0;c<l.length;c++){var u=l[c];if(u.getAttribute("src")==e||u.getAttribute("data-webpack")==t+s){i=u;break}}i||(d=!0,(i=document.createElement("script")).charset="utf-8",i.timeout=120,n.nc&&i.setAttribute("nonce",n.nc),i.setAttribute("data-webpack",t+s),i.src=e),r[e]=[o];var f=(t,o)=>{i.onerror=i.onload=null,clearTimeout(p);var s=r[e];if(delete r[e],i.parentNode&&i.parentNode.removeChild(i),s&&s.forEach((e=>e(o))),t)return t(o)},p=setTimeout(f.bind(null,void 0,{type:"timeout",target:i}),12e4);i.onerror=f.bind(null,i.onerror),i.onload=f.bind(null,i.onload),d&&document.head.appendChild(i)}},n.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),n.p="/",(()=>{var e={929:0,242:0,170:0,138:0,703:0,994:0};n.f.j=(r,t)=>{var o=n.o(e,r)?e[r]:void 0;if(0!==o)if(o)t.push(o[2]);else if(/^(138|170|242|703|929|994)$/.test(r))e[r]=0;else{var s=new Promise(((t,s)=>o=e[r]=[t,s]));t.push(o[2]=s);var a=n.p+n.u(r),i=new Error;n.l(a,(t=>{if(n.o(e,r)&&(0!==(o=e[r])&&(e[r]=void 0),o)){var s=t&&("load"===t.type?"missing":t.type),a=t&&t.target&&t.target.src;i.message="Loading chunk "+r+" failed.\n("+s+": "+a+")",i.name="ChunkLoadError",i.type=s,i.request=a,o[1](i)}}),"chunk-"+r,r)}},n.O.j=r=>0===e[r];var r=(r,t)=>{var o,s,[a,i,d]=t,l=0;if(a.some((r=>0!==e[r]))){for(o in i)n.o(i,o)&&(n.m[o]=i[o]);if(d)var c=d(n)}for(r&&r(t);l<a.length;l++)s=a[l],n.o(e,s)&&e[s]&&e[s][0](),e[s]=0;return n.O(c)},t=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})()})();

public/mix-manifest.json

@@ -3,9 +3,9 @@
     "/js/activity.js": "/js/activity.js?id=d14e608dd1ecac4d900cd639f2199b62",
     "/js/components.js": "/js/components.js?id=8bbdcdcd1c285672e99003f724284cd8",
     "/js/discover.js": "/js/discover.js?id=0c98508635d6adae9bf8f76c9f5c918c",
-    "/js/profile.js": "/js/profile.js?id=330d89a7f95673572dba3ebd9af31f61",
-    "/js/status.js": "/js/status.js?id=983223808e50b639dcf545b68bcb1bca",
-    "/js/timeline.js": "/js/timeline.js?id=654c74552cc7456a936967374afe697f",
+    "/js/profile.js": "/js/profile.js?id=3b672049c1438f01c7179b780f872bf5",
+    "/js/status.js": "/js/status.js?id=1aaaa72afd6534fbd85014f753aae8ea",
+    "/js/timeline.js": "/js/timeline.js?id=e0474aad713f572f186874ba1826dea8",
     "/js/compose.js": "/js/compose.js?id=f408112a208d3a550f9ca578c228d78a",
     "/js/compose-classic.js": "/js/compose-classic.js?id=3a53d79b046932f24a1d89592c81a4b0",
     "/js/search.js": "/js/search.js?id=1ad4af345d2c8a14541a03937ea4904b",
@@ -18,21 +18,21 @@
     "/js/story-compose.js": "/js/story-compose.js?id=b9757f1d5a146f0d5c06c62b83c983fb",
     "/js/direct.js": "/js/direct.js?id=9366e39e3bab1f1139eac9bad1037c42",
     "/js/admin.js": "/js/admin.js?id=84492883e1542f8438b48dcf187fc07b",
-    "/js/rempro.js": "/js/rempro.js?id=0a75c79a29b63d19b0991d99b9772990",
-    "/js/rempos.js": "/js/rempos.js?id=e3382c2586efc9a83e5f7af48713c573",
-    "/js/spa.js": "/js/spa.js?id=9dac6b2b30053d6ba0f4a16bb5b92b22",
+    "/js/rempro.js": "/js/rempro.js?id=224a6fb21fdb2ce819adeac7e320cb1f",
+    "/js/rempos.js": "/js/rempos.js?id=805c31ce21e2732a3d4494404f5afb9a",
+    "/js/spa.js": "/js/spa.js?id=63ddeacea5a3328fdc011bd2357010cc",
     "/js/stories.js": "/js/stories.js?id=048de600ee6dfccaeaf06070999cb892",
-    "/js/manifest.js": "/js/manifest.js?id=1d1ec0ed78e561aa7d14119b7500c6fa",
-    "/js/home-lzwv62dc.js": "/js/home-lzwv62dc.js?id=6ff10e4d3dce0fd1e685123f6ee45a4a",
-    "/js/compose-lzwv62dc.js": "/js/compose-lzwv62dc.js?id=6007ba8dc5bda32cef6d6b098bfbabd7",
-    "/js/post-lzwv62dc.js": "/js/post-lzwv62dc.js?id=4375d1611c48d7e19c3cb87139a60737",
-    "/js/profile-lzwv62dc.js": "/js/profile-lzwv62dc.js?id=befbd9ed36f18ddc93d52d72db1a11be",
-    "/js/dmym-lzwv62dc.js": "/js/dmym-lzwv62dc.js?id=f56eeaec7e9710f1f10358859c48e044",
-    "/js/dmyh-lzwv62dc.js": "/js/dmyh-lzwv62dc.js?id=3e86a593ff3805bc7d54b88416288b7b",
-    "/js/daci-lzwv62dc.js": "/js/daci-lzwv62dc.js?id=b24ba069e0a79a7a5cc0e642c35f9884",
-    "/js/dffc-lzwv62dc.js": "/js/dffc-lzwv62dc.js?id=f3066f8a7aabbac86ca9c8bdd7c3ee6a",
-    "/js/dsfc-lzwv62dc.js": "/js/dsfc-lzwv62dc.js?id=10deb85f746c5df9b019bc84e77bb17d",
-    "/js/dssc-lzwv62dc.js": "/js/dssc-lzwv62dc.js?id=706aa1e67a7d9a17151ea23065323c02",
+    "/js/manifest.js": "/js/manifest.js?id=1e361cade83567cb9343171b471906e1",
+    "/js/home-bhtmr32w.js": "/js/home-bhtmr32w.js?id=df85d06916c655267058d63a039d88ca",
+    "/js/compose-bhtmr32w.js": "/js/compose-bhtmr32w.js?id=ee1c333c9d80f93e22aa9efd6d87a3e7",
+    "/js/post-bhtmr32w.js": "/js/post-bhtmr32w.js?id=bcd17840bf63eaf93810cb98bf2aeb6e",
+    "/js/profile-bhtmr32w.js": "/js/profile-bhtmr32w.js?id=9de8db71d2878bac717604c016711142",
+    "/js/dmym-bhtmr32w.js": "/js/dmym-bhtmr32w.js?id=5ffe594cf67e078fa3000ddcc47a8d8f",
+    "/js/dmyh-bhtmr32w.js": "/js/dmyh-bhtmr32w.js?id=61cee0ba8a997f40f0198ce03bb56f1f",
+    "/js/daci-bhtmr32w.js": "/js/daci-bhtmr32w.js?id=650f75bf29b82cd29e7ab0a8d1144eae",
+    "/js/dffc-bhtmr32w.js": "/js/dffc-bhtmr32w.js?id=c4391d20f12438565d16e05756471e30",
+    "/js/dsfc-bhtmr32w.js": "/js/dsfc-bhtmr32w.js?id=be0de09ae9209be6dbfdb595e2b118f4",
+    "/js/dssc-bhtmr32w.js": "/js/dssc-bhtmr32w.js?id=0d36cd5f5616ae2638b901d7dfbe0abd",
     "/css/appdark.css": "/css/appdark.css?id=a661085d048e4e6b953ba58086d34007",
     "/css/app.css": "/css/app.css?id=ef378884d2b1cf81e12851d2aab5089a",
     "/css/spa.css": "/css/spa.css?id=c1320213cd53b5dbb38057e8054bb0db",

resources/lang/ru/helpcenter.php

@@ -21,8 +21,8 @@ return [
 	'blockingAccounts' => 'Блокировка аккаунтов',
 	'safetyTips' => 'Советы по безопасности',
 	'reportSomething' => 'Жалобы',
-	'dataPolicy' => 'Конфиденциальность'
+	'dataPolicy' => 'Конфиденциальность',
     
-    'taggingPeople' => 'Отметки людей'
+    'taggingPeople' => 'Отметки людей',
 
 ];