Zum Inhalt springen

Änderungen von Dokument Der Verein

Zuletzt geändert von Mike Schneider am 2025/09/16 19:33
Von Version Icon 6.1 Icon
bearbeitet von Admin
am 2019/11/21 19:11
Änderungskommentar: Es gibt keinen Kommentar für diese Version
Auf Version Icon 27.1 Icon
bearbeitet von Daniel Herrmann
am 2020/01/12 01:05
Ä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,142 +15,106 @@
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  
18 -----
19 -
20 20  \\
21 21  
22 -(% style="font-size: 24.0px;letter-spacing: -0.01em;" %)**Wichtigste Ansprechpartner**
12 +----
23 23  
14 += {{id name="Welcome-UnserVorstand"/}}Unser Vorstand =
15 +
24 24  (% class="wrapped" %)
25 25  |(((
26 26  (% class="content-wrapper" %)
27 27  (((
28 28  (% style="text-align: center;" %)
29 -[[image:attach:Harvey.jpg||thumbnail="true" width="100"]]
21 +[[image:attach:_ms_nico-neumann.png||thumbnail="true" height="150"]]
30 30  
31 31  (% style="text-align: center;" %)
32 -**Harvey Honner-white
33 -**Team Lead** **
24 +**Nico Neumann
25 +**Vorsitzender
26 +Öffentl./Kommunikation
34 34  )))
35 35  )))|(((
36 36  (% class="content-wrapper" %)
37 37  (((
38 38  (% style="text-align: center;" %)
39 -[[image:attach:Alana.jpg||thumbnail="true" width="100"]]
32 +[[image:attach:_ms_antje-schreiber.png||thumbnail="true" height="150"]]
40 40  
41 41  (% style="text-align: center;" %)
42 -**Alana Baczewski
43 - **Tech Lead
35 +**Antje Schreiber**
36 +Mitgliederverwaltung
37 +Organisation/Struktur
44 44  )))
45 45  )))|(((
46 46  (% class="content-wrapper" %)
47 47  (((
48 -(% style="text-align: center;" %)
49 -[[image:attach:Sameer.jpg||thumbnail="true" width="100"]]
42 +[[image:attach:_ms_jan-schuhmacher.png||thumbnail="true" height="150"]]
50 50  
51 51  (% style="text-align: center;" %)
52 -**Sameer Farrell
53 - **Marketing
45 +(% style="text-align: center;letter-spacing: 0.0px;" %)**Jan Schuhmacher**(% style="letter-spacing: 0.0px;" %)
46 +Offene Werkstatt
47 +Inventar
54 54  )))
55 55  )))|(((
56 56  (% class="content-wrapper" %)
57 57  (((
58 58  (% style="text-align: center;" %)
59 -[[image:attach:Cassie.jpg||thumbnail="true" width="100"]]
53 +[[image:attach:_ms_roman-shuf.png||thumbnail="true" height="150"]]
60 60  
61 61  (% style="text-align: center;" %)
62 -**Mia Bednarczyk
63 - **Recruitment
56 +**Roman Shuf**
57 +Raumbeauftragter
58 +Sicherheit / Einweisungen
64 64  )))
65 65  )))
66 66  
67 -\\
62 += {{id name="Welcome-Suche"/}}Suche =
68 68  
69 -= {{id name="Welcome-Roadmap"/}}**Roadmap** =
64 += {{id name="Welcome-"/}} =
70 70  
71 -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"]].
66 +{{locationSearch reference="MD" showExcerpts="false" width="100%"/}}
72 72  
73 -{{confluence_roadmap timeline="true" source="%7B%22title%22%3A%22Roadmap%20Planner%22%2C%22timeline%22%3A%7B%22startDate%22%3A%222019-11-21%2000%3A00%3A00%22%2C%22endDate%22%3A%222020-10-21%2000%3A00%3A00%22%2C%22displayOption%22%3A%22MONTH%22%7D%2C%22lanes%22%3A%5B%7B%22title%22%3A%22Verein%22%2C%22color%22%3A%7B%22lane%22%3A%22%23f6c342%22%2C%22bar%22%3A%22%23fadb8e%22%2C%22text%22%3A%22%23594300%22%2C%22count%22%3A1%7D%2C%22bars%22%3A%5B%7B%22title%22%3A%22Test1%22%2C%22description%22%3A%22This%20is%20the%20first%20bar.%22%2C%22startDate%22%3A%222019-11-26%2020%3A11%3A52%22%2C%22duration%22%3A2%2C%22rowIndex%22%3A0%2C%22id%22%3A%22a3872b7b-d89b-41b7-a87f-2827b26477fd%22%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22title%22%3A%22Something%20Different%22%2C%22description%22%3A%22This%20is%20the%20second%20bar.%22%2C%22startDate%22%3A%222020-01-21%2013%3A32%3A40%22%2C%22duration%22%3A1%2C%22rowIndex%22%3A1%2C%22id%22%3A%2288d0e1ef-5036-49a1-8137-ce87257f4c09%22%2C%22pageLink%22%3A%7B%7D%7D%5D%7D%2C%7B%22title%22%3A%22Metallwerkstatt%22%2C%22color%22%3A%7B%22lane%22%3A%22%233b7fc4%22%2C%22bar%22%3A%22%236c9fd3%22%2C%22text%22%3A%22%23ffffff%22%2C%22count%22%3A1%7D%2C%22bars%22%3A%5B%7B%22title%22%3A%22CNC%20Fr%C3%A4se%22%2C%22description%22%3A%22This%20is%20the%20third%20bar.%22%2C%22startDate%22%3A%222019-11-01%2007%3A07%3A43%22%2C%22duration%22%3A2.5%2C%22rowIndex%22%3A0%2C%22id%22%3A%2268d22371-ae27-4f9b-9ee1-38b520511d85%22%2C%22pageLink%22%3A%7B%7D%7D%5D%7D%5D%2C%22markers%22%3A%5B%7B%22title%22%3A%22Heute%22%2C%22markerDate%22%3A%222019-11-15%2000%3A00%3A00%22%7D%5D%7D" title="Roadmap%20Planner" hash="bcc90a3a5229ba8f00c86bbc8b90421d"/}}
68 +\\
69 +{{/confluence_layout-cell}}
74 74  
75 -= {{id name="Welcome-Knowyourspaces"/}}**Know your spaces** =
71 +{{confluence_layout-cell}}
72 +----
76 76  
77 -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.
74 += {{id name="Welcome-GettingStarted"/}}Getting Started =
78 78  
79 -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.
76 +Hier sind einige wichtige Links zusammengefasst, die dir den Einstieg ins Vereinsleben und der Dokumentation erleichtern sollen:
80 80  
81 -= {{id name="Welcome-Knowyourpages"/}}**Know your pages** =
78 +{{confluence_contentbylabel showLabels="false" showSpace="false" title="Quick Links" cql="label = ~"lbl-quick-link~""/}}
82 82  
83 -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.
80 +----
84 84  
85 -Learn more by reading [[Confluence 101: organize your work in spaces>>url:https://www.atlassian.com/collaboration/confluence-organize-work-in-spaces||shape="rect"]]
82 += {{id name="Welcome-Slack"/}}Slack =
86 86  
87 -\\
84 +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"]]
88 88  
89 89  ----
90 -{{/confluence_layout-cell}}
91 91  
92 -{{confluence_layout-cell}}
93 -= {{id name="Welcome-Quicknavigation"/}}**Quick navigation** =
88 += {{id name="Welcome-OffeneWerkstatt"/}}Offene Werkstatt =
94 94  
95 -Hier sind einige wichtige Links zusammengefasst, die dir den Einstieg ins Vereinsleben und der Dokumentation erleichtern sollen:
90 +Du willst uns kennenlernen und einfach mal reinschnuppern? Komm zu unseren offenen Werkstattzeiten vorbei! Diese sind momentan:
96 96  
97 -{{confluence_contentbylabel showLabels="false" showSpace="false" title="Quick Links" cql="label = ~"lbl-quick-link~""/}}
98 -
99 -= {{id name="Welcome-Usefullinks"/}}**Useful links** =
100 -
101 101  (% class="wrapped" %)
102 102  |=(((
103 -Link
104 -)))|=(((
105 -Description
106 -)))
107 -|(((
108 -[[Confluence 101: organize your work in spaces>>url:https://www.atlassian.com/collaboration/confluence-organize-work-in-spaces||shape="rect"]]
94 +Dienstags
109 109  )))|(((
110 -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.
111 -
112 -But with Confluence, you can bring all that information into one place.
96 +19:00 - 21:00 Uhr (3D Druck Abend)
113 113  )))
114 -|(((
115 -[[Confluence 101: discuss work with your team>>url:https://www.atlassian.com/collaboration/confluence-discuss-work-with-your-team||shape="rect"]]
98 +|=(((
99 +Donnerstags
116 116  )))|(((
117 -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.
101 +19:00 - 21:00 Uhr
118 118  )))
119 -|(((
120 -[[Confluence 101: create content with pages>>url:https://www.atlassian.com/collaboration/confluence-create-content-with-pages||shape="rect"]]
103 +|=(((
104 +Samstags
121 121  )))|(((
122 -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
106 +16:00 - 18:00 Uhr
123 123  )))
124 124  
125 -(% style="font-size: 24.0px;line-height: 1.25;" %)**
126 -**
127 -
128 -(% style="font-size: 24.0px;line-height: 1.25;" %)**Tasks**
129 -
130 -(% class="wrapped" %)
131 -|(((
132 -(% class="content-wrapper" %)
133 -(((
134 -(% class="task-list" %)
135 -(((
136 -{{task reference="/Tasks/Task_59" status="InProgress"}}
137 -[[Customize the name, colour, and icon of Confluence>>url:https://confluence.atlassian.com/x/NgszKw||shape="rect"]].
138 -{{/task}}
139 -
140 -{{task reference="/Tasks/Task_56" status="InProgress"}}
141 -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"]].
142 -{{/task}}
143 -
144 -{{task reference="/Tasks/Task_57" status="InProgress"}}
145 -Try adding an [[inline comment>>url:https://confluence.atlassian.com/x/2yAC||shape="rect"]] by highlighting some text and click the comment icon.
146 -{{/task}}
147 -
148 -{{task reference="/Tasks/Task_58" status="InProgress"}}
149 -Learn more about [[inviting your team to Confluence>>url:https://confluence.atlassian.com/x/SRwC||shape="rect"]].
150 -{{/task}}
151 -)))
152 -)))
153 -)))
109 +Weitere Termine findest du auch immer im [[Veranstaltungskalender unserer Homepage>>url:https://www.makerspace-darmstadt.de/termine||shape="rect"]]!
154 154  {{/confluence_layout-cell}}
155 155  {{/confluence_layout-section}}
156 156  {{/confluence_layout}}
Icon Confluence.Code.ConfluencePageClass[0]
Id
... ... @@ -1,1 +1,1 @@
1 -1146894
1 +3801169
URL
... ... @@ -1,1 +1,1 @@
1 -https://wiki.makerspace-darmstadt.de/spaces/MD/pages/1146894/Welcome
1 +https://wiki.makerspace-darmstadt.de/spaces/MD/pages/3801169/Welcome