Zum Inhalt springen

Änderungen von Dokument Der Verein

Zuletzt geändert von Mike Schneider am 2025/09/16 19:33
Von Version Icon 4.1 Icon
bearbeitet von Admin
am 2019/11/21 19:05
Änderungskommentar: Es gibt keinen Kommentar für diese Version
Auf Version Icon 37.1 Icon
bearbeitet von Markus Chrzonszcz
am 2021/04/26 10:30
Änderungskommentar: Es gibt keinen Kommentar für diese Version

Zusammenfassung

Details

Icon Seiteneigenschaften
Dokument-Autor
... ... @@ -1,1 +1,1 @@
1 -XWiki.Admin
1 +XWiki.mchrzonsz
Inhalt
... ... @@ -1,12 +1,4 @@
1 1  {{confluence_layout}}
2 -{{confluence_layout-section ac:type="single"}}
3 -{{confluence_layout-cell}}
4 -[[image:attach:msd.png]]
5 -
6 -\\
7 -{{/confluence_layout-cell}}
8 -{{/confluence_layout-section}}
9 -
10 10  {{confluence_layout-section ac:type="two_right_sidebar"}}
11 11  {{confluence_layout-cell}}
12 12  ----
... ... @@ -13,261 +13,134 @@
13 13  
14 14  = {{id name="Welcome-WillkommenimMakerspaceDarmstadt!"/}}**Willkommen im Makerspace Darmstadt!** =
15 15  
16 -== {{id name="Welcome-UnserZielistes,jedemeineWerkstattmitWerkzeugen,MaschinenundeinerCommunityrundumsSelbermachenzubieten.HierfindestduInformationenzuunseremVerein,derCommunityunddenimSpacevorhandenMaschinenundWerkzeugen."/}}//Unser Ziel ist es, jedem eine Werkstatt mit Werkzeugen, Maschinen und einer Community rund ums Selbermachen zu bieten. Hier findest du Informationen zu unserem Verein, der Community und den im Space vorhanden Maschinen und Werkzeugen.// ==
8 +== {{id name="Welcome-UnserZielistes,jedemeineWerkstattmitWerkzeugen,MaschinenundeinerCommunityrundumsSelbermachenzubieten.HierfindestDuInformationenzuunseremVerein,derCommunityunddenimSpacevorhandenenMaschinenundWerkzeugen."/}}//Unser Ziel ist es, jedem eine Werkstatt mit Werkzeugen, Maschinen und einer Community rund ums Selbermachen zu bieten. Hier findest Du Informationen zu unserem Verein, der Community und den im Space vorhandenen Maschinen und Werkzeugen.// ==
17 17  
18 18  ----
19 19  
12 += {{id name="Welcome-"/}} =
13 +
14 +{{locationSearch reference="MD" showExcerpts="false" width="100%"/}}
15 +
20 20  \\
21 21  
22 -(% style="font-size: 24.0px;letter-spacing: -0.01em;" %)**Core team**
18 +----
23 23  
20 += {{id name="Welcome-UnserVorstand"/}}Unser Vorstand =
21 +
22 +(% class="wrapped" %)
24 24  |(((
25 25  (% style="text-align: center;" %)
26 -[[image:attach:Harvey.jpg||thumbnail="true" width="100"]]
25 +\\
27 27  
28 28  (% style="text-align: center;" %)
29 -**Harvey Honner-white
30 -**Team Lead** **
31 -)))|(((
28 +\\
29 +
32 32  (% style="text-align: center;" %)
33 -[[image:attach:Alana.jpg||thumbnail="true" width="100"]]
31 +\\
34 34  
35 35  (% style="text-align: center;" %)
36 -**Alana Baczewski
37 - **Tech Lead
38 -)))|(((
34 +\\
35 +
39 39  (% style="text-align: center;" %)
40 -[[image:attach:Sameer.jpg||thumbnail="true" width="100"]]
37 +\\
41 41  
39 +(% class="content-wrapper" %)
40 +(((
42 42  (% style="text-align: center;" %)
43 -**Sameer Farrell
44 - **Marketing
42 +**Daniel Herrmann
43 +**Vorsitzender
44 +Öffentl./Kommunikation
45 +)))
45 45  )))|(((
46 46  (% style="text-align: center;" %)
47 -[[image:attach:Cassie.jpg||thumbnail="true" width="100"]]
48 +\\
48 48  
49 49  (% style="text-align: center;" %)
50 -**Mia Bednarczyk
51 - **Recruitment
52 -)))
51 +\\
53 53  
53 +(% style="text-align: center;" %)
54 54  \\
55 55  
56 -= {{id name="Welcome-Roadmap"/}}**Roadmap** =
56 +(% style="text-align: center;" %)
57 +\\
57 57  
58 -You can edit this roadmap or create a new one by adding the Roadmap Planner macro from the Insert menu. Link your Confluence pages to each bar to add visibility, and find more tips by reading the Atlassian blog: [[Plan better in 2015 with the Roadmap Planner macro>>url:http://blogs.atlassian.com/2015/01/roadmap-planner-macro/||shape="rect"]].
59 -
60 -= {{id name="Welcome-Knowyourspaces"/}}**Know your spaces** =
61 -
62 -Everything your team is working on - meeting notes and agendas, project plans and timelines, technical documentation and more - is located in a space; it's home base for your team.
63 -
64 -A small team should plan to have a space for the team, and a space for each big project. If you'll be working in Confluence with several other teams and departments, we recommend a space for each team as well as a space for each major cross-team project. The key is to think of a space as the container that holds all the important stuff - like pages, files, and blog posts - a team, group, or project needs to work.
65 -
66 -= {{id name="Welcome-Knowyourpages"/}}**Know your pages** =
67 -
68 -If you're working on something related to your team - project plans, product requirements, blog posts, internal communications, you name it - create and store it in a Confluence page. Confluence pages offer a lot of flexibility in creating and storing information, and there are a number of useful page templates included to get you started, like the meeting notes template. Your spaces should be filled with pages that document your business processes, outline your plans, contain your files, and report on your progress. The more you learn to do in Confluence (adding tables and graphs, or embedding video and links are great places to start), the more engaging and helpful your pages will become.
69 -
70 -Learn more by reading [[Confluence 101: organize your work in spaces>>url:https://www.atlassian.com/collaboration/confluence-organize-work-in-spaces||shape="rect"]]
71 -
59 +(% style="text-align: center;" %)
72 72  \\
73 73  
74 -----
75 -{{/confluence_layout-cell}}
76 -
77 -{{confluence_layout-cell}}
78 -= {{id name="Welcome-Quicknavigation"/}}**Quick navigation** =
79 -
80 -Hier sind einige wichtige Links zusammengefasst, die dir den Einstieg ins Vereinsleben und der Dokumentation erleichtern sollen:
81 -
82 -{{confluence_contentbylabel showLabels="false" showSpace="false" title="Quick Links" cql="label = ~"lbl-quick-link~""/}}
83 -
84 -= {{id name="Welcome-Usefullinks"/}}**Useful links** =
85 -
86 -|=(((
87 -Link
88 -)))|=(((
89 -Description
62 +(% class="content-wrapper" %)
63 +(((
64 +(% style="text-align: center;" %)
65 +**Daniel Gasch
66 +**Mitgliederverwaltung
67 +Organisation/Struktur
90 90  )))
91 -|(((
92 -[[Confluence 101: organize your work in spaces>>url:https://www.atlassian.com/collaboration/confluence-organize-work-in-spaces||shape="rect"]]
93 93  )))|(((
94 -Chances are, the information you need to do your job lives in multiple places. Word docs, Evernote files, email, PDFs, even Post-it notes. It's scattered among different systems. And to make matters worse, //the stuff your teammates need is equally siloed//. If information had feelings, it would be lonely.
95 -
96 -But with Confluence, you can bring all that information into one place.
97 -)))
98 -|(((
99 -[[Confluence 101: discuss work with your team>>url:https://www.atlassian.com/collaboration/confluence-discuss-work-with-your-team||shape="rect"]]
100 -)))|(((
101 -Getting a project outlined and adding the right content are just the first steps. Now it's time for your team to weigh in. Confluence makes it easy to discuss your work - with your team, your boss, or your entire company - in the same place where you organized and created it.
102 -)))
103 -|(((
104 -[[Confluence 101: create content with pages>>url:https://www.atlassian.com/collaboration/confluence-create-content-with-pages||shape="rect"]]
105 -)))|(((
106 -Think of pages as a New Age "document." If Word docs were rotary phones, Confluence pages would be smart phones. A smart phone still makes calls (like their rotary counterparts), but it can do so much more than that
107 -)))
108 -
109 -(% style="font-size: 24.0px;line-height: 1.25;" %)**
110 -**
111 -
112 -(% style="font-size: 24.0px;line-height: 1.25;" %)**Tasks**
113 -
114 -|(((
115 -(% class="task-list" %)
70 +(% class="content-wrapper" %)
116 116  (((
117 -{{task reference="/Tasks/Task_59" status="InProgress"}}
118 -[[Customize the name, colour, and icon of Confluence>>url:https://confluence.atlassian.com/x/NgszKw||shape="rect"]].
119 -{{/task}}
72 +[[image:attach:_ms_jan-schuhmacher.png||thumbnail="true" height="150"]]
120 120  
121 -{{task reference="/Tasks/Task_56" status="InProgress"}}
122 -Decide who can see and edit this space or a specific page by clicking the [[image:attach:lock-icon.png]]icon. Learn more about [[Page Restrictions>>url:https://confluence.atlassian.com/x/liAC||shape="rect"]] and [[Space Permissions>>url:https://confluence.atlassian.com/x/ASEC||shape="rect"]].
123 -{{/task}}
124 -
125 -{{task reference="/Tasks/Task_57" status="InProgress"}}
126 -Try adding an [[inline comment>>url:https://confluence.atlassian.com/x/2yAC||shape="rect"]] by highlighting some text and click the comment icon.
127 -{{/task}}
128 -
129 -{{task reference="/Tasks/Task_58" status="InProgress"}}
130 -Learn more about [[inviting your team to Confluence>>url:https://confluence.atlassian.com/x/SRwC||shape="rect"]].
131 -{{/task}}
74 +(% style="text-align: center;" %)
75 +(% style="text-align: center;letter-spacing: 0.0px;" %)**Jan Schuhmacher**(% style="letter-spacing: 0.0px;" %)
76 +Offene Werkstatt
77 +Inventar
132 132  )))
133 -)))
134 -{{/confluence_layout-cell}}
135 -{{/confluence_layout-section}}
136 -{{/confluence_layout}}
137 -
138 -{{confluence_layout}}
139 -{{confluence_layout-section ac:type="single"}}
140 -{{confluence_layout-cell}}
141 -[[image:attach:msd.png]]
142 -
79 +)))|(((
80 +(% style="text-align: center;" %)
143 143  \\
144 -{{/confluence_layout-cell}}
145 -{{/confluence_layout-section}}
146 146  
147 -{{confluence_layout-section ac:type="two_right_sidebar"}}
148 -{{confluence_layout-cell}}
149 -----
150 -
151 -= {{id name="Welcome-WillkommenimMakerspaceDarmstadt!"/}}**Willkommen im Makerspace Darmstadt!** =
152 -
153 -== {{id name="Welcome-UnserZielistes,jedemeineWerkstattmitWerkzeugen,MaschinenundeinerCommunityrundumsSelbermachenzubieten.HierfindestduInformationenzuunseremVerein,derCommunityunddenimSpacevorhandenMaschinenundWerkzeugen."/}}//Unser Ziel ist es, jedem eine Werkstatt mit Werkzeugen, Maschinen und einer Community rund ums Selbermachen zu bieten. Hier findest du Informationen zu unserem Verein, der Community und den im Space vorhanden Maschinen und Werkzeugen.// ==
154 -
155 -----
156 -
83 +(% style="text-align: center;" %)
157 157  \\
158 158  
159 -(% style="font-size: 24.0px;letter-spacing: -0.01em;" %)**Core team**
160 -
161 -|(((
162 162  (% style="text-align: center;" %)
163 -[[image:attach:Harvey.jpg||thumbnail="true" width="100"]]
87 +\\
164 164  
165 165  (% style="text-align: center;" %)
166 -**Harvey Honner-white
167 -**Team Lead** **
168 -)))|(((
169 -(% style="text-align: center;" %)
170 -[[image:attach:Alana.jpg||thumbnail="true" width="100"]]
90 +\\
171 171  
172 172  (% style="text-align: center;" %)
173 -**Alana Baczewski
174 - **Tech Lead
175 -)))|(((
176 -(% style="text-align: center;" %)
177 -[[image:attach:Sameer.jpg||thumbnail="true" width="100"]]
93 +\\
178 178  
95 +(% class="content-wrapper" %)
96 +(((
179 179  (% style="text-align: center;" %)
180 -**Sameer Farrell
181 - **Marketing
182 -)))|(((
183 -(% style="text-align: center;" %)
184 -[[image:attach:Cassie.jpg||thumbnail="true" width="100"]]
185 -
186 -(% style="text-align: center;" %)
187 -**Mia Bednarczyk
188 - **Recruitment
98 +**Ansgar Schaefer**
99 +Raumbeauftragter
100 +Sicherheit / Einweisungen
189 189  )))
102 +)))
103 +{{/confluence_layout-cell}}
190 190  
191 -\\
105 +{{confluence_layout-cell}}
106 +----
192 192  
193 -= {{id name="Welcome-Roadmap"/}}**Roadmap** =
108 += {{id name="Welcome-GettingStarted"/}}Getting Started =
194 194  
195 -You can edit this roadmap or create a new one by adding the Roadmap Planner macro from the Insert menu. Link your Confluence pages to each bar to add visibility, and find more tips by reading the Atlassian blog: [[Plan better in 2015 with the Roadmap Planner macro>>url:http://blogs.atlassian.com/2015/01/roadmap-planner-macro/||shape="rect"]].
110 +Hier sind einige wichtige Links zusammengefasst, die Dir den Einstieg ins Vereinsleben und der Dokumentation erleichtern sollen:
196 196  
197 -= {{id name="Welcome-Knowyourspaces"/}}**Know your spaces** =
112 +{{confluence_contentbylabel showLabels="false" showSpace="false" title="Quick Links" cql="label = ~"lbl-quick-link~""/}}
198 198  
199 -Everything your team is working on - meeting notes and agendas, project plans and timelines, technical documentation and more - is located in a space; it's home base for your team.
200 -
201 -A small team should plan to have a space for the team, and a space for each big project. If you'll be working in Confluence with several other teams and departments, we recommend a space for each team as well as a space for each major cross-team project. The key is to think of a space as the container that holds all the important stuff - like pages, files, and blog posts - a team, group, or project needs to work.
202 -
203 -= {{id name="Welcome-Knowyourpages"/}}**Know your pages** =
204 -
205 -If you're working on something related to your team - project plans, product requirements, blog posts, internal communications, you name it - create and store it in a Confluence page. Confluence pages offer a lot of flexibility in creating and storing information, and there are a number of useful page templates included to get you started, like the meeting notes template. Your spaces should be filled with pages that document your business processes, outline your plans, contain your files, and report on your progress. The more you learn to do in Confluence (adding tables and graphs, or embedding video and links are great places to start), the more engaging and helpful your pages will become.
206 -
207 -Learn more by reading [[Confluence 101: organize your work in spaces>>url:https://www.atlassian.com/collaboration/confluence-organize-work-in-spaces||shape="rect"]]
208 -
209 209  \\
210 210  
211 211  ----
212 -{{/confluence_layout-cell}}
213 213  
214 -{{confluence_layout-cell}}
215 -= {{id name="Welcome-Quicknavigation"/}}**Quick navigation** =
118 += {{id name="Welcome-"/}}[[image:attach:Slack_MKSP.png]] =
216 216  
217 -Hier sind einige wichtige Links zusammengefasst, die dir den Einstieg ins Vereinsleben und der Dokumentation erleichtern sollen:
120 +Wir benutzen Slack, um miteinander zu kommunizieren. Komm einfach vorbei und werde Teil unserer Maker-Community: [[hier beitreten>>url:https://join.slack.com/t/makerspace-darmstadt/shared_invite/zt-pib8n8ib-RFlKRhlHzgIjoXZVmyUQMQ||shape="rect"]]!
218 218  
219 219  \\
220 220  
221 -= {{id name="Welcome-Usefullinks"/}}**Useful links** =
124 +----
222 222  
223 -|=(((
224 -Link
225 -)))|=(((
226 -Description
227 -)))
228 -|(((
229 -[[Confluence 101: organize your work in spaces>>url:https://www.atlassian.com/collaboration/confluence-organize-work-in-spaces||shape="rect"]]
230 -)))|(((
231 -Chances are, the information you need to do your job lives in multiple places. Word docs, Evernote files, email, PDFs, even Post-it notes. It's scattered among different systems. And to make matters worse, //the stuff your teammates need is equally siloed//. If information had feelings, it would be lonely.
126 += {{id name="Welcome-OffeneWerkstatt"/}}Offene Werkstatt =
232 232  
233 -But with Confluence, you can bring all that information into one place.
234 -)))
235 -|(((
236 -[[Confluence 101: discuss work with your team>>url:https://www.atlassian.com/collaboration/confluence-discuss-work-with-your-team||shape="rect"]]
237 -)))|(((
238 -Getting a project outlined and adding the right content are just the first steps. Now it's time for your team to weigh in. Confluence makes it easy to discuss your work - with your team, your boss, or your entire company - in the same place where you organized and created it.
239 -)))
240 -|(((
241 -[[Confluence 101: create content with pages>>url:https://www.atlassian.com/collaboration/confluence-create-content-with-pages||shape="rect"]]
242 -)))|(((
243 -Think of pages as a New Age "document." If Word docs were rotary phones, Confluence pages would be smart phones. A smart phone still makes calls (like their rotary counterparts), but it can do so much more than that
244 -)))
128 +Du willst uns kennenlernen und einfach mal reinschnuppern? Leider können wir im Moment wegen der Pandemie keine offene Werkstatt in der Form wie früher anbieten.
245 245  
246 -(% style="font-size: 24.0px;line-height: 1.25;" %)**
247 -**
248 248  
249 -(% style="font-size: 24.0px;line-height: 1.25;" %)**Tasks**
131 +Du hast allerdings als Nicht-Mitglied die Möglichkeit, Dich maximal zu zweit mit einem Mitglied aus dem Space zu verabreden, wenn gerade keine anderen fremden Personen im Space sind. Verwenden kannst Du dafür diesen Kalender: [[http:~~/~~/www.makerspace-darmstadt.de/zugang>>url:http://www.makerspace-darmstadt.de/zugang||shape="rect"]], in dem ihr euch dann eintragt. So stellt ihr sicher, dass immer nur ein Pärchen gleichzeitig in den Space gelassen wird.
250 250  
251 -|(((
252 -(% class="task-list" %)
253 -(((
254 -{{task reference="/Tasks/Task_18" status="InProgress"}}
255 -[[Customize the name, colour, and icon of Confluence>>url:https://confluence.atlassian.com/x/NgszKw||shape="rect"]].
256 -{{/task}}
133 +\\
257 257  
258 -{{task reference="/Tasks/Task_19" status="InProgress"}}
259 -Decide who can see and edit this space or a specific page by clicking the [[image:attach:lock-icon.png]]icon. Learn more about [[Page Restrictions>>url:https://confluence.atlassian.com/x/liAC||shape="rect"]] and [[Space Permissions>>url:https://confluence.atlassian.com/x/ASEC||shape="rect"]].
260 -{{/task}}
261 -
262 -{{task reference="/Tasks/Task_20" status="InProgress"}}
263 -Try adding an [[inline comment>>url:https://confluence.atlassian.com/x/2yAC||shape="rect"]] by highlighting some text and click the comment icon.
264 -{{/task}}
265 -
266 -{{task reference="/Tasks/Task_21" status="InProgress"}}
267 -Learn more about [[inviting your team to Confluence>>url:https://confluence.atlassian.com/x/SRwC||shape="rect"]].
268 -{{/task}}
269 -)))
270 -)))
135 +Weitere Termine findest Du auch immer im [[Veranstaltungskalender unserer Homepage>>url:https://www.makerspace-darmstadt.de/termine||shape="rect"]]!
271 271  {{/confluence_layout-cell}}
272 272  {{/confluence_layout-section}}
273 273  {{/confluence_layout}}
Icon Confluence.Code.ConfluencePageClass[0]
Id
... ... @@ -1,1 +1,1 @@
1 -1146892
1 +42369868
URL
... ... @@ -1,1 +1,1 @@
1 -https://wiki.makerspace-darmstadt.de/spaces/MD/pages/1146892/Welcome
1 +https://wiki.makerspace-darmstadt.de/spaces/MD/pages/42369868/Welcome