Skip to content
Snippets Groups Projects
Commit 001c0bf6 authored by Marcel Achtert's avatar Marcel Achtert
Browse files

Merge branch 'dev' into 'main' 

update federation map

See merge request matrix.tu-dresden.de/dokumentation!47
parents 8cdf9a81 5abee6c5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
content/first-steps/_index.en.md
+ 16
− 5
View file @ 001c0bf6
...@@ -128,20 +128,30 @@ However, the federation with the Matrix servers of other scientific or civil soc ...@@ -128,20 +128,30 @@ However, the federation with the Matrix servers of other scientific or civil soc
* [Uni Heidelberg](https://matrix-im.uni-heidelberg.de/) incl. [Docu](https://www.urz.uni-heidelberg.de/en/heichat) * [Uni Heidelberg](https://matrix-im.uni-heidelberg.de/) incl. [Docu](https://www.urz.uni-heidelberg.de/en/heichat)
* [Karlsruher Institut für Technologie (KIT)](https://dsn.tm.kit.edu) * [Karlsruher Institut für Technologie (KIT)](https://matrix.kit.edu/)
* [Uni Augsburg](https://element.physik.uni-augsburg.de/#/welcome) incl. [Docu](https://www.uni-augsburg.de/de/fakultaet/mntf/physik/facilities/itservices/elequick/) * [Uni Augsburg](https://element.physik.uni-augsburg.de/#/welcome) incl. [Docu](https://www.uni-augsburg.de/de/fakultaet/mntf/physik/facilities/itservices/elequick/)
* [Uni Stuttgart](https://chat.stuvus.de/) incl. [Docu](https://wiki.stuvus.uni-stuttgart.de/display/ITKB/Matrix+Messenger) * [Uni Stuttgart](https://chat.stuvus.de/) incl. [Docu](https://wiki.stuvus.uni-stuttgart.de/display/ITKB/Matrix+Messenger)
* [Hochschule Bremerhaven](https://matrix.hs-bremerhaven.de/)
Explizit für Studierende: * [TU Darmstadt](https://element.matrix.tu-darmstadt.de)
* [StudiChat](https://chat.studichat.de/#/welcome) (für alle) * [Philipps-Universität Marburg](https://matrix.uni-marburg.de/)
* [Fachschaften](https://matrix.fachschaften.org/) (für Fachschaften) * [TU Braunschweig](https://chat.tu-bs.de/)
Weitere europäische Hochschulen: * [Hochschule Furtwangen](https://matrix.hs-furtwangen.de/) incl. [Docu](https://howto.hs-furtwangen.de/hfu-chat/)
Explicitly for students:
* [StudiChat](https://chat.studichat.de/#/welcome) (for all)
* [Fachschaften](https://matrix.fachschaften.org/) (for student representatives)
Other European universities:
* [ETH Zürich](https://element.phys.ethz.ch/) incl. [Docu](https://readme.phys.ethz.ch/chat/) * [ETH Zürich](https://element.phys.ethz.ch/) incl. [Docu](https://readme.phys.ethz.ch/chat/)
...@@ -149,6 +159,7 @@ Weitere europäische Hochschulen: ...@@ -149,6 +159,7 @@ Weitere europäische Hochschulen:
* [University for Business and Technology, Kosovo](https://ubt-uni.net/) * [University for Business and Technology, Kosovo](https://ubt-uni.net/)
* [Karl-Franzens-Universität Graz](https://chat.uni-graz.at/)
<object data="/images/federation_map.svg" type="image/svg+xml" style="width: 600px; max-width: 100%"></object> <object data="/images/federation_map.svg" type="image/svg+xml" style="width: 600px; max-width: 100%"></object>
......
content/first-steps/_index.md
+ 13
− 1
View file @ 001c0bf6
...@@ -127,12 +127,22 @@ Die Förderation mit den Matrix-Servern anderer wissenschaftlicher oder zivilges ...@@ -127,12 +127,22 @@ Die Förderation mit den Matrix-Servern anderer wissenschaftlicher oder zivilges
* [Uni Heidelberg](https://matrix-im.uni-heidelberg.de/) inkl. [Doku](https://www.urz.uni-heidelberg.de/en/heichat) * [Uni Heidelberg](https://matrix-im.uni-heidelberg.de/) inkl. [Doku](https://www.urz.uni-heidelberg.de/en/heichat)
* [Karlsruher Institut für Technologie (KIT)](https://dsn.tm.kit.edu) * [Karlsruher Institut für Technologie (KIT)](https://matrix.kit.edu/)
* [Uni Augsburg](https://element.physik.uni-augsburg.de/#/welcome) inkl. [Doku](https://www.uni-augsburg.de/de/fakultaet/mntf/physik/facilities/itservices/elequick/) * [Uni Augsburg](https://element.physik.uni-augsburg.de/#/welcome) inkl. [Doku](https://www.uni-augsburg.de/de/fakultaet/mntf/physik/facilities/itservices/elequick/)
* [Uni Stuttgart](https://chat.stuvus.de/) inkl. [Doku](https://wiki.stuvus.uni-stuttgart.de/display/ITKB/Matrix+Messenger) * [Uni Stuttgart](https://chat.stuvus.de/) inkl. [Doku](https://wiki.stuvus.uni-stuttgart.de/display/ITKB/Matrix+Messenger)
* [Hochschule Bremerhaven](https://matrix.hs-bremerhaven.de/)
* [TU Darmstadt](https://element.matrix.tu-darmstadt.de)
* [Philipps-Universität Marburg](https://matrix.uni-marburg.de/)
* [TU Braunschweig](https://chat.tu-bs.de/)
* [Hochschule Furtwangen](https://matrix.hs-furtwangen.de/) inkl. [Doku](https://howto.hs-furtwangen.de/hfu-chat/)
Explizit für Studierende: Explizit für Studierende:
...@@ -148,6 +158,8 @@ Weitere europäische Hochschulen: ...@@ -148,6 +158,8 @@ Weitere europäische Hochschulen:
* [University for Business and Technology, Kosovo](https://ubt-uni.net/) * [University for Business and Technology, Kosovo](https://ubt-uni.net/)
* [Karl-Franzens-Universität Graz](https://chat.uni-graz.at/)
Kartendarstellung der Hochschulen und Universitäten mit einem Matrix-Dienst: Kartendarstellung der Hochschulen und Universitäten mit einem Matrix-Dienst:
<object data="/images/federation_map.svg" type="image/svg+xml" style="width: 600px; max-width: 100%"></object> <object data="/images/federation_map.svg" type="image/svg+xml" style="width: 600px; max-width: 100%"></object>
......
static/images/federation_map.svg
+ 95
− 18
View file @ 001c0bf6
...@@ -24,16 +24,16 @@ ...@@ -24,16 +24,16 @@
guidetolerance="10" guidetolerance="10"
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:window-width="1717" inkscape:window-width="1920"
inkscape:window-height="1159" inkscape:window-height="946"
id="namedview1381" id="namedview1381"
showgrid="false" showgrid="false"
inkscape:zoom="1.5397627" inkscape:zoom="1.0887766"
inkscape:cx="253.93523" inkscape:cx="477.14104"
inkscape:cy="348.10559" inkscape:cy="851.87356"
inkscape:window-x="26" inkscape:window-x="0"
inkscape:window-y="23" inkscape:window-y="0"
inkscape:window-maximized="0" inkscape:window-maximized="1"
inkscape:current-layer="svg4589" inkscape:current-layer="svg4589"
inkscape:document-rotation="0" inkscape:document-rotation="0"
inkscape:pagecheckerboard="0" /><metadata inkscape:pagecheckerboard="0" /><metadata
...@@ -884,6 +884,16 @@ ...@@ -884,6 +884,16 @@
id="tspan14969" id="tspan14969"
x="6372.8604" x="6372.8604"
y="10539.353" y="10539.353"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10">TU München</tspan></text><text
xml:space="preserve"
x="6372.8604"
y="10539.353"
id="text16836"
class="instance_name"
style=""><tspan
id="tspan16834"
x="6372.8604"
y="10539.353"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10">TU München</tspan></text><g style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10">TU München</tspan></text><g
id="m_uni_hd" id="m_uni_hd"
class="matrix_icon" class="matrix_icon"
...@@ -1222,6 +1232,39 @@ ...@@ -1222,6 +1232,39 @@
x="3240.7019" x="3240.7019"
y="11675.853" y="11675.853"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10">ETH Zürich</tspan></text><g style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10">ETH Zürich</tspan></text><g
id="m_hs_furtwangen"
class="matrix_icon"
transform="translate(2508.7211,10376.299)"
style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"><path
d="m 60.875,59.711 v 321.386 h 23.13 v 7.711 H 52 V 52 h 32 v 7.71 z"
id="path14411-6" /><path
d="m 150,161.595 v 16.264 h 0.463 c 4.338,-6.191 9.563,-11 15.684,-14.406 6.117,-3.402 13.129,-5.11 21.027,-5.11 7.588,0 14.521,1.475 20.793,4.415 6.274,2.945 11.038,8.131 14.291,15.567 3.56,-5.265 8.4,-9.913 14.521,-13.94 6.117,-4.025 13.358,-6.042 21.724,-6.042 6.351,0 12.234,0.776 17.66,2.325 5.418,1.549 10.065,4.027 13.938,7.434 3.869,3.41 6.889,7.863 9.062,13.357 2.167,5.504 3.253,12.122 3.253,19.869 v 80.385 H 269.41 v -68.074 c 0,-4.025 -0.154,-7.82 -0.465,-11.385 -0.313,-3.56 -1.161,-6.656 -2.555,-9.293 -1.395,-2.631 -3.45,-4.724 -6.157,-6.274 -2.711,-1.543 -6.391,-2.322 -11.037,-2.322 -4.646,0 -8.403,0.896 -11.269,2.671 -2.868,1.784 -5.112,4.109 -6.737,6.971 -1.626,2.869 -2.711,6.12 -3.252,9.762 -0.545,3.638 -0.814,7.318 -0.814,11.035 v 66.91 h -33 v -67.375 c 0,-3.562 -0.081,-7.087 -0.23,-10.57 -0.158,-3.487 -0.814,-6.7 -1.978,-9.645 -1.162,-2.94 -3.1,-5.304 -5.809,-7.088 -2.711,-1.775 -6.7,-2.671 -11.965,-2.671 -1.551,0 -3.603,0.349 -6.156,1.048 -2.556,0.697 -5.036,2.016 -7.435,3.949 -2.404,1.938 -4.454,4.726 -6.158,8.363 -1.705,3.642 -2.556,8.402 -2.556,14.287 v 69.701 H 118.856 V 161.595 Z"
id="path14413-7" /><path
d="M 360.72381,381.097 V 59.711 h -23.13002 v -7.71 h 32.00002 v 336.807 h -32.00002 v -7.711 z"
id="path14415-5" /></g><a
href="https://matrix.hs-furtwangen.de/"
target="_blank"
rel="noopener noreferrer"
class="matrix_frame"
id="a240"
style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"
transform="translate(-296.28684,-1015.1283)"><rect
style="opacity:0.992867;fill:#000000;fill-opacity:0;stroke:none;stroke-width:10.0157;stroke-linecap:round;stop-color:#000000"
id="f_hs_furtwangen"
width="359.55981"
height="378.63657"
x="2836.0249"
y="11422.514" /></a><text
xml:space="preserve"
x="3040.7019"
y="10675.853"
id="t_hs_furtwangen"
class="instance_name"
style=""><tspan
id="tspan2015"
x="2970.7019"
y="10675.853"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10">Hochschule Furtwangen</tspan></text><g
id="m_hs_gr" id="m_hs_gr"
class="matrix_icon" class="matrix_icon"
transform="translate(9240.2875,5738.8715)"><path transform="translate(9240.2875,5738.8715)"><path
...@@ -1288,7 +1331,7 @@ ...@@ -1288,7 +1331,7 @@
id="tspan15034">TU Chemnitz</tspan></text><g id="tspan15034">TU Chemnitz</tspan></text><g
id="m_kosovo" id="m_kosovo"
class="matrix_icon" class="matrix_icon"
transform="translate(8318.6502,10986.797)"><path transform="translate(8625.2266,11344.52)"><path
d="m 60.875,59.711 v 321.386 h 23.13 v 7.711 H 52 V 52 h 32 v 7.71 z" d="m 60.875,59.711 v 321.386 h 23.13 v 7.711 H 52 V 52 h 32 v 7.71 z"
id="path14387" /><path id="path14387" /><path
d="m 150,161.595 v 16.264 h 0.463 c 4.338,-6.191 9.563,-11 15.684,-14.406 6.117,-3.402 13.129,-5.11 21.027,-5.11 7.588,0 14.521,1.475 20.793,4.415 6.274,2.945 11.038,8.131 14.291,15.567 3.56,-5.265 8.4,-9.913 14.521,-13.94 6.117,-4.025 13.358,-6.042 21.724,-6.042 6.351,0 12.234,0.776 17.66,2.325 5.418,1.549 10.065,4.027 13.938,7.434 3.869,3.41 6.889,7.863 9.062,13.357 2.167,5.504 3.253,12.122 3.253,19.869 v 80.385 H 269.41 v -68.074 c 0,-4.025 -0.154,-7.82 -0.465,-11.385 -0.313,-3.56 -1.161,-6.656 -2.555,-9.293 -1.395,-2.631 -3.45,-4.724 -6.157,-6.274 -2.711,-1.543 -6.391,-2.322 -11.037,-2.322 -4.646,0 -8.403,0.896 -11.269,2.671 -2.868,1.784 -5.112,4.109 -6.737,6.971 -1.626,2.869 -2.711,6.12 -3.252,9.762 -0.545,3.638 -0.814,7.318 -0.814,11.035 v 66.91 h -33 v -67.375 c 0,-3.562 -0.081,-7.087 -0.23,-10.57 -0.158,-3.487 -0.814,-6.7 -1.978,-9.645 -1.162,-2.94 -3.1,-5.304 -5.809,-7.088 -2.711,-1.775 -6.7,-2.671 -11.965,-2.671 -1.551,0 -3.603,0.349 -6.156,1.048 -2.556,0.697 -5.036,2.016 -7.435,3.949 -2.404,1.938 -4.454,4.726 -6.158,8.363 -1.705,3.642 -2.556,8.402 -2.556,14.287 v 69.701 H 118.856 V 161.595 Z" d="m 150,161.595 v 16.264 h 0.463 c 4.338,-6.191 9.563,-11 15.684,-14.406 6.117,-3.402 13.129,-5.11 21.027,-5.11 7.588,0 14.521,1.475 20.793,4.415 6.274,2.945 11.038,8.131 14.291,15.567 3.56,-5.265 8.4,-9.913 14.521,-13.94 6.117,-4.025 13.358,-6.042 21.724,-6.042 6.351,0 12.234,0.776 17.66,2.325 5.418,1.549 10.065,4.027 13.938,7.434 3.869,3.41 6.889,7.863 9.062,13.357 2.167,5.504 3.253,12.122 3.253,19.869 v 80.385 H 269.41 v -68.074 c 0,-4.025 -0.154,-7.82 -0.465,-11.385 -0.313,-3.56 -1.161,-6.656 -2.555,-9.293 -1.395,-2.631 -3.45,-4.724 -6.157,-6.274 -2.711,-1.543 -6.391,-2.322 -11.037,-2.322 -4.646,0 -8.403,0.896 -11.269,2.671 -2.868,1.784 -5.112,4.109 -6.737,6.971 -1.626,2.869 -2.711,6.12 -3.252,9.762 -0.545,3.638 -0.814,7.318 -0.814,11.035 v 66.91 h -33 v -67.375 c 0,-3.562 -0.081,-7.087 -0.23,-10.57 -0.158,-3.487 -0.814,-6.7 -1.978,-9.645 -1.162,-2.94 -3.1,-5.304 -5.809,-7.088 -2.711,-1.775 -6.7,-2.671 -11.965,-2.671 -1.551,0 -3.603,0.349 -6.156,1.048 -2.556,0.697 -5.036,2.016 -7.435,3.949 -2.404,1.938 -4.454,4.726 -6.158,8.363 -1.705,3.642 -2.556,8.402 -2.556,14.287 v 69.701 H 118.856 V 161.595 Z"
...@@ -1299,7 +1342,8 @@ ...@@ -1299,7 +1342,8 @@
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
class="matrix_frame" class="matrix_frame"
id="a267"><rect id="a267"
transform="translate(300,360)"><rect
style="opacity:0.992867;fill:#000000;fill-opacity:0;stroke:none;stroke-width:10.0157;stroke-linecap:round;stop-color:#000000" style="opacity:0.992867;fill:#000000;fill-opacity:0;stroke:none;stroke-width:10.0157;stroke-linecap:round;stop-color:#000000"
id="f_kosovo" id="f_kosovo"
width="359.55981" width="359.55981"
...@@ -1307,22 +1351,22 @@ ...@@ -1307,22 +1351,22 @@
x="8349.667" x="8349.667"
y="11017.883" /></a><text y="11017.883" /></a><text
xml:space="preserve" xml:space="preserve"
x="8775.2236" x="9075.2236"
y="11151.283" y="11751.283"
id="t_kosovo" id="t_kosovo"
class="instance_name" class="instance_name"
style=""><tspan style=""><tspan
id="tspan1122" id="tspan1122"
x="8775.2236" x="9075.2236"
y="11151.283" y="11751.283"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10">UBT Uni</tspan><tspan style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10">UBT Uni</tspan><tspan
x="8775.2236" x="9075.2236"
y="11418.223" y="11418.223"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10"
id="tspan1124">Kosovo</tspan></text><path id="tspan1124">Kosovo</tspan></text><path
d="m 8191.7319,11262.709 323.6225,323.623" d="m 8026.3051,11304.716 558.4106,462.227"
id="arrow_kosovo" id="arrow_kosovo"
style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Lend)" /><g style="fill:none;stroke:#000000;stroke-width:15.6988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Lend)" /><g
id="m_uni_bn" id="m_uni_bn"
class="matrix_icon" class="matrix_icon"
transform="translate(1159.246,6309.1274)" transform="translate(1159.246,6309.1274)"
...@@ -1904,4 +1948,37 @@ ...@@ -1904,4 +1948,37 @@
id="tspan477" id="tspan477"
x="3500" x="3500"
y="6560" y="6560"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10">Philipps-Universität Marburg</tspan></text></svg> style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10">Philipps-Universität Marburg</tspan></text><g
id="m_uni_graz"
class="matrix_icon"
transform="translate(8148.2117,10932.129)"
style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"><path
d="m 60.875,59.711 v 321.386 h 23.13 v 7.711 H 52 V 52 h 32 v 7.71 z"
id="path14325-6" /><path
d="m 150,161.595 v 16.264 h 0.463 c 4.338,-6.191 9.563,-11 15.684,-14.406 6.117,-3.402 13.129,-5.11 21.027,-5.11 7.588,0 14.521,1.475 20.793,4.415 6.274,2.945 11.038,8.131 14.291,15.567 3.56,-5.265 8.4,-9.913 14.521,-13.94 6.117,-4.025 13.358,-6.042 21.724,-6.042 6.351,0 12.234,0.776 17.66,2.325 5.418,1.549 10.065,4.027 13.938,7.434 3.869,3.41 6.889,7.863 9.062,13.357 2.167,5.504 3.253,12.122 3.253,19.869 v 80.385 H 269.41 v -68.074 c 0,-4.025 -0.154,-7.82 -0.465,-11.385 -0.313,-3.56 -1.161,-6.656 -2.555,-9.293 -1.395,-2.631 -3.45,-4.724 -6.157,-6.274 -2.711,-1.543 -6.391,-2.322 -11.037,-2.322 -4.646,0 -8.403,0.896 -11.269,2.671 -2.868,1.784 -5.112,4.109 -6.737,6.971 -1.626,2.869 -2.711,6.12 -3.252,9.762 -0.545,3.638 -0.814,7.318 -0.814,11.035 v 66.91 h -33 v -67.375 c 0,-3.562 -0.081,-7.087 -0.23,-10.57 -0.158,-3.487 -0.814,-6.7 -1.978,-9.645 -1.162,-2.94 -3.1,-5.304 -5.809,-7.088 -2.711,-1.775 -6.7,-2.671 -11.965,-2.671 -1.551,0 -3.603,0.349 -6.156,1.048 -2.556,0.697 -5.036,2.016 -7.435,3.949 -2.404,1.938 -4.454,4.726 -6.158,8.363 -1.705,3.642 -2.556,8.402 -2.556,14.287 v 69.701 H 118.856 V 161.595 Z"
id="path14327-7" /><path
d="M 360.72381,381.097 V 59.711 h -23.13002 v -7.71 h 32.00002 v 336.807 h -32.00002 v -7.711 z"
id="path14329-5" /></g><a
href="https://chat.uni-graz.at/"
target="_blank"
rel="noopener noreferrer"
class="matrix_frame"
id="a207"
style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"
transform="translate(2205.8461,700.56086)"><rect
style="opacity:0.992867;fill:#000000;fill-opacity:0;stroke:none;stroke-width:10.0157;stroke-linecap:round;stop-color:#000000"
id="f_uni_graz"
width="359.55981"
height="378.63657"
x="5973.3828"
y="10262.653" /></a><text
xml:space="preserve"
x="6872.8604"
y="10899.353"
id="t_uni_graz"
class="instance_name"
style=""><tspan
id="tspan16830"
x="6872.8604"
y="10899.353"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10">Karl-Franzens-Universität Graz</tspan></text></svg>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment