Changes for page Matrix

Summary

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

Details

Page properties

Content

...	...	@@ -5,10 +5,10 @@
5	5
6	6
7	7
8		-== what's matrix? ==
	8	+== What is matrix? ==
9	9
10	10
11		-Matrix is a chat system very similar to email. 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.
	11	+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.
12	12
13	13	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.
14	14
...	...	@@ -15,21 +15,10 @@
15	15
16	16
17	17
18		-you can use following ito or cit interface of Matrix chat if you have ITO or CIT account:
	18	+[[ Here>>url:https://element.io/get-started]] you can find installation for IOS, Android, Mac, Linux and Windows.
19	19
20	20
21		- 1 [[matrix.cit.tum.de (ITO- ID)>>url:https://matrix.cit.tum.de/#/welcome]]
22		- 1 [[matrix.tum.de (LRZ-TUM-ID)>>url:https://matrix.tum.de/#/welcome]]
23	23
24		-You can log in any of them with the appropriate ID and password.
25		-
26		-
27		-if you don't have a CIT or TUM account, you can create a matrix account freely on [[https:~~/~~/app.element.io>>url:https://app.element.io/]]
28		-
29		-
30		-And[[ Here>>url:https://element.io/get-started]] you can find installation for IOS, Android, Mac, Linux and Windows.
31		-
32		-
33	33	[[image:matrixdownload.png||height="284" width="575"]]
34	34
35	35
...	...	@@ -95,57 +95,22 @@
95	95	[[image:addroom3.png||height="738" width="617"]]
96	96
97	97
98		-== Invite into the chat room ==
	87	+== Invite into the chat ==
99	99
100		-**Requirement**: The member which is been invited has registered once on the Matrix Server.
	89	+There are two types of chat, personal or group chat. You can create either personal or group chats.
101	101
102		-**Note**: If you have only released the room for the cit.tum or TUM user, only people who are registered on the cit.tum or tum server can access this room.
	91	+For group chats, you can click the button **Invite to this room** to invite people to that chat. You can also privatly chat with other people in Matrix. If you want to chat with a member privatly, click on the **+-Button** beside **People** in the program or on the web interface.
103	103
104		-If you want to invite new members to the room, click the button **Invite to this room**.
105	105
106		-[[image:addroom4.png||height="636" width="616"]]
	94	+**Requirement**: The member which is been invited has registered once on the Matrix Server.
107	107
	96	+**Note**: If you have only released the room for the cit.tum or tum user, only people who are registered on the cit.tum or tum server can access this room.
108	108
109		-Enter followings in the opened window:
110	110
111		-**For ITO Accounts**: e.g. @musterma:cit.tum.de
	99	+[[image:addroom4.png||height="636" width="616"]]
112	112
113		-(% class="box infomessage" %)
114		-(((
115		-@ITO-ID:cit.tum.de
116		-)))
117		-
118		-**For TUM Accounts: **e.g. @lr89rbg:tum.de
119		-
120		-(% class="box infomessage" %)
121		-(((
122		- @lrz-ID:tum.de
123		-)))
124		-
125		-**For other Accounts: ** e.g. @musterma:matrix.org
126		-
127		-(% class="box infomessage" %)
128		-(((
129		- name, email address, username  @username:domain
130		-)))
131		-
132		-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.
133		-
134		-
135		-[[image:invitetotestroom.png||height="593" width="622"]]
136		-
137		-
138		-=== invite to the private chat ===
139		-
140		-
141		-**Requirement**: The member which is been invited has registered once on the Matrix Server.
142		-
143		-
144		-You can also privatly chat with other in Matrix. If you want to chat with a member privatly, click on the **+-Button** beside **People** in the program or on the web interface.
145		-
146	146	[[image:startchat1.png||height="202" width="633"]]
147	147
148		-
149	149	Enter followings in the opened window:
150	150
151	151	**For ITO Accounts**: e.g. @musterma:cit.tum.de
...	...	@@ -159,7 +159,7 @@
159	159
160	160	(% class="box infomessage" %)
161	161	(((
162		- @lrz-ID:tum.de
	116	+ @LRZ-ID:tum.de
163	163	)))
164	164
165	165	**For other Accounts: ** e.g. @musterma:matrix.org
...	...	@@ -166,15 +166,7 @@
166	166
167	167	(% class="box infomessage" %)
168	168	(((
169		- name, email address, username  @username:homeserver
	123	+ name, email address, username  @username:domain
170	170	)))
171	171
172		-and send the invitation to the e-mail address of the person to be invited. [[image:invitepeople1.png||height="298" width="687"]]
173		-
174		-
175		-The invitation will appear in the element chat window and must be accepted.
176		-
177		-[[image:invitepeople2.png||height="263" width="686"]]
178		-
179		-
180		-----
	126	+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.