Changes for page Matrix

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -3,16 +3,16 @@
3	3	= Establishing a Matrix Chat =
4	4
5	5
6		-== What is matrix? ==
	6	+== What is Matrix? ==
7	7
8	8
9	9	Matrix is a chat system very similar to E-Mail. People have their account on one server but can write messages to anyone on other servers. For example @someprofessor:tum.de can communicate with @someresearcher:lmu.de.
10	10
11		-You can create end-to-end encrypted personal or group chats that are not stored and dependent on a central authority like most other tools (ms teams, whatsapp, zoom, ...). All your messages are synced between all your devices - web clients, desktop clients, smartphone apps. For additional security, encryption keys of contacts can be verified and then stored as trusted.
	11	+You can create end-to-end encrypted personal or group chats that are not stored and dependent on a central authority like most other tools (ms teams, whatsapp, zoom, ...). All your messages are synced between all your devices - web clients, desktop clients, smartphone apps. For additional security, encryption keys of contacts can be verified and then stored as trusted.
12	12
13	13	You can use either the desktop version or the web interface of matrix.
14	14
15		-==Sign in==
	15	+== Sign in ==
16	16
17	17	=== Sign in to the desktop version ===
18	18
...	...	@@ -23,61 +23,36 @@
23	23
24	24
25	25
26		-If you have a CIT or TUM Account, you can sign in wit your login data.
	26	+If you have an Account you can sign in otherwise you can create a matrix account freely on [[https:~~/~~/app.element.io>>https://app.element.io]] .
27	27
28	28	(% class="wikigeneratedid" %)
29		-For this you need the following homeserver:
30		-
31		-(% class="box infomessage" %)
32		-(((
33		-CIT homeserver: matrix.cit.tum.de
34		-)))
35		-
36		-(% class="box infomessage" %)
37		-(((
38		-TUM homeserver: matrix.tum.de
39		-)))
40		-
41	41	[[image:elementdesktopversionlogineng.png||height="745" width="558"]]
42	42
43		-(% class="wikigeneratedid" %)
44		-[[image:elementdesktopversionloginengcit1.png||height="621" width="570"]]
45	45
46		-(% class="wikigeneratedid" %)
47		-[[image:desktopelementengcit2.png||height="635" width="580"]]
48	48
49		-
50	50	(% class="wikigeneratedid" %)
51		-And the login data as follow:
	34	+If you have a CIT or TUM Account, you can sign in wit your login data. For this you need the following home server and login data:
52	52
53		-(% class="wikigeneratedid" %)
54		-CIT:
55		-
56		-(% class="box" %)
	36	+(% class="box infomessage" %)
57	57	(((
58		-username: CIT-ID (without @cit.tum.de)
	38	+**CIT : Homeserver**: matrix.cit.tum.de , **Username**: CIT-ID (without @cit.tum.de), **Password**: CIT Password
59	59	)))
60	60
61		-(% class="box" %)
	41	+(% class="box infomessage" %)
62	62	(((
63		-Password: cit.tum Password
	43	+**TUM : Homeserver**: matrix.tum.de , **Username**: LRZ-ID (without @mytum.de or @tum.de), **Password**: LRZ/TUM Password
64	64	)))
65	65
	46	+
66	66	(% class="wikigeneratedid" %)
67		-TUM:
	48	+[[image:signinediteng.png||height="606" width="557"]]
68	68
69		-(% class="box" %)
70		-(((
71		-username: LRZ-ID (without @mytum.de or @tum.de)
72		-)))
	50	+(% class="wikigeneratedid" %)
	51	+[[image:desktopelementengcit2.png||height="609" width="556"]]
73	73
74		-(% class="box" %)
75		-(((
76		-Password: LRZ/TUM Password
77		-)))
78	78
79	79	(% class="wikigeneratedid" %)
80		-[[image:desktopelementengcit3.png||height="522" width="582"]]
	55	+[[image:desktopelementengcit3.png||height="497" width="555"]]
81	81
82	82
83	83
...	...	@@ -90,59 +90,43 @@
90	90	==== With TUM login data ====
91	91
92	92
93		-(% class="box" %)
94		-(((
95		-Webpage: https:~/~/matrix.tum.de
96		-)))
	68	+**Webpage**: [[https:~~/~~/matrix.tum.de>>https://matrix.tum.de]]
97	97
98		-(% class="box" %)
99		-(((
100		-username: LRZ-ID (without @mytum.de or @tum.de)
101		-)))
	70	+**Username**: LRZ-ID (without @mytum.de or @tum.de)
102	102
103		-(% class="box" %)
104		-(((
105		-Password: LRZ/TUM Password
106		-)))
	72	+**Password**: LRZ/TUM Password
107	107
108	108	[[image:tumaccountlogineng1.png||height="329" width="582"]]
109	109
110	110
111		-[[image:tumaccountlogineng2n.png||height="362" width="589"]]
	77	+[[image:tumaccountlogineng2n.png||height="357" width="581"]]
112	112
	79	+
	80	+
113	113	==== With CIT login data ====
114	114
115		-(% class="box" %)
116		-(((
117		-Webpage: https:~/~/matrix.cit.tum.de
118		-)))
	83	+**Webpage**: [[https:~~/~~/matrix.cit.tum.de>>https://matrix.cit.tum.de]]
119	119
120		-(% class="box" %)
121		-(((
122		-username: CIT-ID (without @cit.tum.de)
123		-)))
	85	+**Username**: CIT-ID (without @cit.tum.de)
124	124
125		-(% class="box" %)
126		-(((
127		-Password: cit.tum Password
128		-)))
	87	+**Password**: CIT Password
129	129
130	130
131		-[[image:Screenshot 2023-08-23 at 18.16.21.png||height="474" width="609"]]
	90	+[[image:Screenshot 2023-08-23 at 18.16.21.png||height="446" width="573"]]
132	132
133	133
134		-[[image:rbgaccountlogineng2.png||height="377" width="608"]]
	93	+[[image:rbgaccountlogineng2.png||height="353" width="569"]]
135	135
136		-== Create new chat room ==
	95	+== Create a new chat room ==
137	137
138		-If you want to create a new chat room, first click the **+**-Button next to **Rooms** in the program or on the web inferface and then enter the name of the chat room. You can also block users on other servers from joining the room or enable encryption. You can't change these settings later.
	97	+If you want to create a new chat room, first click the **+**-Button next to **Rooms** in the program or on the web inferface and then enter the name of the chat room.
139	139
140		-[[image:addroom1new.png||height="312" width="623"]]
	99	+[[image:addroom1new.png||height="284" width="567"]]
141	141
142	142
143		-The chat room **TestRoom** is private, so it is not visible to others and participants can only join the room by invitation. If you create a public room, anyone will be able to find and join this room. You can change this at any time from room settings.
	102	+You can also block users on other servers from joining the room or enable encryption. You can't change these settings later. The chat room **TestRoom** is private, so it is not visible to others and participants can only join the room by invitation. If you create a public room, anyone will be able to find and join this room. You can change this at any time from room settings.
144	144
145		-[[image:addroom3.png||height="738" width="617"]]
	104	+[[image:addroom3.png||height="673" width="563"]]
146	146
147	147
148	148	== Invite People into the chat ==
...	...	@@ -154,12 +154,12 @@
154	154
155	155	Click the button **Invite to this room** to invite people to the group chat.
156	156
157		-[[image:addroom4new.png||height="655" width="634"]]
	116	+[[image:addroom4new.png||height="571" width="553"]]
158	158
159	159
160	160	If you want to chat with a member privatly, click on the **+-Button** beside **People** in the program or on the web interface.
161	161
162		-[[image:startchat1.png||height="202" width="633"]]
	121	+[[image:startchat1.png||height="177" width="555"]]
163	163
164	164	Enter the following Matrix ID's in the opened window:
165	165
...	...	@@ -186,4 +186,4 @@
186	186
187	187	and send the invitation to the e-mail address of the person to be invited. The invitation will appear in the Matrix chat window and must be accepted.
188	188
189		-[[image:invitetotestraum.png||height="351" width="622"]]
	148	+[[image:invitetotestraum.png||height="309" width="548"]]