Merge remote-tracking branch 'upstream/prep-release-3.3.0'HEAD master

author: Maat <maat-pub@mageia.biz> 2020-05-09 01:15:08 +0200
committer: Maat <maat-pub@mageia.biz> 2020-05-09 01:15:08 +0200
commit: 6985226b17e8a0ef0a720bf1d12fe0c216e13dab (patch)
tree: 116d2565ac02c40abe0548863c6badf8ec3e1d1e /phpBB/adm
parent: 8ea437e30605e0f66b5220bf904a61d7c1d11ddd (diff)
parent: 8d00784dfe2c8bcb10843ff70b4cfa998d703285 (diff)
download: forums-master.tar
forums-master.tar.gz
forums-master.tar.bz2
forums-master.tar.xz
forums-master.zip
24 files changed, 263 insertions, 233 deletions
diff --git a/phpBB/adm/images/phpbb_logo.svg b/phpBB/adm/images/phpbb_logo.svg
new file mode 100644
index 0000000000..2a241067f9
--- /dev/null
+++ b/phpBB/adm/images/phpbb_logo.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 291 96">
+    <g fill="#505F79" fill-rule="evenodd">
+        <path d="M52.1534631,83.344332 L54.0834216,83.344332 L54.0834216,82.368 C54.0834216,81.6262867 54.1742423,81.0245998 54.3558864,80.5629212 C54.5375304,80.1012425 54.7797189,79.7455282 55.082459,79.4957676 C55.3851991,79.246007 55.7295608,79.0795025 56.1155544,78.996249 C56.5015481,78.9129954 56.9064569,78.8713693 57.330293,78.8713693 C58.1628283,78.8713693 58.7682994,78.924348 59.1467245,79.0303071 L59.1467245,81.0510871 C58.9802175,81.0056761 58.8023603,80.9716184 58.6131478,80.9489129 C58.4239352,80.9262074 58.2006677,80.9148548 57.9433387,80.9148548 C57.5951875,80.9148548 57.2962362,80.9981071 57.0464756,81.1646141 C56.796715,81.3311212 56.6718366,81.6565619 56.6718366,82.1409461 L56.6718366,83.344332 L58.8742598,83.344332 L58.8742598,85.2742905 L56.6718366,85.2742905 L56.6718366,95.0830207 L54.0834216,95.0830207 L54.0834216,85.2742905 L52.1534631,85.2742905 L52.1534631,83.344332 Z M65.4440855,93.3574108 C66.0192917,93.3574108 66.5188054,93.2363166 66.9426416,92.9941245 C67.3664777,92.7519324 67.7146236,92.4340601 67.9870897,92.0404979 C68.2595558,91.6469358 68.4601181,91.204185 68.5887826,90.7122324 C68.7174472,90.2202797 68.7817785,89.7169818 68.7817785,89.2023237 C68.7817785,88.7028025 68.7174472,88.2032888 68.5887826,87.7037676 C68.4601181,87.2042465 68.2595558,86.7614957 67.9870897,86.3755021 C67.7146236,85.9895084 67.3664777,85.6754203 66.9426416,85.4332282 C66.5188054,85.1910361 66.0192917,85.0699419 65.4440855,85.0699419 C64.8688793,85.0699419 64.3693657,85.1910361 63.9455295,85.4332282 C63.5216934,85.6754203 63.1735475,85.9895084 62.9010814,86.3755021 C62.6286153,86.7614957 62.428053,87.2042465 62.2993884,87.7037676 C62.1707239,88.2032888 62.1063926,88.7028025 62.1063926,89.2023237 C62.1063926,89.7169818 62.1707239,90.2202797 62.2993884,90.7122324 C62.428053,91.204185 62.6286153,91.6469358 62.9010814,92.0404979 C63.1735475,92.4340601 63.5216934,92.7519324 63.9455295,92.9941245 C64.3693657,93.2363166 64.8688793,93.3574108 65.4440855,93.3574108 Z M65.4440855,95.4008963 C64.5055912,95.4008963 63.6692842,95.2457443 62.9351395,94.9354357 C62.2009947,94.6251271 61.5803868,94.1975131 61.0732972,93.6525809 C60.5662075,93.1076487 60.1802196,92.4567673 59.9153221,91.699917 C59.6504245,90.9430668 59.5179777,90.110544 59.5179777,89.2023237 C59.5179777,88.3092403 59.6504245,87.4842859 59.9153221,86.7274357 C60.1802196,85.9705854 60.5662075,85.319704 61.0732972,84.7747718 C61.5803868,84.2298396 62.2009947,83.8022256 62.9351395,83.491917 C63.6692842,83.1816084 64.5055912,83.0264564 65.4440855,83.0264564 C66.3825799,83.0264564 67.2188868,83.1816084 67.9530316,83.491917 C68.6871763,83.8022256 69.3077843,84.2298396 69.8148739,84.7747718 C70.3219636,85.319704 70.7079514,85.9705854 70.972849,86.7274357 C71.2377466,87.4842859 71.3701934,88.3092403 71.3701934,89.2023237 C71.3701934,90.110544 71.2377466,90.9430668 70.972849,91.699917 C70.7079514,92.4567673 70.3219636,93.1076487 69.8148739,93.6525809 C69.3077843,94.1975131 68.6871763,94.6251271 67.9530316,94.9354357 C67.2188868,95.2457443 66.3825799,95.4008963 65.4440855,95.4008963 Z M73.1264756,83.344332 L75.5559528,83.344332 L75.5559528,85.6148714 L75.6013635,85.6148714 C75.6770486,85.2969943 75.8246322,84.9866903 76.0441187,84.6839502 C76.2636053,84.3812101 76.5284989,84.1049639 76.8388075,83.8552033 C77.1491161,83.6054427 77.4934778,83.4048804 77.871903,83.2535104 C78.2503281,83.1021403 78.6363159,83.0264564 79.0298781,83.0264564 C79.3326182,83.0264564 79.5407489,83.0340248 79.6542764,83.0491618 C79.767804,83.0642988 79.885114,83.0794356 80.00621,83.0945726 L80.00621,85.592166 C79.824566,85.561892 79.6391404,85.5354026 79.4499279,85.5126971 C79.2607153,85.4899916 79.0752898,85.478639 78.8936457,85.478639 C78.4546726,85.478639 78.0421954,85.5656755 77.6562017,85.739751 C77.2702081,85.9138266 76.9334148,86.1711518 76.6458117,86.5117344 C76.3582086,86.8523171 76.1311569,87.2723626 75.9646499,87.7718838 C75.7981428,88.271405 75.7148905,88.8466026 75.7148905,89.4974938 L75.7148905,95.0830207 L73.1264756,95.0830207 L73.1264756,83.344332 Z M91.026293,95.0830207 L88.4832889,95.0830207 L88.4832889,93.4482324 L88.4378781,93.4482324 C88.120001,94.0385756 87.6469766,94.5115999 87.0187909,94.8673195 C86.3906052,95.2230391 85.7510763,95.4008963 85.1001851,95.4008963 C83.5562106,95.4008963 82.4398732,95.0186926 81.7511395,94.2542739 C81.0624057,93.4898551 80.718044,92.3356758 80.718044,90.7917012 L80.718044,83.344332 L83.306459,83.344332 L83.306459,90.5419419 C83.306459,91.5712583 83.5032371,92.2978236 83.8967992,92.7216598 C84.2903614,93.1454959 84.8428538,93.3574108 85.554293,93.3574108 C86.0992252,93.3574108 86.5533285,93.2741585 86.9166167,93.1076515 C87.2799048,92.9411444 87.575072,92.7178769 87.802127,92.4378423 C88.0291821,92.1578077 88.1919025,91.8210144 88.290293,91.4274523 C88.3886835,91.0338901 88.4378781,90.6100604 88.4378781,90.1559502 L88.4378781,83.344332 L91.026293,83.344332 L91.026293,95.0830207 Z M93.35021,83.344332 L95.8023926,83.344332 L95.8023926,84.9791203 L95.8705088,84.9791203 C96.0672898,84.6915172 96.2792047,84.4266236 96.5062598,84.1844315 C96.7333149,83.9422395 96.9868559,83.7378929 97.2668905,83.5713859 C97.5469251,83.4048788 97.8685816,83.272432 98.2318698,83.1740415 C98.5951579,83.075651 99.0114193,83.0264564 99.4806665,83.0264564 C100.192106,83.0264564 100.85434,83.1853926 101.467388,83.5032697 C102.080437,83.8211468 102.51562,84.3130921 102.772949,84.9791203 C103.211922,84.3736401 103.719004,83.8968316 104.29421,83.5486805 C104.869416,83.2005294 105.588413,83.0264564 106.451222,83.0264564 C107.692457,83.0264564 108.657426,83.329192 109.34616,83.9346722 C110.034894,84.5401524 110.379256,85.5543165 110.379256,86.977195 L110.379256,95.0830207 L107.790841,95.0830207 L107.790841,88.2259917 C107.790841,87.7567445 107.775704,87.3291306 107.74543,86.9431369 C107.715156,86.5571433 107.628119,86.2241342 107.484318,85.9440996 C107.340516,85.664065 107.124817,85.4483659 106.837214,85.2969959 C106.549611,85.1456258 106.156055,85.0699419 105.656534,85.0699419 C104.778587,85.0699419 104.142843,85.3424039 103.749281,85.8873361 C103.355718,86.4322683 103.15894,87.204244 103.15894,88.2032863 L103.15894,95.0830207 L100.570525,95.0830207 L100.570525,87.5448299 C100.570525,86.7274316 100.422942,86.1106079 100.12777,85.6943402 C99.8325986,85.2780726 99.2914588,85.0699419 98.5043345,85.0699419 C98.1713204,85.0699419 97.8496639,85.1380574 97.5393553,85.2742905 C97.2290466,85.4105235 96.9565846,85.6073016 96.7219611,85.8646307 C96.4873375,86.1219598 96.2981278,86.4398321 96.1543262,86.8182573 C96.0105247,87.1966824 95.938625,87.6280806 95.938625,88.1124647 L95.938625,95.0830207 L93.35021,95.0830207 L93.35021,83.344332 Z M144.72455,90.9155851 C144.800235,91.6724353 145.087834,92.2022226 145.587355,92.5049627 C146.086876,92.8077028 146.684779,92.9590705 147.381081,92.9590705 C147.623273,92.9590705 147.89952,92.9401496 148.209828,92.9023071 C148.520137,92.8644645 148.81152,92.7925648 149.083986,92.6866058 C149.356452,92.5806468 149.57972,92.4254948 149.753795,92.2211452 C149.927871,92.0167957 150.007339,91.7481178 149.992202,91.4151037 C149.977065,91.0820896 149.85597,90.8096276 149.628915,90.5977095 C149.40186,90.3857915 149.110477,90.2155027 148.754758,90.0868382 C148.399038,89.9581736 147.994129,89.848432 147.540019,89.75761 C147.085909,89.6667879 146.624237,89.5683989 146.15499,89.4624398 C145.670606,89.3564808 145.20515,89.2278182 144.758608,89.0764481 C144.312067,88.9250781 143.910942,88.7207316 143.555222,88.4634025 C143.199503,88.2060734 142.915688,87.8768485 142.70377,87.4757178 C142.491852,87.0745872 142.385895,86.5788577 142.385895,85.9885145 C142.385895,85.3527603 142.541047,84.8191889 142.851355,84.3877842 C143.161664,83.9563796 143.55522,83.6082337 144.032036,83.3433361 C144.508851,83.0784385 145.038639,82.893013 145.621413,82.7870539 C146.204188,82.6810949 146.760465,82.6281162 147.29026,82.6281162 C147.89574,82.6281162 148.474722,82.6924475 149.027222,82.821112 C149.579723,82.9497766 150.079237,83.1579073 150.525778,83.4455104 C150.97232,83.7331135 151.343171,84.1077487 151.638343,84.5694274 C151.933514,85.031106 152.11894,85.5873826 152.194625,86.2382739 L149.492683,86.2382739 C149.371587,85.6176566 149.087772,85.2013953 148.641231,84.9894772 C148.194689,84.7775591 147.683823,84.6716017 147.108617,84.6716017 C146.926973,84.6716017 146.711274,84.6867384 146.461513,84.7170124 C146.211752,84.7472865 145.977132,84.8040494 145.757646,84.8873029 C145.538159,84.9705564 145.352734,85.0916507 145.201364,85.2505892 C145.049993,85.4095278 144.97431,85.6176585 144.97431,85.8749876 C144.97431,86.1928647 145.084051,86.4501899 145.303538,86.646971 C145.523024,86.843752 145.810623,87.0064724 146.166343,87.1351369 C146.522062,87.2638015 146.926971,87.3735431 147.381081,87.4643651 C147.835192,87.5551872 148.304432,87.6535762 148.788816,87.7595353 C149.258063,87.8654943 149.719735,87.9941569 150.173845,88.145527 C150.627955,88.296897 151.032864,88.5012435 151.388583,88.7585726 C151.744303,89.0159017 152.031902,89.3413424 152.251388,89.7349046 C152.470875,90.1284667 152.580617,90.6128436 152.580617,91.1880498 C152.580617,91.884352 152.42168,92.4746864 152.103803,92.9590705 C151.785926,93.4434547 151.373449,93.8370109 150.866359,94.139751 C150.35927,94.4424911 149.795425,94.6619744 149.174808,94.7982075 C148.55419,94.9344405 147.941151,95.002556 147.335671,95.002556 C146.593957,95.002556 145.909018,94.9193037 145.280832,94.7527967 C144.652647,94.5862896 144.107723,94.3327486 143.646044,93.992166 C143.184365,93.6515834 142.821083,93.2277536 142.556185,92.7206639 C142.291288,92.2135742 142.151272,91.6118873 142.136135,90.9155851 L144.72455,90.9155851 Z M159.954691,95.002556 C159.016197,95.002556 158.17989,94.847404 157.445745,94.5370954 C156.711601,94.2267868 156.090993,93.7991728 155.583903,93.2542407 C155.076813,92.7093085 154.690825,92.058427 154.425928,91.3015768 C154.16103,90.5447265 154.028583,89.7122037 154.028583,88.8039834 C154.028583,87.9109001 154.16103,87.0859457 154.425928,86.3290954 C154.690825,85.5722452 155.076813,84.9213637 155.583903,84.3764315 C156.090993,83.8314994 156.711601,83.4038854 157.445745,83.0935768 C158.17989,82.7832682 159.016197,82.6281162 159.954691,82.6281162 C160.893186,82.6281162 161.729493,82.7832682 162.463637,83.0935768 C163.197782,83.4038854 163.81839,83.8314994 164.32548,84.3764315 C164.832569,84.9213637 165.218557,85.5722452 165.483455,86.3290954 C165.748352,87.0859457 165.880799,87.9109001 165.880799,88.8039834 C165.880799,89.7122037 165.748352,90.5447265 165.483455,91.3015768 C165.218557,92.058427 164.832569,92.7093085 164.32548,93.2542407 C163.81839,93.7991728 163.197782,94.2267868 162.463637,94.5370954 C161.729493,94.847404 160.893186,95.002556 159.954691,95.002556 Z M159.954691,92.9590705 C160.529898,92.9590705 161.029411,92.8379763 161.453247,92.5957842 C161.877084,92.3535922 162.225229,92.0357198 162.497695,91.6421577 C162.770162,91.2485955 162.970724,90.8058448 163.099388,90.3138921 C163.228053,89.8219394 163.292384,89.3186416 163.292384,88.8039834 C163.292384,88.3044622 163.228053,87.8049486 163.099388,87.3054274 C162.970724,86.8059062 162.770162,86.3631555 162.497695,85.9771618 C162.225229,85.5911682 161.877084,85.27708 161.453247,85.034888 C161.029411,84.7926959 160.529898,84.6716017 159.954691,84.6716017 C159.379485,84.6716017 158.879971,84.7926959 158.456135,85.034888 C158.032299,85.27708 157.684153,85.5911682 157.411687,85.9771618 C157.139221,86.3631555 156.938659,86.8059062 156.809994,87.3054274 C156.68133,87.8049486 156.616998,88.3044622 156.616998,88.8039834 C156.616998,89.3186416 156.68133,89.8219394 156.809994,90.3138921 C156.938659,90.8058448 157.139221,91.2485955 157.411687,91.6421577 C157.684153,92.0357198 158.032299,92.3535922 158.456135,92.5957842 C158.879971,92.8379763 159.379485,92.9590705 159.954691,92.9590705 Z M166.897364,82.9459917 L168.827322,82.9459917 L168.827322,81.9696598 C168.827322,81.2279465 168.918143,80.6262596 169.099787,80.1645809 C169.281431,79.7029023 169.523619,79.347188 169.826359,79.0974274 C170.1291,78.8476668 170.473461,78.6811622 170.859455,78.5979087 C171.245448,78.5146552 171.650357,78.473029 172.074193,78.473029 C172.906729,78.473029 173.5122,78.5260078 173.890625,78.6319668 L173.890625,80.6527469 C173.724118,80.6073359 173.546261,80.5732781 173.357048,80.5505726 C173.167836,80.5278671 172.944568,80.5165145 172.687239,80.5165145 C172.339088,80.5165145 172.040137,80.5997668 171.790376,80.7662739 C171.540615,80.9327809 171.415737,81.2582216 171.415737,81.7426058 L171.415737,82.9459917 L173.61816,82.9459917 L173.61816,84.8759502 L171.415737,84.8759502 L171.415737,94.6846805 L168.827322,94.6846805 L168.827322,84.8759502 L166.897364,84.8759502 L166.897364,82.9459917 Z M174.044384,82.9459917 L175.997048,82.9459917 L175.997048,79.4266556 L178.585463,79.4266556 L178.585463,82.9459917 L180.924119,82.9459917 L180.924119,84.8759502 L178.585463,84.8759502 L178.585463,91.142639 C178.585463,91.4151051 178.596816,91.6497252 178.619521,91.8465062 C178.642227,92.0432873 178.695205,92.2097918 178.778459,92.3460249 C178.861713,92.4822579 178.986591,92.5844312 179.153098,92.6525477 C179.319605,92.7206642 179.546657,92.754722 179.83426,92.754722 C180.015904,92.754722 180.197545,92.7509378 180.379189,92.7433693 C180.560833,92.7358008 180.742475,92.7093114 180.924119,92.6639004 L180.924119,94.6619751 C180.636516,94.6922491 180.356485,94.7225227 180.084019,94.7527967 C179.811553,94.7830707 179.531523,94.7982075 179.24392,94.7982075 C178.562754,94.7982075 178.014046,94.7338762 177.597778,94.6052116 C177.181511,94.4765471 176.85607,94.2873373 176.621447,94.0375768 C176.386823,93.7878162 176.227887,93.473728 176.144633,93.0953029 C176.06138,92.7168778 176.012185,92.2854796 175.997048,91.8010954 L175.997048,84.8759502 L174.044384,84.8759502 L174.044384,82.9459917 Z M181.736335,82.9459917 L184.483687,82.9459917 L186.776932,91.7102739 L186.822343,91.7102739 L189.024766,82.9459917 L191.635886,82.9459917 L193.747488,91.7102739 L193.792899,91.7102739 L196.176965,82.9459917 L198.810791,82.9459917 L195.132517,94.6846805 L192.475986,94.6846805 L190.296268,85.9658091 L190.250857,85.9658091 L188.093845,94.6846805 L185.369198,94.6846805 L181.736335,82.9459917 Z M210.317247,92.0735602 C210.317247,92.3914373 210.358874,92.6184889 210.442127,92.754722 C210.525381,92.890955 210.688101,92.9590705 210.930293,92.9590705 L211.202758,92.9590705 C211.308717,92.9590705 211.429811,92.9439338 211.566044,92.9136598 L211.566044,94.7073859 C211.475222,94.7376599 211.357912,94.7717177 211.21411,94.8095602 C211.070309,94.8474027 210.922725,94.8814604 210.771355,94.9117344 C210.619985,94.9420085 210.468617,94.9647136 210.317247,94.9798506 C210.165877,94.9949876 210.037215,95.002556 209.931256,95.002556 C209.40146,95.002556 208.962494,94.8965986 208.614343,94.6846805 C208.266192,94.4727624 208.03914,94.1019114 207.933181,93.5721162 C207.418523,94.0716374 206.786562,94.43492 206.037281,94.6619751 C205.287999,94.8890302 204.565218,95.002556 203.868915,95.002556 C203.33912,95.002556 202.832038,94.9306563 202.347654,94.7868548 C201.86327,94.6430532 201.435656,94.4311383 201.064799,94.1511037 C200.693943,93.8710691 200.398775,93.5153549 200.179289,93.0839502 C199.959802,92.6525456 199.850061,92.1492477 199.850061,91.5740415 C199.850061,90.8474652 199.982507,90.2571309 200.247405,89.8030207 C200.512303,89.3489106 200.860449,88.9931963 201.291853,88.7358672 C201.723258,88.4785381 202.207635,88.2931126 202.744998,88.1795851 C203.282362,88.0660575 203.823502,87.979021 204.368434,87.918473 C204.837681,87.827651 205.284216,87.7633197 205.708052,87.7254772 C206.131888,87.6876347 206.506524,87.6233034 206.831969,87.5324813 C207.157415,87.4416593 207.41474,87.3016441 207.603953,87.1124315 C207.793165,86.923219 207.88777,86.6394044 207.88777,86.2609793 C207.88777,85.9279651 207.808302,85.6555031 207.649364,85.4435851 C207.490425,85.231667 207.293647,85.0689466 207.059023,84.9554191 C206.8244,84.8418915 206.56329,84.7662077 206.275687,84.7283651 C205.988084,84.6905226 205.715622,84.6716017 205.458293,84.6716017 C204.731717,84.6716017 204.133814,84.8229694 203.664567,85.1257095 C203.19532,85.4284496 202.930426,85.8976898 202.869878,86.533444 L200.281463,86.533444 C200.326874,85.7765937 200.508515,85.1484174 200.826393,84.6488963 C201.14427,84.1493751 201.549179,83.7482505 202.041131,83.4455104 C202.533084,83.1427703 203.08936,82.9308554 203.709978,82.8097593 C204.330595,82.6886633 204.96634,82.6281162 205.617231,82.6281162 C206.192437,82.6281162 206.760066,82.6886633 207.320135,82.8097593 C207.880205,82.9308554 208.383502,83.1276335 208.830044,83.4000996 C209.276586,83.6725657 209.636084,84.0244958 209.90855,84.4559004 C210.181016,84.8873051 210.317247,85.4133081 210.317247,86.0339253 L210.317247,92.0735602 Z M207.728832,88.8039834 C207.33527,89.0613125 206.850893,89.2164645 206.275687,89.269444 C205.700481,89.3224235 205.125283,89.4018916 204.550077,89.5078506 C204.277611,89.5532616 204.012718,89.6175929 203.755388,89.7008465 C203.498059,89.7841 203.271008,89.8976258 203.074227,90.0414274 C202.877446,90.1852289 202.722294,90.3744387 202.608766,90.6090622 C202.495239,90.8436858 202.438476,91.1275004 202.438476,91.4605145 C202.438476,91.7481176 202.521728,91.9903061 202.688235,92.1870871 C202.854742,92.3838682 203.055304,92.5390202 203.289928,92.6525477 C203.524551,92.7660753 203.781877,92.8455433 204.061911,92.8909544 C204.341946,92.9363654 204.595487,92.9590705 204.822542,92.9590705 C205.110145,92.9590705 205.420449,92.9212286 205.753463,92.8455436 C206.086477,92.7698585 206.400565,92.6411959 206.695737,92.4595519 C206.990909,92.2779078 207.236881,92.0470719 207.433662,91.7670373 C207.630443,91.4870027 207.728832,91.142641 207.728832,90.7339419 L207.728832,88.8039834 Z M213.127538,82.9459917 L215.557015,82.9459917 L215.557015,85.2165311 L215.602426,85.2165311 C215.678111,84.898654 215.825694,84.5883501 216.045181,84.28561 C216.264668,83.9828699 216.529561,83.7066237 216.83987,83.4568631 C217.150178,83.2071025 217.49454,83.0065402 217.872965,82.8551701 C218.25139,82.7038001 218.637378,82.6281162 219.03094,82.6281162 C219.33368,82.6281162 219.541811,82.6356846 219.655339,82.6508216 C219.768866,82.6659586 219.886176,82.6810954 220.007272,82.6962324 L220.007272,85.1938257 C219.825628,85.1635517 219.640203,85.1370624 219.45099,85.1143568 C219.261778,85.0916513 219.076352,85.0802988 218.894708,85.0802988 C218.455735,85.0802988 218.043258,85.1673352 217.657264,85.3414108 C217.27127,85.5154863 216.934477,85.7728116 216.646874,86.1133942 C216.359271,86.4539768 216.132219,86.8740224 215.965712,87.3735436 C215.799205,87.8730647 215.715953,88.4482623 215.715953,89.0991535 L215.715953,94.6846805 L213.127538,94.6846805 L213.127538,82.9459917 Z M222.749447,89.4851452 C222.749447,89.9392554 222.813778,90.3782219 222.942442,90.8020581 C223.071107,91.2258942 223.264101,91.5967453 223.52143,91.9146224 C223.778759,92.2324995 224.1042,92.4860405 224.497762,92.6752531 C224.891324,92.8644657 225.360564,92.9590705 225.905496,92.9590705 C226.662347,92.9590705 227.271602,92.7963502 227.733281,92.4709046 C228.194959,92.145459 228.539321,91.6572979 228.766376,91.0064066 L231.218559,91.0064066 C231.082326,91.6421609 230.847705,92.20979 230.514691,92.7093112 C230.181677,93.2088324 229.780553,93.628878 229.311305,93.9694606 C228.842058,94.3100432 228.316055,94.5673684 227.733281,94.741444 C227.150506,94.9155195 226.541251,95.002556 225.905496,95.002556 C224.982139,95.002556 224.164753,94.8511882 223.453314,94.5484481 C222.741875,94.245708 222.140188,93.8218782 221.648235,93.2769461 C221.156282,92.7320139 220.785431,92.0811324 220.535671,91.3242822 C220.28591,90.5674319 220.161032,89.7349091 220.161032,88.8266888 C220.161032,87.9941535 220.293478,87.2032569 220.558376,86.4539751 C220.823274,85.7046933 221.201693,85.0462435 221.693646,84.4786058 C222.185598,83.9109681 222.779717,83.460649 223.476019,83.1276349 C224.172321,82.7946207 224.959434,82.6281162 225.83738,82.6281162 C226.760737,82.6281162 227.589476,82.8211101 228.323621,83.2071037 C229.057766,83.5930974 229.667021,84.1039636 230.151405,84.7397178 C230.635789,85.3754721 230.987719,86.1058216 231.207206,86.9307884 C231.426692,87.7557552 231.483455,88.6071989 231.377496,89.4851452 L222.749447,89.4851452 Z M228.789081,87.7822407 C228.758807,87.3735415 228.671771,86.9799853 228.527969,86.6015602 C228.384168,86.223135 228.18739,85.8939101 227.937629,85.6138755 C227.687869,85.3338409 227.385133,85.1067893 227.029413,84.9327137 C226.673694,84.7586381 226.276353,84.6716017 225.83738,84.6716017 C225.38327,84.6716017 224.970793,84.7510697 224.599936,84.9100083 C224.22908,85.0689469 223.911207,85.2884301 223.64631,85.5684647 C223.381412,85.8484993 223.169497,86.1777242 223.010559,86.5561494 C222.85162,86.9345745 222.764584,87.3432675 222.749447,87.7822407 L228.789081,87.7822407 Z"/>
+        <path d="M285.00545,83.8609626 L284.079019,83.8609626 L284.079019,78.3262032 L286.217984,78.3262032 C286.899186,78.3262032 287.412351,78.4509791 287.757493,78.7005348 C288.102636,78.9500904 288.275204,79.3556122 288.275204,79.9171123 C288.275204,80.4162235 288.134425,80.7816388 287.852861,81.013369 C287.571297,81.2450992 287.221619,81.383244 286.803815,81.4278075 L288.384196,83.8609626 L287.33515,83.8609626 L285.877384,81.4946524 L285.00545,81.4946524 L285.00545,83.8609626 Z M286.040872,80.7192513 C286.213443,80.7192513 286.3792,80.7125669 286.538147,80.6991979 C286.697094,80.6858288 286.835603,80.6479504 286.953678,80.5855615 C287.071754,80.5231726 287.16712,80.4362751 287.239782,80.3248663 C287.312444,80.2134576 287.348774,80.0552595 287.348774,79.8502674 C287.348774,79.6809261 287.310173,79.5472376 287.23297,79.4491979 C287.155767,79.3511582 287.05813,79.2754013 286.940054,79.2219251 C286.821979,79.1684489 286.690282,79.1350268 286.544959,79.1216578 C286.399636,79.1082887 286.258856,79.1016043 286.122616,79.1016043 L285.00545,79.1016043 L285.00545,80.7192513 L286.040872,80.7192513 Z M291,81 C291,81.7486668 290.866032,82.4304782 290.598093,83.0454545 C290.330153,83.6604309 289.966851,84.1862723 289.508174,84.6229947 C289.049498,85.059717 288.518168,85.3983945 287.914169,85.6390374 C287.31017,85.8796803 286.676661,86 286.013624,86 C285.277925,86 284.603545,85.8729959 283.990463,85.618984 C283.377381,85.364972 282.850593,85.0151537 282.410082,84.5695187 C281.969571,84.1238837 281.624434,83.5958141 281.374659,82.9852941 C281.124885,82.3747741 281,81.713016 281,81 C281,80.2513332 281.133968,79.5695218 281.401907,78.9545455 C281.669847,78.3395691 282.033149,77.8137277 282.491826,77.3770053 C282.950502,76.940283 283.484102,76.6016055 284.092643,76.3609626 C284.701184,76.1203197 285.341504,76 286.013624,76 C286.676661,76 287.31017,76.1203197 287.914169,76.3609626 C288.518168,76.6016055 289.049498,76.940283 289.508174,77.3770053 C289.966851,77.8137277 290.330153,78.3395691 290.598093,78.9545455 C290.866032,79.5695218 291,80.2513332 291,81 Z M289.910082,81 C289.910082,80.3939364 289.810174,79.8369009 289.610354,79.328877 C289.410535,78.8208531 289.133517,78.3841373 288.779292,78.0187166 C288.425066,77.6532959 288.01181,77.3703219 287.53951,77.1697861 C287.067209,76.9692503 286.558586,76.868984 286.013624,76.868984 C285.459579,76.868984 284.944144,76.9692503 284.467302,77.1697861 C283.990461,77.3703219 283.574934,77.6532959 283.220708,78.0187166 C282.866483,78.3841373 282.589465,78.8208531 282.389646,79.328877 C282.189826,79.8369009 282.089918,80.3939364 282.089918,81 C282.089918,81.5704128 282.180744,82.1051668 282.362398,82.6042781 C282.544052,83.1033893 282.805175,83.5401051 283.145777,83.9144385 C283.486378,84.2887719 283.897364,84.5851148 284.378747,84.8034759 C284.86013,85.0218371 285.405083,85.131016 286.013624,85.131016 C286.558586,85.131016 287.067209,85.0307497 287.53951,84.8302139 C288.01181,84.6296781 288.425066,84.3467041 288.779292,83.9812834 C289.133517,83.6158627 289.410535,83.1813751 289.610354,82.6778075 C289.810174,82.1742399 289.910082,81.6149763 289.910082,81 Z M55.5505618,46.8134831 C55.5505618,51.4876638 54.9752867,55.7842501 53.8247191,59.7033708 C52.6741516,63.6224915 51.0022582,67.0202103 48.8089888,69.8966292 C46.6157194,72.7730481 43.8831624,75.0022393 40.611236,76.5842697 C37.3393095,78.1663 33.5820437,78.9573034 29.3393258,78.9573034 C26.1033546,78.9573034 23.2090015,78.1483227 20.6561798,76.5303371 C18.103358,74.9123515 16.1078724,72.8449564 14.6696629,70.3280899 L14.6696629,96 L10.1393258,96 C8.84493735,96 7.58652297,95.7662945 6.36404494,95.2988764 C5.14156692,94.8314583 4.06292602,94.1662964 3.12808989,93.3033708 C2.19325375,92.4404451 1.43820512,91.3977589 0.862921348,90.1752809 C0.287637573,88.9528029 0,87.5505697 0,85.9685393 L0,50.8044944 C0,45.9864928 0.557297798,41.5640651 1.67191011,37.5370787 C2.78652243,33.5100922 4.53032521,30.0584413 6.90337079,27.1820225 C9.27641636,24.3056036 12.2966109,22.0764124 15.9640449,20.494382 C19.631479,18.9123516 24.017952,18.1213483 29.1235955,18.1213483 C33.006761,18.1213483 36.566276,18.930329 39.8022472,20.5483146 C43.0382184,22.1663002 45.8247074,24.3056047 48.1617978,26.9662921 C50.4988881,29.6269796 52.3146003,32.6831288 53.6089888,36.1348315 C54.9033773,39.5865341 55.5505618,43.1460491 55.5505618,46.8134831 Z M40.6651685,50.588764 C40.6651685,43.6853587 39.5325956,38.6876559 37.2674157,35.5955056 C35.0022359,32.5033553 31.5326076,30.9573034 26.858427,30.9573034 C22.8314405,30.9573034 19.757314,32.5213327 17.6359551,35.6494382 C15.5145961,38.7775437 14.4539326,42.8584018 14.4539326,47.8921348 C14.4539326,53.7168831 15.766279,58.2112201 18.3910112,61.3752809 C21.0157435,64.5393417 24.4853717,66.1213483 28.8,66.1213483 C32.3236131,66.1213483 35.1820115,64.7011378 37.3752809,61.8606742 C39.5685503,59.0202105 40.6651685,55.2629447 40.6651685,50.588764 Z M106.979344,77.6629213 C103.959104,77.6629213 101.568117,76.8359633 99.8063106,75.1820225 C98.044504,73.5280816 97.163614,71.1191169 97.163614,67.9550562 L97.163614,44.2247191 C97.163614,41.8516735 96.8579991,39.8202332 96.24676,38.1303371 C95.635521,36.440441 94.808563,35.0741625 93.7658612,34.0314607 C92.7231593,32.9887588 91.5006996,32.2157329 90.0984454,31.7123596 C88.6961912,31.2089862 87.2040713,30.9573034 85.6220409,30.9573034 C84.4714734,30.9573034 83.2849684,31.1910089 82.0624904,31.658427 C80.8400124,32.125845 79.7074394,32.898871 78.6647376,33.9775281 C77.6220357,35.0561852 76.7771004,36.4584183 76.1299061,38.1842697 C75.4827119,39.910121 75.1591196,42.0674028 75.1591196,44.6561798 L75.1591196,77.6629213 L70.4130522,77.6629213 C66.9613495,77.6629213 64.4445208,76.8000086 62.8624904,75.0741573 C61.28046,73.348306 60.4894567,70.975296 60.4894567,67.9550562 L60.4894567,0 L65.0197938,0 C68.4714964,0 71.0422572,0.862912719 72.7321533,2.58876404 C74.4220494,4.31461537 75.2669848,6.54380656 75.2669848,9.27640449 L75.2669848,25.8876404 C75.7703581,25.0247148 76.4714746,24.1438247 77.3703555,23.2449438 C78.2692364,22.3460629 79.2579906,21.5191049 80.3366477,20.7640449 C81.4153048,20.008985 82.6018098,19.3797778 83.8961982,18.8764045 C85.1905867,18.3730312 86.5209105,18.1213483 87.8872095,18.1213483 C95.437809,18.1213483 101.298425,20.2966075 105.469232,24.647191 C109.640039,28.9977746 111.725412,35.3078238 111.725412,43.5775281 L111.725412,77.6629213 L106.979344,77.6629213 Z M174.372172,46.8134831 C174.372172,51.4876638 173.796897,55.7842501 172.646329,59.7033708 C171.495762,63.6224915 169.823868,67.0202103 167.630599,69.8966292 C165.437329,72.7730481 162.704772,75.0022393 159.432846,76.5842697 C156.160919,78.1663 152.403654,78.9573034 148.160936,78.9573034 C144.924965,78.9573034 142.030612,78.1483227 139.47779,76.5303371 C136.924968,74.9123515 134.929482,72.8449564 133.491273,70.3280899 L133.491273,96 L128.960936,96 C127.666547,96 126.408133,95.7662945 125.185655,95.2988764 C123.963177,94.8314583 122.884536,94.1662964 121.9497,93.3033708 C121.014864,92.4404451 120.259815,91.3977589 119.684531,90.1752809 C119.109248,88.9528029 118.82161,87.5505697 118.82161,85.9685393 L118.82161,50.8044944 C118.82161,45.9864928 119.378908,41.5640651 120.49352,37.5370787 C121.608132,33.5100922 123.351935,30.0584413 125.724981,27.1820225 C128.098026,24.3056036 131.118221,22.0764124 134.785655,20.494382 C138.453089,18.9123516 142.839562,18.1213483 147.945205,18.1213483 C151.828371,18.1213483 155.387886,18.930329 158.623857,20.5483146 C161.859828,22.1663002 164.646317,24.3056047 166.983408,26.9662921 C169.320498,29.6269796 171.13621,32.6831288 172.430599,36.1348315 C173.724987,39.5865341 174.372172,43.1460491 174.372172,46.8134831 Z M159.486779,50.588764 C159.486779,43.6853587 158.354206,38.6876559 156.089026,35.5955056 C153.823846,32.5033553 150.354218,30.9573034 145.680037,30.9573034 C141.653051,30.9573034 138.578924,32.5213327 136.457565,35.6494382 C134.336206,38.7775437 133.275543,42.8584018 133.275543,47.8921348 C133.275543,53.7168831 134.587889,58.2112201 137.212621,61.3752809 C139.837353,64.5393417 143.306982,66.1213483 147.62161,66.1213483 C151.145223,66.1213483 154.003621,64.7011378 156.196891,61.8606742 C158.39016,59.0202105 159.486779,55.2629447 159.486779,50.588764 Z M232.59646,54.7955056 C232.59646,58.5348502 231.913321,61.8426822 230.547022,64.7191011 C229.180723,67.59552 227.329056,70.022462 224.991966,72 C222.654875,73.977538 219.958273,75.4696579 216.902078,76.4764045 C213.845883,77.4831511 210.627937,77.9865169 207.248145,77.9865169 L199.266123,77.9865169 C185.531223,77.9865169 178.663876,72.1259013 178.663876,60.4044944 L178.663876,6.79550562 C179.526801,6.50786373 180.749261,6.16629411 182.331291,5.77078652 C183.913322,5.37527892 185.62117,4.99775461 187.454887,4.63820225 C189.288604,4.27864989 191.158248,3.99101231 193.063876,3.7752809 C194.969503,3.55954948 196.677351,3.45168539 198.187471,3.45168539 L207.14028,3.45168539 C210.663893,3.45168539 213.899816,3.9011191 216.848145,4.8 C219.796475,5.6988809 222.349258,6.99324998 224.506572,8.68314607 C226.663886,10.3730422 228.33578,12.4224599 229.522303,14.8314607 C230.708825,17.2404615 231.302078,19.9550411 231.302078,22.9752809 C231.302078,27.0741778 230.259392,30.4359419 228.173988,33.0606742 C226.088584,35.6854064 223.212209,37.5370733 219.544775,38.6157303 C221.414447,39.1191036 223.140272,39.9460617 224.722303,41.0966292 C226.304333,42.2471968 227.688589,43.5595432 228.875112,45.0337079 C230.061634,46.5078725 230.978479,48.1078565 231.625673,49.8337079 C232.272868,51.5595592 232.59646,53.2134752 232.59646,54.7955056 Z M216.52455,24.2696629 C216.52455,22.6876325 216.18298,21.3393314 215.499831,20.2247191 C214.816681,19.1101068 213.935791,18.2292167 212.857134,17.5820225 C211.778477,16.9348282 210.556017,16.4674172 209.189718,16.1797753 C207.823419,15.8921334 206.457141,15.7483146 205.090842,15.7483146 L199.589718,15.7483146 C198.654882,15.7483146 197.612196,15.8382013 196.461628,16.0179775 C195.311061,16.1977537 194.23242,16.3595498 193.225673,16.5033708 L193.225673,33.2224719 L204.551516,33.2224719 C207.859398,33.2224719 210.681841,32.5213553 213.018932,31.1191011 C215.356022,29.7168469 216.52455,27.4337237 216.52455,24.2696629 Z M217.711067,55.2269663 C217.711067,51.1999799 216.686358,48.4314682 214.636909,46.9213483 C212.587461,45.4112284 209.40547,44.6561798 205.090842,44.6561798 L193.333539,44.6561798 L193.333539,59.8651685 C193.333539,61.159557 193.944768,62.2561753 195.167246,63.1550562 C196.389724,64.0539371 197.935776,64.5033708 199.805449,64.5033708 L205.845898,64.5033708 C209.872885,64.5033708 212.857124,63.6584354 214.798707,61.9685393 C216.74029,60.2786432 217.711067,58.0314747 217.711067,55.2269663 Z M290.928613,54.7955056 C290.928613,58.5348502 290.245474,61.8426822 288.879175,64.7191011 C287.512876,67.59552 285.661209,70.022462 283.324119,72 C280.987028,73.977538 278.290426,75.4696579 275.234231,76.4764045 C272.178036,77.4831511 268.960091,77.9865169 265.580299,77.9865169 L257.598276,77.9865169 C243.863376,77.9865169 236.996029,72.1259013 236.996029,60.4044944 L236.996029,6.79550562 C237.858955,6.50786373 239.081414,6.16629411 240.663445,5.77078652 C242.245475,5.37527892 243.953323,4.99775461 245.78704,4.63820225 C247.620757,4.27864989 249.490401,3.99101231 251.396029,3.7752809 C253.301656,3.55954948 255.009505,3.45168539 256.519624,3.45168539 L265.472433,3.45168539 C268.996047,3.45168539 272.231969,3.9011191 275.180299,4.8 C278.128628,5.6988809 280.681411,6.99324998 282.838726,8.68314607 C284.99604,10.3730422 286.667933,12.4224599 287.854456,14.8314607 C289.040979,17.2404615 289.634231,19.9550411 289.634231,22.9752809 C289.634231,27.0741778 288.591545,30.4359419 286.506141,33.0606742 C284.420738,35.6854064 281.544362,37.5370733 277.876928,38.6157303 C279.7466,39.1191036 281.472426,39.9460617 283.054456,41.0966292 C284.636486,42.2471968 286.020742,43.5595432 287.207265,45.0337079 C288.393788,46.5078725 289.310632,48.1078565 289.957827,49.8337079 C290.605021,51.5595592 290.928613,53.2134752 290.928613,54.7955056 Z M274.856703,24.2696629 C274.856703,22.6876325 274.515133,21.3393314 273.831984,20.2247191 C273.148835,19.1101068 272.267944,18.2292167 271.189287,17.5820225 C270.11063,16.9348282 268.888171,16.4674172 267.521872,16.1797753 C266.155573,15.8921334 264.789294,15.7483146 263.422995,15.7483146 L257.921872,15.7483146 C256.987035,15.7483146 255.944349,15.8382013 254.793782,16.0179775 C253.643214,16.1977537 252.564573,16.3595498 251.557827,16.5033708 L251.557827,33.2224719 L262.883669,33.2224719 C266.191551,33.2224719 269.013995,32.5213553 271.351085,31.1191011 C273.688175,29.7168469 274.856703,27.4337237 274.856703,24.2696629 Z M276.04322,55.2269663 C276.04322,51.1999799 275.018511,48.4314682 272.969063,46.9213483 C270.919614,45.4112284 267.737624,44.6561798 263.422995,44.6561798 L251.665692,44.6561798 L251.665692,59.8651685 C251.665692,61.159557 252.276922,62.2561753 253.4994,63.1550562 C254.721878,64.0539371 256.26793,64.5033708 258.137602,64.5033708 L264.178051,64.5033708 C268.205038,64.5033708 271.189278,63.6584354 273.13086,61.9685393 C275.072443,60.2786432 276.04322,58.0314747 276.04322,55.2269663 Z"/>
+    </g>
+</svg>
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index d27f56f28b..c648fdf100 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -49,7 +49,6 @@ if (!$auth->acl_get('a_'))
 define('IN_ADMIN', true);
 
 // Some oft used variables
-$safe_mode		= (@ini_get('safe_mode') == '1' || strtolower(@ini_get('safe_mode')) === 'on') ? true : false;
 $file_uploads	= (@ini_get('file_uploads') == '1' || strtolower(@ini_get('file_uploads')) === 'on') ? true : false;
 $module_id		= $request->variable('i', '');
 $mode			= $request->variable('mode', '');
diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html
index 63a734ea7d..666950e0ae 100644
--- a/phpBB/adm/style/acp_avatar_options_upload.html
+++ b/phpBB/adm/style/acp_avatar_options_upload.html
@@ -1,6 +1,6 @@
 <dl>
 	<dt><label for="avatar_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
-	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" /></dd>
+	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" accept="{{ AVATAR_ALLOWED_EXTENSIONS }}" /></dd>
 </dl>
 
 <!-- IF S_UPLOAD_AVATAR_URL -->
diff --git a/phpBB/adm/style/acp_contact.html b/phpBB/adm/style/acp_contact.html
index d63fd08a3a..c46a2d7fed 100644
--- a/phpBB/adm/style/acp_contact.html
+++ b/phpBB/adm/style/acp_contact.html
@@ -44,7 +44,7 @@
 		<!-- INCLUDE acp_posting_buttons.html -->
 
 		<dl class="responsive-columns">
-			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
+			<dt style="width: 90px;" id="color_palette_placeholder" data-color-palette="v" data-height="12" data-width="15" data-bbcode="true">
 			</dt>
 
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;">
diff --git a/phpBB/adm/style/acp_ext_actions.html b/phpBB/adm/style/acp_ext_actions.html
new file mode 100644
index 0000000000..6b59ab7180
--- /dev/null
+++ b/phpBB/adm/style/acp_ext_actions.html
@@ -0,0 +1,7 @@
+{% for action in enabled.actions %}
+	<a href="{{ action.U_ACTION }}"{% if action.L_ACTION_EXPLAIN %} title="{{ action.L_ACTION_EXPLAIN }}"{% endif %}{% if action.COLOR %} style="color: {{ action.COLOR }};"{% endif %} data-ajax="{{ action.ACTION_AJAX }}" data-refresh="true">{{ action.L_ACTION }}</a>{% if not action.S_LAST_ROW %}&nbsp;|&nbsp;{% endif %}
+{% endfor %}
+
+{% for action in disabled.actions %}
+	<a href="{{ action.U_ACTION }}"{% if action.L_ACTION_EXPLAIN %} title="{{ action.L_ACTION_EXPLAIN }}"{% endif %}{% if action.COLOR %} style="color: {{ action.COLOR }};"{% endif %} data-ajax="{{ action.ACTION_AJAX }}" data-refresh="true">{{ action.L_ACTION }}</a>{% if not action.S_LAST_ROW %}&nbsp;|&nbsp;{% endif %}
+{% endfor %}
diff --git a/phpBB/adm/style/acp_ext_delete_data.html b/phpBB/adm/style/acp_ext_delete_data.html
deleted file mode 100644
index 0f3adb7cfe..0000000000
--- a/phpBB/adm/style/acp_ext_delete_data.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-	<a id="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_EXTENSION_DELETE_DATA_EXPLAIN}</p>
-
-	<!-- IF MIGRATOR_ERROR -->
-	<div class="errorbox">
-		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
-		<p>{MIGRATOR_ERROR}</p>
-		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-	</div>
-	<!-- ELSEIF PRE -->
-	<div class="errorbox">
-		<p>{L_CONFIRM_MESSAGE}</p>
-	</div>
-
-	<form id="acp_extensions" method="post" action="{U_PURGE}">
-	<fieldset class="submit-buttons">
-		<legend>{L_EXTENSION_DELETE_DATA}</legend>
-		<input class="button1" type="submit" name="delete_data" value="{L_EXTENSION_DELETE_DATA}" />
-		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
-	</fieldset>
-	</form>
-	<!-- ELSEIF S_NEXT_STEP -->
-		<div class="errorbox">
-			<p>{L_EXTENSION_DELETE_DATA_IN_PROGRESS}</p>
-		</div>
-	<!-- ELSE -->
-		<div class="successbox">
-			<p>{L_EXTENSION_DELETE_DATA_SUCCESS}</p>
-			<br />
-			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html
deleted file mode 100644
index d2b5c46fe8..0000000000
--- a/phpBB/adm/style/acp_ext_disable.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-	<a id="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_EXTENSION_DISABLE_EXPLAIN}</p>
-
-	<!-- IF PRE -->
-	<fieldset>
-		<h2>{L_CONFIRM}</h2>
-		<p>{L_CONFIRM_MESSAGE}</p>
-	</fieldset>
-
-	<form id="acp_extensions" method="post" action="{U_DISABLE}">
-	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="disable" value="{L_EXTENSION_DISABLE}" />
-		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
-	</fieldset>
-	</form>
-	<!-- ELSEIF S_NEXT_STEP -->
-		<div class="successbox notice">
-			<p>{L_EXTENSION_DISABLE_IN_PROGRESS}</p>
-		</div>
-	<!-- ELSE -->
-		<div class="successbox">
-			<p>{L_EXTENSION_DISABLE_SUCCESS}</p>
-			<br />
-			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
deleted file mode 100644
index 8a4a35359e..0000000000
--- a/phpBB/adm/style/acp_ext_enable.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-	<a id="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_EXTENSION_ENABLE_EXPLAIN}</p>
-
-	<!-- IF MIGRATOR_ERROR -->
-	<div class="errorbox">
-		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
-		<p>{MIGRATOR_ERROR}</p>
-		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-	</div>
-	<!-- ELSEIF PRE -->
-	<fieldset>
-		<h2>{L_CONFIRM}</h2>
-		<p>{L_CONFIRM_MESSAGE}</p>
-	</fieldset>
-
-	<form id="acp_extensions" method="post" action="{U_ENABLE}">
-	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="enable" value="{L_EXTENSION_ENABLE}" />
-		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
-	</fieldset>
-	</form>
-	<!-- ELSEIF S_NEXT_STEP -->
-		<div class="successbox notice">
-			<p>{L_EXTENSION_ENABLE_IN_PROGRESS}</p>
-		</div>
-	<!-- ELSE -->
-		<div class="successbox">
-			<p>{L_EXTENSION_ENABLE_SUCCESS}</p>
-			<br />
-			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 8e2c7452a3..e5783124c6 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -7,7 +7,7 @@
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 
 	<fieldset class="quick">
-		<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.2" target="_blank">{L_BROWSE_EXTENSIONS_DATABASE}</a> &bull; <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></span>
+		<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.3" target="_blank">{L_BROWSE_EXTENSIONS_DATABASE}</a> &bull; <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></span>
 	</fieldset>
 
 	<form id="version_check_settings" method="post" action="{U_ACTION}" style="display:none">
@@ -42,8 +42,8 @@
 		</tr>
 	</thead>
 	<tbody>
-		<!-- IF .enabled -->
-		<tr>
+
+		<tr id="ext_enabled_header"<!-- IF not .enabled --> class="hidden"<!-- ENDIF -->>
 			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong><!-- EVENT acp_ext_list_enabled_title_after --></td>
 		</tr>
 		<!-- BEGIN enabled -->
@@ -59,17 +59,12 @@
 			</td>
 			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
 			<td style="text-align: center;">
-				<!-- BEGIN actions -->
-					<a href="{enabled.actions.U_ACTION}"<!-- IF enabled.actions.L_ACTION_EXPLAIN --> title="{enabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF -->>{enabled.actions.L_ACTION}</a>
-					<!-- IF not enabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
-				<!-- END actions -->
+				<!-- INCLUDE acp_ext_actions.html -->
 			</td>
 		</tr>
 		<!-- END enabled -->
-		<!-- ENDIF -->
 
-		<!-- IF .disabled -->
-		<tr>
+		<tr id="ext_disabled_header"<!-- IF not .disabled --> class="hidden"<!-- ENDIF -->>
 			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong><!-- EVENT acp_ext_list_disabled_title_after --></td>
 		</tr>
 		<!-- BEGIN disabled -->
@@ -87,14 +82,10 @@
 				<!-- IF disabled.U_DETAILS --><a href="{disabled.U_DETAILS}">{L_DETAILS}</a><!-- ENDIF -->
 			</td>
 			<td style="text-align: center;">
-				<!-- BEGIN actions -->
-					<a href="{disabled.actions.U_ACTION}"<!-- IF disabled.actions.L_ACTION_EXPLAIN --> title="{disabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF -->>{disabled.actions.L_ACTION}</a>
-					<!-- IF not disabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
-				<!-- END actions -->
+				<!-- INCLUDE acp_ext_actions.html -->
 			</td>
 		</tr>
 		<!-- END disabled -->
-		<!-- ENDIF -->
 	</tbody>
 	</table>
 
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 20bcd2e9f9..f51ce98776 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -211,6 +211,11 @@
 				<label><input type="radio" class="radio" name="display_subforum_list" value="0"<!-- IF not S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
+			<dt><label for="display_subforum_limit">{L_LIMIT_SUBFORUMS}{L_COLON}</label><br /><span>{L_LIMIT_SUBFORUMS_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="display_subforum_limit" value="1"<!-- IF S_DISPLAY_SUBFORUM_LIMIT --> id="display_subforum_limit" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_subforum_limit" value="0"<!-- IF not S_DISPLAY_SUBFORUM_LIMIT --> id="display_subforum_limit" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<dl>
 			<dt><label for="display_on_index">{L_LIST_INDEX}{L_COLON}</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 723a190899..8651b63b7f 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -100,7 +100,7 @@
 			<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />
 			<!-- IF GROUP_COLOUR -->&nbsp;<span style="background-color: #{GROUP_COLOUR}">&nbsp; &nbsp;</span><!-- ENDIF -->&nbsp;&nbsp;<span>
 			[ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ]</span>
-			<div id="color_palette_placeholder" style="display: none;" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div>
+			<div id="color_palette_placeholder" style="display: none;" data-color-palette="h" data-height="12" data-width="15" data-target="#group_colour"></div>
 		</dd>
 	</dl>
 	<dl>
diff --git a/phpBB/adm/style/acp_help_phpbb.html b/phpBB/adm/style/acp_help_phpbb.html
index 478ecc162a..7d3c503e77 100644
--- a/phpBB/adm/style/acp_help_phpbb.html
+++ b/phpBB/adm/style/acp_help_phpbb.html
@@ -38,10 +38,12 @@
 			<dd>{L_SEND_STATISTICS_LONG}</dd>
 		</dl>
 	</div>
+	<script>
+		var statsData = {{ S_STATS_DATA }};
+	</script>
 	<!-- EVENT acp_help_phpbb_stats_after -->
 	<fieldset>
 		<p class="submit-buttons">
-			<input type="hidden" name="systemdata" value="{RAW_DATA}" />
 			<input type="hidden" name="help_send_statistics_time" value="{COLLECT_STATS_TIME}" />
 			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
 		</p>
@@ -52,7 +54,11 @@
 <form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
 	<fieldset>
 		<p class="submit-buttons">
-			<input type="hidden" name="systemdata" value="{RAW_DATA}" />
+			{% for providers in providers %}
+				{% for values in providers.values %}
+					<input type="hidden" name="{{ providers.NAME }}[{{ values.KEY }}]" value="{{ values.VALUE }}" />
+				{% endfor %}
+			{% endfor %}
 			<input class="button1" type="submit" id="submit_stats" name="submit" value="{L_SEND_STATISTICS}" />
 		</p>
 	</fieldset>
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
index 79fef94207..5e3ac9532a 100644
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -69,7 +69,7 @@
 	<p>{L_ACP_LANGUAGE_PACKS_EXPLAIN}</p>
 
 	<fieldset class="quick">
-		<span class="small"><a href="https://www.phpbb.com/go/customise/language-packs/3.2" target="_blank">{L_BROWSE_LANGUAGE_PACKS_DATABASE}</a></span>
+		<span class="small"><a href="https://www.phpbb.com/go/customise/language-packs/3.3" target="_blank">{L_BROWSE_LANGUAGE_PACKS_DATABASE}</a></span>
 	</fieldset>
 
 	<table class="table1 zebra-table">
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 12477a4b77..b8d337cfd8 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -94,89 +94,116 @@
 
 	<!-- EVENT acp_main_notice_after -->
 
-	<table class="table1 two-columns no-header" data-no-responsive-header="true">
-		<caption>{L_FORUM_STATS}</caption>
-		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-	<thead>
-	<tr>
-		<th>{L_STATISTIC}</th>
-		<th>{L_VALUE}</th>
-		<th>{L_STATISTIC}</th>
-		<th>{L_VALUE}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td>{L_NUMBER_POSTS}{L_COLON} </td>
-		<td><strong>{TOTAL_POSTS}</strong></td>
-		<td>{L_POSTS_PER_DAY}{L_COLON} </td>
-		<td><strong>{POSTS_PER_DAY}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_NUMBER_TOPICS}{L_COLON} </td>
-		<td><strong>{TOTAL_TOPICS}</strong></td>
-		<td>{L_TOPICS_PER_DAY}{L_COLON} </td>
-		<td><strong>{TOPICS_PER_DAY}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_NUMBER_USERS}{L_COLON} </td>
-		<td><strong>{TOTAL_USERS}</strong></td>
-		<td>{L_USERS_PER_DAY}{L_COLON} </td>
-		<td><strong>{USERS_PER_DAY}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_NUMBER_FILES}{L_COLON} </td>
-		<td><strong>{TOTAL_FILES}</strong></td>
-		<td>{L_FILES_PER_DAY}{L_COLON} </td>
-		<td><strong>{FILES_PER_DAY}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_BOARD_STARTED}{L_COLON} </td>
-		<td><strong>{START_DATE}</strong></td>
-		<td>{L_AVATAR_DIR_SIZE}{L_COLON} </td>
-		<td><strong>{AVATAR_DIR_SIZE}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_DATABASE_SIZE}{L_COLON} </td>
-		<td><strong>{DBSIZE}</strong></td>
-		<td>{L_UPLOAD_DIR_SIZE}{L_COLON} </td>
-		<td><strong>{UPLOAD_DIR_SIZE}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_DATABASE_SERVER_INFO}{L_COLON} </td>
-		<td><strong>{DATABASE_INFO}</strong></td>
-		<td>{L_GZIP_COMPRESSION}{L_COLON} </td>
-		<td><strong>{GZIP_COMPRESSION}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_PHP_VERSION}{L_COLON} </td>
-		<td><strong>{PHP_VERSION_INFO}</strong></td>
-	<!-- IF S_TOTAL_ORPHAN -->
-		<td>{L_NUMBER_ORPHAN}{L_COLON} </td>
-		<td>
-		<!-- IF TOTAL_ORPHAN > 0 -->
-			<a href="{U_ATTACH_ORPHAN}" title="{L_MORE_INFORMATION}"><strong>{TOTAL_ORPHAN}</strong></a>
-		<!-- ELSE -->
-			<strong>{TOTAL_ORPHAN}</strong>
-		<!-- ENDIF -->
-		</td>
-		<!-- ELSE -->
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-	<!-- ENDIF -->
-	</tr>
-	<!-- IF S_VERSIONCHECK -->
-	<tr>
-		<td>{L_BOARD_VERSION}{L_COLON} </td>
-		<td>
-			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
-		</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-	</tr>
-	<!-- ENDIF -->
-	</tbody>
-	</table>
+		<div class="lside">
+			<table class="table2 zebra-table no-header" data-no-responsive-header="true">
+				<thead>
+					<tr>
+						<th>{{ lang('STATISTIC') }}</th>
+						<th>{{ lang('VALUE') }}</th>
+					</tr>
+				</thead>
+
+				<tbody>
+					<tr>
+						<td class="tabled">{{ lang('BOARD_STARTED') ~ lang('COLON') }}</td>
+						<td class="tabled"><strong>{{ START_DATE }}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{{ lang('AVATAR_DIR_SIZE') ~ lang('COLON') }}</td>
+						<td class="tabled"><strong>{{ AVATAR_DIR_SIZE }}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{{ lang('DATABASE_SIZE') ~ lang('COLON') }}</td>
+						<td class="tabled"><strong>{{ DBSIZE }}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{{ lang('UPLOAD_DIR_SIZE') ~ lang('COLON') }}</td>
+						<td class="tabled"><strong>{{ UPLOAD_DIR_SIZE }}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{{ lang('DATABASE_SERVER_INFO') ~ lang('COLON') }}</td>
+						<td class="tabled"><strong>{{ DATABASE_INFO }}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{{ lang('GZIP_COMPRESSION') ~ lang('COLON') }}</td>
+						<td class="tabled"><strong>{{ GZIP_COMPRESSION }}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{{ lang('PHP_VERSION') ~ lang('COLON') }}</td>
+						<td class="tabled"><strong>{{ PHP_VERSION_INFO }}</strong></td>
+					</tr>
+					<tr>
+					{% if S_TOTAL_ORPHAN %}
+						<td class="tabled">{{ lang('NUMBER_ORPHAN') ~ lang('COLON') }}</td>
+						<td class="tabled">
+						{% if TOTAL_ORPHAN > 0 %}
+							<a href="{{ U_ATTACH_ORPHAN }}" title="{{ lang('MORE_INFORMATION') }}"><strong>{{ TOTAL_ORPHAN }}</strong></a>
+						{% else %}
+							<strong>{{ TOTAL_ORPHAN }}</strong>
+						{% endif %}
+						</td>
+						{% else %}
+					{% endif %}
+					</tr>
+					{% if S_VERSIONCHECK %}
+					<tr>
+						<td class="tabled">{{ lang('BOARD_VERSION') ~ lang('COLON') }}</td>
+						<td class="tabled">
+							<strong><a href="{{ U_VERSIONCHECK }}" {% if S_VERSION_UP_TO_DATE %}style="color: #228822;" {% elseif not S_VERSIONCHECK_FAIL %}style="color: #BC2A4D;" {% endif %}title="{{ lang('MORE_INFORMATION') }}">{{ BOARD_VERSION }}</a></strong> [&nbsp;<a href="{{ U_VERSIONCHECK_FORCE }}">{{ lang('VERSIONCHECK_FORCE_UPDATE') }}</a>&nbsp;]
+						</td>
+					</tr>
+					{% endif %}
+				</tbody>
+			</table>
+
+			<table class="table2 zebra-table no-header" data-no-responsive-header="true">
+				<thead>
+					<tr>
+						<th>{{ lang('STATISTIC') }}</th>
+						<th>{{ lang('VALUE') }}</th>
+					</tr>
+				</thead>
+
+				<tbody>
+					<tr>
+						<td class="tabled">{{ lang('NUMBER_POSTS') ~ lang('COLON') }}</td>
+						<td class="tabled"><strong>{{ TOTAL_POSTS }}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{{ lang('POSTS_PER_DAY') ~ lang('COLON') }}</td>
+						<td class="tabled"><strong>{{ POSTS_PER_DAY }}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{{ lang('NUMBER_TOPICS') ~ lang('COLON') }}</td>
+						<td class="tabled"><strong>{{ TOTAL_TOPICS }}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{{ lang('TOPICS_PER_DAY') ~ lang('COLON') }}</td>
+						<td class="tabled"><strong>{{ TOPICS_PER_DAY }}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{{ lang('NUMBER_USERS') ~ lang('COLON') }}</td>
+						<td class="tabled"><strong>{{ TOTAL_USERS }}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{{ lang('USERS_PER_DAY') ~ lang('COLON') }}</td>
+						<td class="tabled"><strong>{{ USERS_PER_DAY }}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{{ lang('NUMBER_FILES') ~ lang('COLON') }}</td>
+						<td class="tabled"><strong>{{ TOTAL_FILES }}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{{ lang('FILES_PER_DAY') ~ lang('COLON') }}</td>
+						<td class="tabled"><strong>{{ FILES_PER_DAY }}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">&nbsp;</td>
+						<td class="tabled">&nbsp;</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
 
 	<!-- IF S_ACTION_OPTIONS -->
 		<fieldset>
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index cfa804090f..c09294beaf 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -33,7 +33,7 @@
 <!-- IF L_EXPLAIN --><p>{L_EXPLAIN}</p><!-- ENDIF -->
 
 <fieldset class="quick">
-	<span class="small"><a href="https://www.phpbb.com/go/customise/styles/3.2" target="_blank">{L_BROWSE_STYLES_DATABASE}</a></span>
+	<span class="small"><a href="https://www.phpbb.com/go/customise/styles/3.3" target="_blank">{L_BROWSE_STYLES_DATABASE}</a></span>
 </fieldset>
 
 <form id="acp_styles" method="post" action="{U_ACTION}">
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index 180c24c96d..40f0fc25d9 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -26,7 +26,7 @@
 		<!-- INCLUDE acp_posting_buttons.html -->
 
 		<dl class="responsive-columns">
-			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
+			<dt style="width: 90px;" id="color_palette_placeholder" data-color-palette="v" data-height="12" data-width="15" data-bbcode="true">
 			</dt>
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{SIGNATURE}</textarea></dd>
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 7cf6c22236..3243d0eb24 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1,4 +1,4 @@
-/*  phpBB 3.2 Admin Style Sheet
+/*  phpBB 3.3 Admin Style Sheet
 	------------------------------------------------------------------------
 	Original author:	subBlue ( http://www.subblue.com/ )
 	Copyright (c) phpBB Limited <https://www.phpbb.com>
@@ -191,7 +191,7 @@ li {
 
 #page-header {
 	text-align: right;
-	background: url("../images/phpbb_logo.png") top left no-repeat;
+	background: url("../images/phpbb_logo.svg") top left no-repeat;
 	height: 54px;
 	font-size: 0.85em;
 	margin-bottom: 10px;
@@ -199,7 +199,7 @@ li {
 
 .rtl #page-header {
 	text-align: left;
-	background: url("../images/phpbb_logo.png") top right no-repeat;
+	background: url("../images/phpbb_logo.svg") top right no-repeat;
 }
 
 #page-header h1 {
@@ -723,9 +723,25 @@ td {
 }
 
 .table1 {
+	clear: both;
+	border-spacing: 1px;
 	border-collapse: separate;
+}
+
+.table2 {
+	display: inline-block;
 	border-spacing: 1px;
-	clear: both;
+	border-collapse: separate;
+}
+
+.lside {
+	display: flex;
+	align-items: stretch;
+	width: 100%;
+}
+
+.tabled {
+	width: 1%;
 }
 
 dt#color_palette_placeholder table {
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index 551c78a4a3..5fdd07356c 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -229,6 +229,64 @@ function parse_document(container)
 }
 
 /**
+ * Extension actions helper functions
+ */
+function move_to_enabled(element)
+{
+	var disabled_header = document.querySelector('#ext_disabled_header');
+	disabled_header.parentNode.insertBefore(element, disabled_header);
+	element.classList.remove('ext_disabled');
+	element.classList.add('ext_enabled');
+}
+function move_to_disabled(element)
+{
+	var table_body = document.querySelector('#ext_disabled_header').parentNode;
+	table_body.appendChild(element);
+	element.classList.remove('ext_enabled');
+	element.classList.add('ext_disabled');
+}
+function set_actions(container, actions) {
+	container.innerHTML = '';
+	for (var i = 0; i < actions.length; i++) {
+		var a = document.createElement('a');
+		a.href = actions[i].U_ACTION.split('&amp;').join('&'); // replace all occurances
+		a.title = actions[i].L_ACTION_EXPLAIN;
+		if (actions[i].COLOR) {
+			a.style = actions[i].COLOR;
+		}
+		a.innerHTML = actions[i].L_ACTION;
+		// ajaxify this action as well
+		phpbb.ajaxify({
+			selector: a,
+			refresh: true,
+			callback: actions[i].ACTION_AJAX
+		});
+
+		container.appendChild(a);
+
+		if (i < actions.length - 1) {
+			container.innerHTML += '&nbsp;|&nbsp;';
+		}
+	}
+}
+function show_enabled_header() {
+	document.querySelector('#ext_enabled_header').classList.remove('hidden');
+}
+function show_disabled_header() {
+	document.querySelector('#ext_disabled_header').classList.remove('hidden');
+}
+function hide_disabled_header_if_empty() {
+	if (!document.querySelector('.ext_disabled')) {
+		document.querySelector('#ext_disabled_header').classList.add('hidden');
+	}
+}
+function hide_enabled_header_if_empty() {
+	if (!document.querySelector('.ext_enabled')) {
+		document.querySelector('#ext_enabled_header').classList.add('hidden');
+	}
+}
+
+/**
 * Run onload functions
 */
 (function($) {
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 895bb056e5..39b63e4696 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -1,4 +1,4 @@
-/* global phpbb */
+/* global phpbb, statsData */
 
 (function($) {  // Avoid conflicts with other libraries
 
@@ -74,7 +74,7 @@ phpbb.prepareSendStats = function () {
 			var $sendStatisticsSuccess = $('<input />', {
 				type: 'hidden',
 				name: 'send_statistics_response',
-				value: res
+				value: JSON.stringify(res)
 			});
 			$sendStatisticsSuccess.appendTo('p.submit-buttons');
 
@@ -87,7 +87,7 @@ phpbb.prepareSendStats = function () {
 		$.ajax({
 			url: $this.attr('data-ajax-action').replace('&amp;', '&'),
 			type: 'POST',
-			data: 'systemdata=' + encodeURIComponent($this.find('input[name=systemdata]').val()),
+			data: statsData,
 			success: returnHandler,
 			error: errorHandler,
 			cache: false
@@ -158,6 +158,34 @@ phpbb.addAjaxCallback('row_delete', function(res) {
 });
 
 /**
+ * Callbacks for extension actions
+ */
+phpbb.addAjaxCallback('ext_enable', function(res) {
+	if (res.EXT_ENABLE_SUCCESS) {
+		move_to_enabled(this.parentNode.parentNode);
+		set_actions(this.parentNode, res.ACTIONS);
+		show_enabled_header();
+		hide_disabled_header_if_empty();
+	}
+});
+phpbb.addAjaxCallback('ext_delete_data', function(res) {
+	if (res.EXT_DELETE_DATA_SUCCESS) {
+		move_to_disabled(this.parentNode.parentNode);
+		set_actions(this.parentNode, res.ACTIONS);
+		show_disabled_header();
+		hide_enabled_header_if_empty();
+	}
+});
+phpbb.addAjaxCallback('ext_disable', function(res) {
+	if (res.EXT_DISABLE_SUCCESS) {
+		move_to_disabled(this.parentNode.parentNode);
+		set_actions(this.parentNode, res.ACTIONS);
+		show_disabled_header();
+		hide_enabled_header_if_empty();
+	}
+});
+
+/**
  * Handler for submitting permissions form in chunks
  * This call will submit permissions forms in chunks of 5 fieldsets.
  */
diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html
index 3f61c76cb1..563bd98835 100644
--- a/phpBB/adm/style/captcha_recaptcha.html
+++ b/phpBB/adm/style/captcha_recaptcha.html
@@ -5,8 +5,9 @@
 		<div>{L_RECAPTCHA_NOSCRIPT}</div>
 	</noscript>
 
+		{L_RECAPTCHA_INVISIBLE}
 		<script src="{RECAPTCHA_SERVER}.js?hl={LA_RECAPTCHA_LANG}" async defer></script>
-		<div class="g-recaptcha" data-sitekey="{RECAPTCHA_PUBKEY}"></div>
+		<div class="g-recaptcha" data-sitekey="{RECAPTCHA_PUBKEY}" data-size="invisible"></div>
 	</dd>
 	</dl>
 <!-- ELSE -->
diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html
index 8b3b04d8a5..81a85d1b01 100644
--- a/phpBB/adm/style/installer_footer.html
+++ b/phpBB/adm/style/installer_footer.html
@@ -23,7 +23,7 @@ installLang = {
 </script>
 
 <script src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js">\x3C/script>');</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.4.1.min.js">\x3C/script>');</script><!-- ENDIF -->
 <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS admin.js -->
 {$SCRIPTS}
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 3ab633e04b..7a5b620f48 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -34,7 +34,7 @@
 </div>
 
 <script src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.4.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
 <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
 <!-- INCLUDEJS admin.js -->
diff --git a/phpBB/adm/style/permission_forum_copy.html b/phpBB/adm/style/permission_forum_copy.html
index b1539aff12..0560648baf 100644
--- a/phpBB/adm/style/permission_forum_copy.html
+++ b/phpBB/adm/style/permission_forum_copy.html
@@ -4,7 +4,7 @@
 
 	<h1>{L_ACP_FORUM_PERMISSIONS_COPY}</h1>
 
-	{L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN}
+	<p>{L_ACP_FORUM_PERMISSIONS_COPY_EXPLAIN}</p>
 
 	<form id="forum_perm_copy" method="post" action="{U_ACTION}">
 
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index 4b54b83373..dd9dc90fd0 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -17,7 +17,7 @@
 </div>
 
 <script src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.4.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
 <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 
 <!-- EVENT acp_simple_footer_after -->
author	Maat <maat-pub@mageia.biz>	2020-05-09 01:15:08 +0200
committer	Maat <maat-pub@mageia.biz>	2020-05-09 01:15:08 +0200
commit	6985226b17e8a0ef0a720bf1d12fe0c216e13dab (patch)
tree	116d2565ac02c40abe0548863c6badf8ec3e1d1e /phpBB/adm
parent	8ea437e30605e0f66b5220bf904a61d7c1d11ddd (diff)
parent	8d00784dfe2c8bcb10843ff70b4cfa998d703285 (diff)
download	forums-master.tar forums-master.tar.gz forums-master.tar.bz2 forums-master.tar.xz forums-master.zip