Commit Graph

182 Commits (575e422c7434d531baf59fa22fbcd7522311ae01)

Author SHA1 Message Date
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
Merlijn Sebrechts 132c296c09 Added 2018-11-17 HTH discussion to legacy 2019-01-31 20:53:02 +01:00
Merlijn Sebrechts 46b1c519c5
Merge pull request #22 from JensTimmerman/patch-1
Update 3-meetings.md
2018-09-10 10:40:37 +02:00
Jens Timmerman 63c2051cc6
Update 3-meetings.md 2018-09-08 13:30:24 +02:00
Merlijn Sebrechts 26b3d4856f
white cover 2018-08-05 18:41:07 +02:00
Merlijn Sebrechts 45f25e07fe
white cover 2018-08-05 18:40:26 +02:00
Merlijn Sebrechts 16a6b94095 Merge branch 'pandoc' 2018-07-29 18:41:59 +02:00
Merlijn Sebrechts f4e5bcccf3 added booklet and back 2018-07-29 17:38:14 +02:00
Merlijn Sebrechts ede4e1ee9a Merge branch 'master' of github.com:0x20/HTH 2018-07-06 13:21:55 -07:00
Merlijn Sebrechts 9488847576
Added latex dependencies 2018-07-06 13:21:35 -07:00
Merlijn Sebrechts 694858c1bc My first shot at explaining the do-ocracy better. 2018-06-09 20:25:17 +02:00
Merlijn Sebrechts 9418fba7f7 Added better cover and fixed licensing. I changed the main license from GPLv2 to CC-BY-SA since the licenses are in spirit very similar but CC-BY-SA is more fit for documents. 2018-06-09 20:12:48 +02:00
Merlijn Sebrechts 1cfe63defa added cover 2018-06-01 10:50:10 +02:00
Merlijn Sebrechts d9390a96e3 spell check 2018-06-01 10:50:02 +02:00
Merlijn Sebrechts f6bd561c7b added eisvogel template 2018-05-27 18:23:09 +02:00
Merlijn Sebrechts 59c29459b8 Link to built PDF 2018-05-27 00:18:19 +02:00
Merlijn Sebrechts 4dd8d72064 PDF release 2018-05-27 00:07:23 +02:00
Merlijn Sebrechts 194da448ab first try for travis 2018-05-26 22:53:11 +02:00
Merlijn Sebrechts 71cc2c8985
Merge pull request #12 from galgalesh/pandoc
book+website, updated meeting and statutes explanation
2018-05-21 21:42:07 +02:00