Changes for page Matrix

Summary

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

Details

Page properties

Content

...	...	@@ -14,28 +14,111 @@
14	14
15	15
16	16
	17	+Download and sign in to the desktop version of Matrix chat
17	17
18	18
19		-And[[ Here>>url:https://element.io/get-started]] you can find installation for IOS, Android, Mac, Linux and Windows.
20	20
	21	+[[ Here>>url:https://element.io/get-started]] you can find installation for IOS, Android, Mac, Linux and Windows.
21	21
	23	+
	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	+
22	22	[[image:matrixdownload.png||height="284" width="575"]]
23	23
24	24
25		-== Log in ==
26	26
	38	+You can sig in, if you have an account or create an account.
27	27
28		-=== Log in to the web interface with TUM login data ===
	40	+[[image:elementdesktopversionlogineng.png||height="745" width="558"]]
29	29
30	30
	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	+
31	31	(% class="box" %)
32	32	(((
	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	+(((
33	33	Webpage: https:~/~/matrix.tum.de
34	34	)))
35	35
36	36	(% class="box" %)
37	37	(((
38		-ID: LRZ-ID (without @mytum.de or @tum.de)
	121	+username: LRZ-ID (without @mytum.de or @tum.de)
39	39	)))
40	40
41	41	(% class="box" %)
...	...	@@ -48,7 +48,7 @@
48	48
49	49	[[image:tumaccountlogineng2n.png||height="362" width="589"]]
50	50
51		-=== Log in to the web interface with cit.tum login data ===
	134	+=== With CIT login data ===
52	52
53	53	(% class="box" %)
54	54	(((
...	...	@@ -57,7 +57,7 @@
57	57
58	58	(% class="box" %)
59	59	(((
60		-ID: ITO-ID (without @cit.tum.de)
	143	+username: ITO-ID (without @cit.tum.de)
61	61	)))
62	62
63	63	(% class="box" %)
...	...	@@ -71,12 +71,11 @@
71	71
72	72	[[image:rbgaccountlogineng2.png||height="377" width="608"]]
73	73
74		-
75	75	== Create new chat room ==
76	76
77	77	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.
78	78
79		-[[image:addroom1.png||height="311" width="622"]]
	161	+[[image:addroom1new.png||height="312" width="623"]]
80	80
81	81
82	82	The chat room **TestRoom** is private, so it is not visible to others and participants can only join the room by invitation.
...	...	@@ -86,23 +86,26 @@
86	86
87	87	== Invite into the chat ==
88	88
89		-There are two types of chat, personal or group chat. You can create either personal or group chats.
	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.
90	90
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.
92	92
93		-
94	94	**Requirement**: The member which is been invited has registered once on the Matrix Server.
95	95
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.
	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.
97	97
98	98
99		-[[image:addroom4.png||height="636" width="616"]]
	179	+Click the button **Invite to this room** to invite people to the group chat.
100	100
	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	+
101	101	[[image:startchat1.png||height="202" width="633"]]
102	102
103	103	Enter followings in the opened window:
104	104
105		-**For ITO Accounts**: e.g. @musterma:cit.tum.de
	190	+**For CIT Accounts**: e.g. @musterma:cit.tum.de
106	106
107	107	(% class="box infomessage" %)
108	108	(((
...	...	@@ -113,7 +113,7 @@
113	113
114	114	(% class="box infomessage" %)
115	115	(((
116		- @lrz-ID:tum.de
	201	+ @LRZ-ID:tum.de
117	117	)))
118	118
119	119	**For other Accounts: ** e.g. @musterma:matrix.org
...	...	@@ -124,5 +124,3 @@
124	124	)))
125	125
126	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.
127		-
128		-