Changes for page Matrix

Summary

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

Details

Page properties

Content

...	...	@@ -14,111 +14,28 @@
14	14
15	15
16	16
17		-Download and sign in to the desktop version of Matrix chat
18	18
19		-
20		-
21	21	[[ Here>>url:https://element.io/get-started]] you can find installation for IOS, Android, Mac, Linux and Windows.
22	22
23	23
24	24
25		-== Sign in ==
26		-
27		-You can sign in to the desktop version or web interface.
28		-
29		-=== Sign in to the desktop version ===
30		-
31		-
32		-[[ Here>>url:https://element.io/get-started]] you can find installation for IOS, Android, Mac, Linux and Windows.
33		-
34	34	[[image:matrixdownload.png||height="284" width="575"]]
35	35
36	36
	25	+== Log in ==
37	37
38		-You can sig in, if you have an account or create an account.
39	39
40		-[[image:elementdesktopversionlogineng.png||height="745" width="558"]]
	28	+=== Log in to the web interface with TUM login data ===
41	41
42	42
43		-(% class="wikigeneratedid" %)
44		-[[image:elementdesktopversionlogineng2.png||height="766" width="573"]]
45		-
46		-
47		-(% class="wikigeneratedid" %)
48		-If you have a CIT or TUM Account, you can sign in wit your login data.
49		-
50		-(% class="wikigeneratedid" %)
51		-[[image:elementdesktopversionloginengcit1.png||height="621" width="570"]]
52		-
53		-
54		-(% class="wikigeneratedid" %)
55		-For the sign in with your CIT or TUM account, you need the following homeserver:
56		-
57		-
58		-(% class="box infomessage" %)
59		-(((
60		-ITO homeserver: matrix.cit.tum.de
61		-)))
62		-
63		-(% class="box infomessage" %)
64		-(((
65		-TUM homeserver: matrix.tum.de
66		-)))
67		-
68		-(% class="wikigeneratedid" %)
69		-[[image:desktopelementengcit2.png||height="635" width="580"]]
70		-
71		-
72		-
73		-(% class="wikigeneratedid" %)
74		-And the login data as follow:
75		-
76		-(% class="wikigeneratedid" %)
77		-CIT:
78		-
79	79	(% class="box" %)
80	80	(((
81		-username: ITO-ID (without @cit.tum.de)
82		-)))
83		-
84		-(% class="box" %)
85		-(((
86		-Password: cit.tum Password
87		-)))
88		-
89		-(% class="wikigeneratedid" %)
90		-TUM:
91		-
92		-(% class="box" %)
93		-(((
94		-username: LRZ-ID (without @mytum.de or @tum.de)
95		-)))
96		-
97		-(% class="box" %)
98		-(((
99		-Password: LRZ/TUM Password
100		-)))
101		-
102		-(% class="wikigeneratedid" %)
103		-[[image:desktopelementengcit3.png||height="522" width="582"]]
104		-
105		-
106		-=== Sign in to the web interface ===
107		-
108		-If you don't a CIT or TUM account, you can create a matrix account freely on [[https:~~/~~/app.element.io>>https://app.element.io]]
109		-
110		-
111		-==== With TUM login data ====
112		-
113		-
114		-(% class="box" %)
115		-(((
116	116	Webpage: https:~/~/matrix.tum.de
117	117	)))
118	118
119	119	(% class="box" %)
120	120	(((
121		-username: LRZ-ID (without @mytum.de or @tum.de)
	38	+ID: LRZ-ID (without @mytum.de or @tum.de)
122	122	)))
123	123
124	124	(% class="box" %)
...	...	@@ -131,7 +131,7 @@
131	131
132	132	[[image:tumaccountlogineng2n.png||height="362" width="589"]]
133	133
134		-==== With CIT login data ====
	51	+=== Log in to the web interface with cit.tum login data ===
135	135
136	136	(% class="box" %)
137	137	(((
...	...	@@ -140,7 +140,7 @@
140	140
141	141	(% class="box" %)
142	142	(((
143		-username: ITO-ID (without @cit.tum.de)
	60	+ID: ITO-ID (without @cit.tum.de)
144	144	)))
145	145
146	146	(% class="box" %)
...	...	@@ -154,11 +154,12 @@
154	154
155	155	[[image:rbgaccountlogineng2.png||height="377" width="608"]]
156	156
	74	+
157	157	== Create new chat room ==
158	158
159	159	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.
160	160
161		-[[image:addroom1new.png||height="312" width="623"]]
	79	+[[image:addroom1.png||height="311" width="622"]]
162	162
163	163
164	164	The chat room **TestRoom** is private, so it is not visible to others and participants can only join the room by invitation.
...	...	@@ -168,26 +168,23 @@
168	168
169	169	== Invite into the chat ==
170	170
171		-There are two types of chat, private or group chat. You can create either private or group chats and invite other people to the chat room. You can also join to these group chats to participate in existing conversations.
	89	+There are two types of chat, personal or group chat. You can create either personal or group chats.
172	172
	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.
173	173
	93	+
174	174	**Requirement**: The member which is been invited has registered once on the Matrix Server.
175	175
176		-**Note**: If you have only released the room for the CIT or TUM user, only people who are registered on the CIT or TUM server can access this room.
	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.
177	177
178	178
179		-Click the button **Invite to this room** to invite people to the group chat.
	99	+[[image:addroom4.png||height="636" width="616"]]
180	180
181		-[[image:addroom4new.png||height="655" width="634"]]
182		-
183		-
184		-If you want to chat with a member privatly, click on the **+-Button** beside **People** in the program or on the web interface.
185		-
186	186	[[image:startchat1.png||height="202" width="633"]]
187	187
188	188	Enter followings in the opened window:
189	189
190		-**For CIT Accounts**: e.g. @musterma:cit.tum.de
	105	+**For ITO Accounts**: e.g. @musterma:cit.tum.de
191	191
192	192	(% class="box infomessage" %)
193	193	(((