Zum Inhalt springen

Änderungen von Dokument Der Verein

Zuletzt geändert von Mike Schneider am 2025/09/16 19:33
Von Version Icon 9.1 Icon
bearbeitet von ff8080816e8eea3f016e8ef83e5a0000
am 2019/11/26 08:11
Änderungskommentar: Es gibt keinen Kommentar für diese Version
Auf Version 1.1 Icon
bearbeitet von superadmin
am 2019/11/20 20:53
Änderungskommentar: Es gibt keinen Kommentar für diese Version

Zusammenfassung

Details

Icon Seiteneigenschaften
Titel
... ... @@ -1,1 +1,1 @@
1 -Welcome
1 +Makerspace Darmstadt
Dokument-Autor
... ... @@ -1,1 +1,1 @@
1 -XWiki.ff8080816e8eea3f016e8ef83e5a0000
1 +XWiki.superadmin
Inhalt
... ... @@ -1,9 +1,17 @@
1 1  {{confluence_layout}}
2 2  {{confluence_layout-section ac:type="single"}}
3 3  {{confluence_layout-cell}}
4 -[[image:attach:msd.png]]
4 +{{confluence_tip}}
5 +Welcome to your first space. Go ahead, edit and customize this home page any way you like. We've added some sample content to get you started.
6 +{{/confluence_tip}}
7 +{{/confluence_layout-cell}}
8 +{{/confluence_layout-section}}
5 5  
6 -\\
10 +{{confluence_layout-section ac:type="single"}}
11 +{{confluence_layout-cell}}
12 +[[image:attach:peak.jpeg]]
13 +
14 +
7 7  {{/confluence_layout-cell}}
8 8  {{/confluence_layout-section}}
9 9  
... ... @@ -11,24 +11,17 @@
11 11  {{confluence_layout-cell}}
12 12  ----
13 13  
14 -= {{id name="Welcome-WillkommenimMakerspaceDarmstadt!"/}}**Willkommen im Makerspace Darmstadt!** =
22 += {{id name="Welcome-Goal"/}}**Goal** =
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.// ==
24 +== {{id name="Welcome-Yourspacehomepageshouldsummarizewhatthespaceisfor,andprovidelinkstokeyresourcesforyourteam."/}}//Your space homepage should summarize what the space is for, and provide links to key resources for your team. // ==
17 17  
18 -\\
19 -
20 -//Der Rest ist Test//
21 -
22 22  ----
23 23  
24 -\\
28 +
25 25  
26 -(% style="font-size: 24.0px;letter-spacing: -0.01em;" %)**Wichtigste Ansprechpartner**
30 += {{id name="Welcome-Coreteam"/}}**Core team** =
27 27  
28 -(% class="wrapped" %)
29 29  |(((
30 -(% class="content-wrapper" %)
31 -(((
32 32  (% style="text-align: center;" %)
33 33  [[image:attach:Harvey.jpg||thumbnail="true" width="100"]]
34 34  
... ... @@ -35,10 +35,7 @@
35 35  (% style="text-align: center;" %)
36 36  **Harvey Honner-white
37 37  **Team Lead** **
38 -)))
39 39  )))|(((
40 -(% class="content-wrapper" %)
41 -(((
42 42  (% style="text-align: center;" %)
43 43  [[image:attach:Alana.jpg||thumbnail="true" width="100"]]
44 44  
... ... @@ -45,10 +45,7 @@
45 45  (% style="text-align: center;" %)
46 46  **Alana Baczewski
47 47   **Tech Lead
48 -)))
49 49  )))|(((
50 -(% class="content-wrapper" %)
51 -(((
52 52  (% style="text-align: center;" %)
53 53  [[image:attach:Sameer.jpg||thumbnail="true" width="100"]]
54 54  
... ... @@ -55,10 +55,7 @@
55 55  (% style="text-align: center;" %)
56 56  **Sameer Farrell
57 57   **Marketing
58 -)))
59 59  )))|(((
60 -(% class="content-wrapper" %)
61 -(((
62 62  (% style="text-align: center;" %)
63 63  [[image:attach:Cassie.jpg||thumbnail="true" width="100"]]
64 64  
... ... @@ -66,16 +66,17 @@
66 66  **Mia Bednarczyk
67 67   **Recruitment
68 68  )))
69 -)))
70 70  
71 -\\
62 +
72 72  
73 73  = {{id name="Welcome-Roadmap"/}}**Roadmap** =
74 74  
75 75  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"]].
76 76  
77 -{{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%2C%7B%22title%22%3A%22Gr%C3%BCn%22%2C%22color%22%3A%7B%22lane%22%3A%22%238eb021%22%2C%22bar%22%3A%22%23aac459%22%2C%22text%22%3A%22%23ffffff%22%2C%22count%22%3A1%7D%2C%22bars%22%3A%5B%7B%22rowIndex%22%3A0%2C%22startDate%22%3A%222019-11-01%2021%3A23%3A10%22%2C%22id%22%3A%22add00c9f-d55c-479f-8081-920e623759fb%22%2C%22title%22%3A%22Neue%20Leiste%22%2C%22description%22%3A%22Dies%20ist%20ein%20Test%22%2C%22duration%22%3A1%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="62914bfede9c84a4ed318c2893899af7"/}}
68 +{{confluence_roadmap timeline="true" source="%7B%22title%22%3A%22Roadmap%20Planner%22%2C%22timeline%22%3A%7B%22startDate%22%3A%222015-06-01%2000%3A00%3A00%22%2C%22endDate%22%3A%222015-12-31%2000%3A00%3A00%22%2C%22displayOption%22%3A%22MONTH%22%7D%2C%22lanes%22%3A%5B%7B%22title%22%3A%22Marketing%22%2C%22color%22%3A%7B%22lane%22%3A%22%23f15c75%22%2C%22bar%22%3A%22%23f58598%22%2C%22text%22%3A%22%23ffffff%22%2C%22count%22%3A1%7D%2C%22bars%22%3A%5B%7B%22title%22%3A%22Social%20campaign%22%2C%22description%22%3A%22Add%20a%20description%20to%20your%20bars%20here.%22%2C%22startDate%22%3A%222015-07-30%2011%3A10%3A05%22%2C%22duration%22%3A3.6435643564356437%2C%22rowIndex%22%3A0%2C%22id%22%3A%22e703c6a8-1649-4d20-9ccf-2c7a8698e385%22%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22title%22%3A%22Website%20development%22%2C%22description%22%3A%22Add%20a%20description%20to%20your%20bars%20here.%22%2C%22startDate%22%3A%222015-07-17%2006%3A24%3A57%22%2C%22duration%22%3A3.3069306930693068%2C%22rowIndex%22%3A1%2C%22id%22%3A%22655d454d-b701-4584-a301-9ea0bb86ed32%22%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22rowIndex%22%3A2%2C%22startDate%22%3A%222015-06-01%2000%3A00%3A00%22%2C%22id%22%3A%22c420ef33-ae28-4828-958f-8a9d793153b3%22%2C%22title%22%3A%22Crowdfunding%20campaign%22%2C%22description%22%3A%22Add%20a%20description%20to%20your%20bars%20here.%22%2C%22duration%22%3A2.5544554455445545%2C%22pageLink%22%3A%7B%7D%7D%5D%7D%2C%7B%22title%22%3A%22People%22%2C%22color%22%3A%7B%22lane%22%3A%22%23654982%22%2C%22bar%22%3A%22%238c77a1%22%2C%22text%22%3A%22%23ffffff%22%2C%22count%22%3A1%7D%2C%22bars%22%3A%5B%7B%22title%22%3A%22Recruitment%22%2C%22description%22%3A%22%22%2C%22startDate%22%3A%222015-06-01%2000%3A00%3A00%22%2C%22duration%22%3A2.5%2C%22rowIndex%22%3A0%2C%22id%22%3A%221230bab8-718c-47da-903a-2cbdcb220d97%22%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22rowIndex%22%3A0%2C%22startDate%22%3A%222015-08-17%2013%3A46%3A55%22%2C%22id%22%3A%228639d09c-59d1-4d1f-ad91-c78f04b20135%22%2C%22title%22%3A%22Assessment%20Period%22%2C%22description%22%3A%22%22%2C%22duration%22%3A2.910891089108911%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22rowIndex%22%3A1%2C%22startDate%22%3A%222015-09-01%2021%3A23%3A10%22%2C%22id%22%3A%22802b53f7-ba66-4415-984d-efef93b4caec%22%2C%22title%22%3A%22Training%22%2C%22description%22%3A%22%22%2C%22duration%22%3A2.5841584158415842%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22rowIndex%22%3A0%2C%22startDate%22%3A%222015-11-15%2006%3A10%3A41%22%2C%22id%22%3A%22502fac56-3849-415f-b412-af27c39229b7%22%2C%22title%22%3A%22Finalisation%22%2C%22description%22%3A%22%22%2C%22duration%22%3A1.4356435643564356%2C%22pageLink%22%3A%7B%7D%7D%5D%7D%2C%7B%22title%22%3A%22Product%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%22rowIndex%22%3A0%2C%22startDate%22%3A%222015-06-24%2004%3A02%3A22%22%2C%22id%22%3A%2200ada54b-0998-41a5-aa98-712ecdec8c7f%22%2C%22title%22%3A%22Planning%22%2C%22description%22%3A%22%22%2C%22duration%22%3A2.1782178217821784%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22rowIndex%22%3A0%2C%22startDate%22%3A%222015-08-31%2001%3A54%3A03%22%2C%22id%22%3A%2271967f2c-f3ab-4871-aaf5-7cf31389e62f%22%2C%22title%22%3A%22Development%22%2C%22description%22%3A%22%22%2C%22duration%22%3A1.9207920792079207%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22rowIndex%22%3A0%2C%22startDate%22%3A%222015-10-29%2013%3A04%3A09%22%2C%22id%22%3A%22d76ac773-3ee7-495b-9d7f-1daf267dc58c%22%2C%22title%22%3A%22Testing%22%2C%22description%22%3A%22%22%2C%22duration%22%3A1%2C%22pageLink%22%3A%7B%7D%7D%2C%7B%22rowIndex%22%3A0%2C%22startDate%22%3A%222015-11-30%2002%3A36%3A49%22%2C%22id%22%3A%224f584dc6-63b8-4efa-a98e-a5d7bbe9910e%22%2C%22title%22%3A%22Deploy%22%2C%22description%22%3A%22%22%2C%22duration%22%3A1.0297029702970297%2C%22pageLink%22%3A%7B%7D%7D%5D%7D%5D%2C%22markers%22%3A%5B%7B%22title%22%3A%22Yearly%20Finalisation%22%2C%22markerDate%22%3A%222015-11-29%2012%3A21%3A23%22%7D%5D%7D" title="Roadmap%20Planner" hash="f0477dfac6f6ca380d8c5f2f44041947"/}}
78 78  
70 +
71 +
79 79  = {{id name="Welcome-Knowyourspaces"/}}**Know your spaces** =
80 80  
81 81  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.
... ... @@ -86,11 +86,9 @@
86 86  
87 87  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.
88 88  
89 -This is a test: [[Pagelink>>confluencePage:page:MD.Testpage 2]]
90 -
91 91  Learn more by reading [[Confluence 101: organize your work in spaces>>url:https://www.atlassian.com/collaboration/confluence-organize-work-in-spaces||shape="rect"]]
92 92  
93 -\\
84 +
94 94  
95 95  ----
96 96  {{/confluence_layout-cell}}
... ... @@ -98,13 +98,12 @@
98 98  {{confluence_layout-cell}}
99 99  = {{id name="Welcome-Quicknavigation"/}}**Quick navigation** =
100 100  
101 -Hier sind einige wichtige Links zusammengefasst, die dir den Einstieg ins Vereinsleben und der Dokumentation erleichtern sollen:
92 +When you create new pages in this space, they'll appear here automatically.
102 102  
103 -{{confluence_contentbylabel showLabels="false" showSpace="false" title="Quick Links" cql="label = ~"lbl-quick-link~""/}}
94 +{{children/}}
104 104  
105 105  = {{id name="Welcome-Usefullinks"/}}**Useful links** =
106 106  
107 -(% class="wrapped" %)
108 108  |=(((
109 109  Link
110 110  )))|=(((
... ... @@ -133,10 +133,7 @@
133 133  
134 134  (% style="font-size: 24.0px;line-height: 1.25;" %)**Tasks**
135 135  
136 -(% class="wrapped" %)
137 137  |(((
138 -(% class="content-wrapper" %)
139 -(((
140 140  (% class="task-list" %)
141 141  (((
142 142  {{task reference="/Tasks/Task_59" status="InProgress"}}
... ... @@ -156,7 +156,6 @@
156 156  {{/task}}
157 157  )))
158 158  )))
159 -)))
160 160  {{/confluence_layout-cell}}
161 161  {{/confluence_layout-section}}
162 162  {{/confluence_layout}}
Icon Confluence.Code.ConfluencePageClass[0]
Id
... ... @@ -1,1 +1,1 @@
1 -1146910
1 +327712
Title
... ... @@ -1,1 +1,1 @@
1 -Welcome
1 +Makerspace Darmstadt
URL
... ... @@ -1,1 +1,1 @@
1 -https://wiki.makerspace-darmstadt.de/spaces/MD/pages/1146910/Welcome
1 +https://wiki.makerspace-darmstadt.de/spaces/MD/pages/327712/Makerspace Darmstadt