Merge branch 'master' of https://github.com/friendica/friendica

Conflicts:
	include/config.php
	update.php

1 files changed, 43 insertions, 26 deletions

diff --git a/view/theme/dispy-dark/icons.svg b/view/theme/dispy-dark/icons.svg
index 10f8cc667..2c4b3abd3 100644
--- a/view/theme/dispy-dark/icons.svg
+++ b/view/theme/dispy-dark/icons.svg
@@ -51,9 +51,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.3859292"
-     inkscape:cx="105.02551"
-     inkscape:cy="107.90767"
+     inkscape:zoom="1.9403009"
+     inkscape:cx="95.950174"
+     inkscape:cy="115.58345"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -63,7 +63,7 @@
      inkscape:window-width="1065"
      inkscape:window-height="742"
      inkscape:window-x="40"
-     inkscape:window-y="61"
+     inkscape:window-y="50"
      inkscape:window-maximized="0"
      width="0px"
      height="0px"
@@ -330,7 +330,7 @@
        sodipodi:cy="33.612183"
        sodipodi:rx="7.3214288"
        sodipodi:ry="7.3214288"
-       d="m 492.49999,33.612183 a 7.3214288,7.3214288 0 1 1 -14.64286,0 7.3214288,7.3214288 0 1 1 14.64286,0 z"
+       d="m 492.49999,33.612183 c 0,4.043513 -3.27792,7.321428 -7.32143,7.321428 -4.04352,0 -7.32143,-3.277915 -7.32143,-7.321428 0,-4.043514 3.27791,-7.321429 7.32143,-7.321429 4.04351,0 7.32143,3.277915 7.32143,7.321429 z"
        transform="matrix(0.43114968,0,0,0.43114968,-201.51175,889.48158)" />
     <rect
        style="fill:#2e2f2e;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
@@ -380,7 +380,7 @@
        transform="matrix(0.43114968,0,0,0.43114968,-179.41936,889.63556)" />
     <path
        transform="matrix(0.43114968,0,0,0.43114968,-179.51175,889.48158)"
-       d="m 492.49999,33.612183 a 7.3214288,7.3214288 0 1 1 -14.64286,0 7.3214288,7.3214288 0 1 1 14.64286,0 z"
+       d="m 492.49999,33.612183 c 0,4.043513 -3.27792,7.321428 -7.32143,7.321428 -4.04352,0 -7.32143,-3.277915 -7.32143,-7.321428 0,-4.043514 3.27791,-7.321429 7.32143,-7.321429 4.04351,0 7.32143,3.277915 7.32143,7.321429 z"
        sodipodi:ry="7.3214288"
        sodipodi:rx="7.3214288"
        sodipodi:cy="33.612183"
@@ -450,7 +450,7 @@
        id="path4110" />
     <path
        transform="matrix(1.2829201,1.9081591,-1.9081591,1.2829201,-436.65386,-211.76762)"
-       d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+       d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
        sodipodi:ry="0.88388348"
        sodipodi:rx="0.88388348"
        sodipodi:cy="21.754047"
@@ -466,11 +466,11 @@
        sodipodi:cy="21.754047"
        sodipodi:rx="0.88388348"
        sodipodi:ry="0.88388348"
-       d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+       d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
        transform="matrix(0.96219008,1.4311194,-1.4311194,0.96219008,-261.29289,65.614849)" />
     <path
        transform="matrix(1.0080086,1.4992679,-1.4992679,1.0080086,-291.03317,15.446827)"
-       d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+       d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
        sodipodi:ry="0.88388348"
        sodipodi:rx="0.88388348"
        sodipodi:cy="21.754047"
@@ -492,7 +492,7 @@
        sodipodi:cy="21.754047"
        sodipodi:rx="0.88388348"
        sodipodi:ry="0.88388348"
-       d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+       d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
        transform="matrix(1.0996458,1.635565,-1.635565,1.0996458,-346.37171,-55.312424)" />
     <path
        inkscape:connector-curvature="0"
@@ -510,7 +510,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <rect
-       style="fill:#999999;stroke:#ececec;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#666666;stroke:#ececec;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="rect4387-8"
        width="14.5"
        height="9"
@@ -523,7 +523,7 @@
        inkscape:export-ydpi="90" />
     <path
        sodipodi:type="arc"
-       style="fill:#333333;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4391-3"
        sodipodi:cx="408.8125"
        sodipodi:cy="220.26843"
@@ -1006,7 +1006,7 @@
        ry="0.42804927"
        transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,294.0656)" />
     <rect
-       style="fill:#333333;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        id="rect4290"
        width="3.5355339"
        height="1.8561553"
@@ -1047,7 +1047,7 @@
          sodipodi:cy="220.62782"
          sodipodi:rx="7.4246211"
          sodipodi:ry="7.4246211"
-         d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
+         d="m 292.21188,220.62782 c 0,4.10051 -3.32411,7.42462 -7.42462,7.42462 -4.1005,0 -7.42462,-3.32411 -7.42462,-7.42462 0,-4.1005 3.32412,-7.42462 7.42462,-7.42462 4.10051,0 7.42462,3.32412 7.42462,7.42462 z"
          transform="translate(-204.73743,661.76269)" />
       <path
          inkscape:export-ydpi="90"
@@ -1559,7 +1559,7 @@
        sodipodi:cy="143.46553"
        sodipodi:rx="5.5219707"
        sodipodi:ry="5.2590199"
-       d="m 51.275442,143.46553 a 5.5219707,5.2590199 0 0 1 11.043942,0 l -5.521971,0 z"
+       d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
        transform="matrix(1.2380952,0,0,1.675,-15.523193,759.33575)"
        sodipodi:start="3.1415927"
        sodipodi:end="6.2831853" />
@@ -1567,7 +1567,7 @@
        sodipodi:end="6.2831853"
        sodipodi:start="3.1415927"
        transform="matrix(0.4523809,0,0,0.775,29.234821,888.45473)"
-       d="m 51.275442,143.46553 a 5.5219707,5.2590199 0 0 1 11.043942,0 l -5.521971,0 z"
+       d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
        sodipodi:ry="5.2590199"
        sodipodi:rx="5.5219707"
        sodipodi:cy="143.46553"
@@ -1579,7 +1579,7 @@
        sodipodi:end="6.2831853"
        sodipodi:start="3.1415927"
        transform="matrix(1.2380952,0,0,1.675,6.476807,759.33575)"
-       d="m 51.275442,143.46553 a 5.5219707,5.2590199 0 0 1 11.043942,0 l -5.521971,0 z"
+       d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
        sodipodi:ry="5.2590199"
        sodipodi:rx="5.5219707"
        sodipodi:cy="143.46553"
@@ -1595,7 +1595,7 @@
        sodipodi:cy="143.46553"
        sodipodi:rx="5.5219707"
        sodipodi:ry="5.2590199"
-       d="m 51.275442,143.46553 a 5.5219707,5.2590199 0 0 1 11.043942,0 l -5.521971,0 z"
+       d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
        transform="matrix(0.4523809,0,0,0.775,51.234821,888.45473)"
        sodipodi:start="3.1415927"
        sodipodi:end="6.2831853" />
@@ -1655,7 +1655,7 @@
        sodipodi:cy="194.45924"
        sodipodi:rx="2.0660436"
        sodipodi:ry="1.5964882"
-       d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+       d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
        transform="matrix(0.93050058,0,0,0.90640134,0.75846434,870.02825)" />
     <use
        x="0"
@@ -1675,7 +1675,7 @@
        height="200" />
     <path
        transform="matrix(0.93050058,0,0,0.90640134,6.0478791,864.58985)"
-       d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+       d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
        sodipodi:ry="1.5964882"
        sodipodi:rx="2.0660436"
        sodipodi:cy="194.45924"
@@ -1727,7 +1727,7 @@
        sodipodi:nodetypes="cc" />
     <path
        transform="matrix(0.93050058,0,0,0.90640134,22.758464,870.02825)"
-       d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+       d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
        sodipodi:ry="1.5964882"
        sodipodi:rx="2.0660436"
        sodipodi:cy="194.45924"
@@ -1761,7 +1761,7 @@
        sodipodi:cy="194.45924"
        sodipodi:rx="2.0660436"
        sodipodi:ry="1.5964882"
-       d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+       d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
        transform="matrix(0.93050058,0,0,0.90640134,28.047879,864.58985)" />
     <path
        transform="matrix(0.93050058,0,0,0.90640134,22.758464,870.02825)"
@@ -1992,11 +1992,11 @@
        sodipodi:cy="21.754047"
        sodipodi:rx="0.88388348"
        sodipodi:ry="0.88388348"
-       d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+       d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
        transform="matrix(1.2829201,1.9081591,-1.9081591,1.2829201,-621.38007,-53.76762)" />
     <path
        transform="matrix(0.96219008,1.4311194,-1.4311194,0.96219008,-446.0191,223.61485)"
-       d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+       d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
        sodipodi:ry="0.88388348"
        sodipodi:rx="0.88388348"
        sodipodi:cy="21.754047"
@@ -2012,7 +2012,7 @@
        sodipodi:cy="21.754047"
        sodipodi:rx="0.88388348"
        sodipodi:ry="0.88388348"
-       d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+       d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
        transform="matrix(1.0080086,1.4992679,-1.4992679,1.0080086,-475.75938,173.44683)" />
     <path
        style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -2022,7 +2022,7 @@
        transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-187.51596,643.71067)" />
     <path
        transform="matrix(1.0996458,1.635565,-1.635565,1.0996458,-531.09792,102.68758)"
-       d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+       d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
        sodipodi:ry="0.88388348"
        sodipodi:rx="0.88388348"
        sodipodi:cy="21.754047"
@@ -2092,5 +2092,22 @@
          inkscape:connector-curvature="0"
          transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-132.78975,635.71067)" />
     </g>
+    <g
+       id="g4823">
+      <path
+         style="fill:#e6e6e6"
+         d="m 12,16 -12.00914477,0 0,-13.6988082 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 z"
+         id="path4821"
+         inkscape:connector-curvature="0"
+         transform="translate(232.52235,913.88168)"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         sodipodi:nodetypes="cccccccccccccszscc"
+         transform="translate(232.52235,913.88168)"
+         inkscape:connector-curvature="0"
+         id="path4819"
+         d="m -0.00914477,2.3011918 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 L 13.73679,14.984131 13.640962,1.0093271 3.4856425,0.91349949 1.1272469,2.7572384 12,2.7572384 12,16 -0.00914477,16 z M 8.2958276,12.045759 c -1.8631354,-1.086398 0.045759,-2.6807932 0.045759,-3.6707932 0,-0.99 -0.6423808,-2.2112618 -2.2457592,-2.1833105 C 4.4924492,6.2196066 3.8500685,7.0875 3.8500685,8.4166667 c 0,1.3291666 2.1768916,1.6857063 -0.1958961,3.6876733 z"
+         style="fill:#1a1a1a" />
+    </g>
   </g>
 </svg>