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 28.1 Icon
bearbeitet von Daniel Herrmann
am 2020/01/12 01:06
Änderungskommentar: Es gibt keinen Kommentar für diese Version

Zusammenfassung

Details

Icon Seiteneigenschaften
Dokument-Autor
... ... @@ -1,1 +1,1 @@
1 -XWiki.Admin
1 +XWiki.dherrman
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  ----
... ... @@ -15,259 +15,104 @@
15 15  
16 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.// ==
17 17  
10 +\\
11 +
18 18  ----
19 19  
20 -\\
14 += {{id name="Welcome-Suche"/}}Suche =
21 21  
22 -(% style="font-size: 24.0px;letter-spacing: -0.01em;" %)**Core team**
16 += {{id name="Welcome-"/}} =
23 23  
24 -|(((
25 -(% style="text-align: center;" %)
26 -[[image:attach:Harvey.jpg||thumbnail="true" width="100"]]
18 +{{locationSearch reference="MD" showExcerpts="false" width="100%"/}}
27 27  
28 -(% style="text-align: center;" %)
29 -**Harvey Honner-white
30 -**Team Lead** **
31 -)))|(((
32 -(% style="text-align: center;" %)
33 -[[image:attach:Alana.jpg||thumbnail="true" width="100"]]
20 += {{id name="Welcome-UnserVorstand"/}}Unser Vorstand =
34 34  
22 +(% class="wrapped" %)
23 +|(((
24 +(% class="content-wrapper" %)
25 +(((
35 35  (% style="text-align: center;" %)
36 -**Alana Baczewski
37 - **Tech Lead
38 -)))|(((
39 -(% style="text-align: center;" %)
40 -[[image:attach:Sameer.jpg||thumbnail="true" width="100"]]
27 +[[image:attach:_ms_nico-neumann.png||thumbnail="true" height="150"]]
41 41  
42 42  (% style="text-align: center;" %)
43 -**Sameer Farrell
44 - **Marketing
30 +**Nico Neumann
31 +**Vorsitzender
32 +Öffentl./Kommunikation
33 +)))
45 45  )))|(((
35 +(% class="content-wrapper" %)
36 +(((
46 46  (% style="text-align: center;" %)
47 -[[image:attach:Cassie.jpg||thumbnail="true" width="100"]]
38 +[[image:attach:_ms_antje-schreiber.png||thumbnail="true" height="150"]]
48 48  
49 49  (% style="text-align: center;" %)
50 -**Mia Bednarczyk
51 - **Recruitment
41 +**Antje Schreiber**
42 +Mitgliederverwaltung
43 +Organisation/Struktur
52 52  )))
53 -
54 -\\
55 -
56 -= {{id name="Welcome-Roadmap"/}}**Roadmap** =
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 -
72 -\\
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
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.
46 +(% class="content-wrapper" %)
47 +(((
48 +[[image:attach:_ms_jan-schuhmacher.png||thumbnail="true" height="150"]]
95 95  
96 -But with Confluence, you can bring all that information into one place.
50 +(% style="text-align: center;" %)
51 +(% style="text-align: center;letter-spacing: 0.0px;" %)**Jan Schuhmacher**(% style="letter-spacing: 0.0px;" %)
52 +Offene Werkstatt
53 +Inventar
97 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 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" %)
56 +(% 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}}
58 +(% style="text-align: center;" %)
59 +[[image:attach:_ms_roman-shuf.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}}
61 +(% style="text-align: center;" %)
62 +**Roman Shuf**
63 +Raumbeauftragter
64 +Sicherheit / Einweisungen
132 132  )))
133 133  )))
134 134  {{/confluence_layout-cell}}
135 -{{/confluence_layout-section}}
136 -{{/confluence_layout}}
137 137  
138 -{{confluence_layout}}
139 -{{confluence_layout-section ac:type="single"}}
140 140  {{confluence_layout-cell}}
141 -[[image:attach:msd.png]]
142 -
143 -\\
144 -{{/confluence_layout-cell}}
145 -{{/confluence_layout-section}}
146 -
147 -{{confluence_layout-section ac:type="two_right_sidebar"}}
148 -{{confluence_layout-cell}}
149 149  ----
150 150  
151 -= {{id name="Welcome-WillkommenimMakerspaceDarmstadt!"/}}**Willkommen im Makerspace Darmstadt!** =
72 += {{id name="Welcome-GettingStarted"/}}Getting Started =
152 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.// ==
74 +Hier sind einige wichtige Links zusammengefasst, die dir den Einstieg ins Vereinsleben und der Dokumentation erleichtern sollen:
154 154  
76 +{{confluence_contentbylabel showLabels="false" showSpace="false" title="Quick Links" cql="label = ~"lbl-quick-link~""/}}
77 +
155 155  ----
156 156  
157 -\\
80 += {{id name="Welcome-Slack"/}}Slack =
158 158  
159 -(% style="font-size: 24.0px;letter-spacing: -0.01em;" %)**Core team**
82 +Wir benutzen Slack, um miteinander zu kommunizieren! Komm einfach vorbei: [[hier beitreten>>url:https://join.slack.com/t/makerspace-darmstadt/shared_invite/MjI3MDc1NTQ4NTgyLTE1MDI3MDY1MzAtOTdmMWVmNGMzOA||shape="rect"]]
160 160  
161 -|(((
162 -(% style="text-align: center;" %)
163 -[[image:attach:Harvey.jpg||thumbnail="true" width="100"]]
164 -
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"]]
171 -
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"]]
178 -
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
189 -)))
190 -
191 -\\
192 -
193 -= {{id name="Welcome-Roadmap"/}}**Roadmap** =
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"]].
196 -
197 -= {{id name="Welcome-Knowyourspaces"/}}**Know your spaces** =
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 -\\
210 -
211 211  ----
212 -{{/confluence_layout-cell}}
213 213  
214 -{{confluence_layout-cell}}
215 -= {{id name="Welcome-Quicknavigation"/}}**Quick navigation** =
86 += {{id name="Welcome-OffeneWerkstatt"/}}Offene Werkstatt =
216 216  
217 -Hier sind einige wichtige Links zusammengefasst, die dir den Einstieg ins Vereinsleben und der Dokumentation erleichtern sollen:
88 +Du willst uns kennenlernen und einfach mal reinschnuppern? Komm zu unseren offenen Werkstattzeiten vorbei! Diese sind momentan:
218 218  
219 -\\
220 -
221 -= {{id name="Welcome-Usefullinks"/}}**Useful links** =
222 -
90 +(% class="wrapped" %)
223 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"]]
92 +Dienstags
230 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.
232 -
233 -But with Confluence, you can bring all that information into one place.
94 +19:00 - 21:00 Uhr (3D Druck Abend)
234 234  )))
235 -|(((
236 -[[Confluence 101: discuss work with your team>>url:https://www.atlassian.com/collaboration/confluence-discuss-work-with-your-team||shape="rect"]]
96 +|=(((
97 +Donnerstags
237 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.
99 +19:00 - 21:00 Uhr
239 239  )))
240 -|(((
241 -[[Confluence 101: create content with pages>>url:https://www.atlassian.com/collaboration/confluence-create-content-with-pages||shape="rect"]]
101 +|=(((
102 +Samstags
242 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
104 +16:00 - 18:00 Uhr
244 244  )))
245 245  
246 -(% style="font-size: 24.0px;line-height: 1.25;" %)**
247 -**
248 -
249 -(% style="font-size: 24.0px;line-height: 1.25;" %)**Tasks**
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}}
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 -)))
107 +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 +3801170
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/3801170/Welcome