Commit Graph

201 Commits (master)

Author SHA1 Message Date
Merlijn Sebrechts 15c77e3de4
Merge pull request #43 from evils/quote-0x20
Quote 0x20
2022-12-07 21:58:14 +01:00
Evils 2f839d01fa update statutes lookup instructions 2022-09-20 14:50:41 +02:00
Evils 3d1945114f quote 0x20 just like the other names 2022-09-20 14:44:01 +02:00
Merlijn Sebrechts dc4bbbb1f9
Merge pull request #42 from JurgenG/patch-1
Minor (not really relevant) typo
2022-05-25 15:44:48 +02:00
Merlijn Sebrechts 1f3b310b26
Merge pull request #40 from 0x20/galgalesh-patch-1
Announce membership applications on the Changelog
2021-11-28 20:43:23 +01:00
Merlijn Sebrechts 41fc896ecd
Merge pull request #41 from 0x20/galgalesh-patch-2
Formalize 1-week rule and clarify meeting process
2021-11-28 20:43:14 +01:00
Merlijn Sebrechts f60d323785
It can be any next meeting
Co-authored-by: evils <30512529+evils@users.noreply.github.com>
2021-11-14 17:09:50 +01:00
Merlijn Sebrechts 5b31e0962c
fix typo
Co-authored-by: evils <30512529+evils@users.noreply.github.com>
2021-11-14 17:07:59 +01:00
Merlijn Sebrechts 42525abc73
Formalize 1-week rule and clarify meeting process 2021-11-14 16:36:07 +01:00
Merlijn Sebrechts 10773a9793
Announce membership applications on the Changelog
Give not all members always read the meeting minutes, it's best to explicitly ask prospective members to announce their application on the Changelog. This way, everyone who keeps somewhat up-to-date with space matters will see who wants to become a member.
2021-11-14 15:49:47 +01:00
Merlijn Sebrechts 7245062a79
Merge pull request #39 from gynter/dual-licensing-issue
Resolve dual licensing conflict
2021-09-26 15:20:34 +02:00
Günter Kits 3e409ee052
Change LICENSE to correspond to CC BY-SA 4.0 International 2021-09-25 14:37:59 +03:00
Merlijn Sebrechts 7917d17e79
Merge pull request #38 from jnweiger/patch-1
typo in 2-do-ocracy.md
2021-01-26 18:01:55 +01:00
Jürgen Weigert ae4ed1d7f9
typo in 2-do-ocracy.md 2021-01-02 19:07:34 +01:00
Merlijn Sebrechts d82f66f2b0
Merge pull request #36 from mrosseel/patch-1
Update 6-guidelines.md
2019-10-29 23:27:31 +01:00
mrosseel 800122d99f
Update 6-guidelines.md
small fixes
2019-10-29 23:13:43 +01:00
Merlijn Sebrechts d4fb491443
Merge pull request #35 from Sasja/master
add reason why applicant should come to a meeting
2019-10-26 10:58:41 +02:00
sasja 206362b965 add reason why applicant should come to a meeting 2019-09-04 10:17:33 +02:00
Merlijn Sebrechts 575e422c74
Merge pull request #34 from Sasja/master
change wording of guidelines intro
2019-05-06 17:01:15 +02:00
sasja 844d7c5238 minor language tweak 2019-05-04 22:17:23 +02:00
sasja d9913d31da simplify and specify guidelines intro 2019-05-04 17:11:34 +02:00
sasja e7c6c318ff change wording of guidelines intro 2019-05-04 10:58:59 +02:00
Merlijn Sebrechts ae8f968743
Merge pull request #33 from Evils-Devils/master
proofread
2019-04-22 18:26:45 +02:00
Evils 901be7e605 a someone -> someone 2019-04-22 18:18:35 +02:00
Evils 303ef0d877 group of members -> meeting 2019-04-22 18:14:08 +02:00
Evils bb6526fb4d proofread 2019-04-22 17:52:04 +02:00
Merlijn Sebrechts fdca128cba Page numbers always on outside in booklet 2019-04-22 16:55:54 +02:00
Merlijn Sebrechts 95135bf87c Fixes 2019-04-22 16:37:11 +02:00
Merlijn Sebrechts 6dd23a911c new cover 2019-04-22 12:17:29 +02:00
Merlijn Sebrechts 4442885c45 added link to membership form and small fixes 2019-04-22 12:12:53 +02:00
Merlijn Sebrechts 467354da71
Merge pull request #31 from galgalesh/cleanup-14-04-2019
Cleanup
2019-04-14 21:30:11 +02:00
Merlijn Sebrechts 8e303daf91
Merge pull request #29 from galgalesh/master
Touch-up of guidelines
2019-04-14 21:27:52 +02:00
Merlijn Sebrechts 844a4763d5 custodian -> warden because GROAAAARGG 2019-04-14 20:08:31 +02:00
Merlijn Sebrechts b1fe0a3d91 Cleanup and better wording; added rest to overview 2019-04-14 19:37:48 +02:00
Merlijn Sebrechts bb0a85155d
Merge pull request #28 from galgalesh/master
Small fixes
2019-04-11 23:05:04 +02:00
Merlijn Sebrechts dc0440d65f touch-up of guidelines; better introduction, explanation and updates 2019-04-11 23:04:32 +02:00
Merlijn Sebrechts 70c891651c link directly to latest pdf and epub 2019-04-09 21:25:30 +02:00
Merlijn Sebrechts 5605d84b0b hackerspace ghent -> hackerspace Gent 2019-04-09 21:20:05 +02:00
Merlijn Sebrechts 9df24a7b03
Merge pull request #24 from 0x20/Sasja-patch-1
remove specific reference to space tools decided on meeting 153
2019-04-07 21:26:37 +02:00
Sasja f3dc9b2bfc
remove specific reference to space tools
this should make the document less specific to our space
and the 3D printer does not really belong to the space, and is not broken.
2019-03-27 14:13:36 +01:00
Merlijn Sebrechts 8d4be246fe fix links 2019-03-25 22:30:05 +01:00
Merlijn Sebrechts 8408b12df2 rename to "the hackerspace blueprint" 2019-03-25 22:20:32 +01:00
Merlijn Sebrechts 8dc4a86429 added epub version 2019-03-19 22:07:31 +01:00
Merlijn Sebrechts 17eca60e35 Merge branch 'master' of github.com:0x20/HTH 2019-03-19 21:11:10 +01:00
Merlijn Sebrechts 24c05453f0 preparation for ebook 2019-03-19 21:11:03 +01:00
Merlijn Sebrechts 4b93bf63ee
Merge pull request #23 from galgalesh/master
Reworked membership based on HTH 2018-11-17
2019-03-10 21:09:44 +01:00
Merlijn Sebrechts cea1f4631a rephrased to not suggest questions will be asked on the deciding meeting 2019-02-06 12:19:34 +01:00
Merlijn Sebrechts 6341ccaeac
Merge pull request #4 from Evils-Devils/master
rephrase point 2 of the membership procedure
2019-02-06 12:11:07 +01:00
Evils 6877a59522 rephrase point 2 of the membership procedure 2019-02-04 06:43:52 +01:00
Merlijn Sebrechts b1ae4a743c first stab at writing down the new membership procedure 2019-01-31 20:57:31 +01:00