Commit graph

102 commits

Author SHA1 Message Date
gorhgorh d081d478a9 cleanup and update 2016-04-25 12:33:33 +02:00
gorhgorh c78625174b closing cfp 2016-04-25 11:27:14 +02:00
gorhgorh ca46b96661 added unix & holistic technologies 2016-04-24 09:34:46 +02:00
holger krekel 5230cda30a second round of accepted talks 2016-04-23 13:27:07 +02:00
gorhgorh 300c28374d Merge branch 'master' of hpk42/Talks into master 2016-04-23 02:32:18 -04:00
holger krekel 921494b2c8 add talk suggestion 2016-04-22 14:12:03 +02:00
gorhgorh 0eba0dd96f Merge branch 'master' of adam.ierymenko/Talks into master 2016-04-22 02:19:51 -04:00
Adam Ierymenko 29c9d7fc2e Talk for Adam Ierymenko 2016-04-21 20:48:28 -07:00
gorhgorh 2212af95dd added peergos talk 2016-04-21 21:28:54 +02:00
gorhgorh 4de6de02c7 apathy and my pet project talk 2016-04-17 23:02:20 +02:00
gorhgorh 6dd1e34935 added No second (life) chances talk 2016-04-17 22:55:17 +02:00
gorhgorh a82bc83469 first round of accepted talks 2016-04-17 22:36:02 +02:00
gorhgorh 7b23bee048 added dcht00 talk 2016-04-14 23:31:06 +02:00
gorhgorh 3891d006ac added Toolbox for Cybernetic Totalitarianism talk 2016-04-14 22:37:48 +02:00
gorhgorh 05097e6eb2 added federated wiki talk 2016-04-14 22:28:33 +02:00
gorhgorh 216470746c Merge branch 'master' of dmytri/Talks into master 2016-04-14 16:23:08 -04:00
Dmytri Kleiner 0fb0c7bba2 add Mr. Peel Goes To Cyberspace 2016-04-12 15:27:11 +02:00
gorhgorh ddb818c3d9 added Jan Goslicki talk from email 2016-04-11 14:22:46 +02:00
gorhgorh cf0240af0f Merge branch 'master' of realitygaps/Talks into master 2016-04-08 10:10:40 -04:00
realitygaps 90aa136c59 Adding host@home talk 2016-04-08 14:45:28 +02:00
realitygaps 7393faf9d4 Adding marinas talk from pad to git repo 2016-04-08 14:45:03 +02:00
realitygaps 89b7d87c8c Adding subtacks talk from pad to git repo 2016-04-08 14:42:46 +02:00
gorhgorh a4e05c15e1 Merge branch 'master' of hoegrammer/Talks into master 2016-04-05 05:10:27 -04:00
Naomi Rosenberg 590c81f27b Proposed talk on refactoring 2016-04-02 21:52:52 +01:00
Caleb James DeLisle 05750007df Proposed lecture: How to ruin a community in 3 easy steps 2016-03-08 09:54:01 +01:00
gorhgorh b8506af979 Merge pull request #25 from dignifiedquire/fix/minor-edits
Minor copy cleanup
2016-03-06 21:20:32 +01:00
gorhgorh 2299774504 Merge pull request #26 from dignifiedquire/talk/dignifiedquiere
Talk Proposal - Privileged Service
2016-03-06 21:20:18 +01:00
dignifiedquire 16b9890cda Minor copy cleanup 2016-03-06 21:15:50 +01:00
dignifiedquire 64d4935f38 Propose privileged service 2016-03-06 21:12:02 +01:00
gorhgorh a88fd50c98 Update README.md 2016-03-06 21:08:35 +01:00
gorhgorh 3d8166dee9 Update README.md 2016-03-06 21:04:33 +01:00
gorhgorh eff11d99bf fixed link 2016-03-06 21:03:58 +01:00
gorhgorh f4dd3fe8d8 fixed links 2016-03-06 21:00:39 +01:00
gorhgorh 9afcc7170d fixed wrong email 2016-03-06 20:47:20 +01:00
gorhgorh 08b31147fe fix typo, added mail infos 2016-03-05 22:36:27 +01:00
gorhgorh f14b16e1d5 2016 2016-03-05 15:37:55 +01:00
joates 086b72a78b post event cleanup 2015-01-10 15:07:06 +00:00
Jérôme Loï 4656a05899 removed the ones that canceled 2014-11-14 18:29:32 +01:00
gorhgorh 82b2981702 Merge pull request #23 from cjdelisle/master
Change the name of the lecture
2014-11-05 18:18:13 +01:00
Caleb James DeLisle fa9fc7c3ff Change the name of the lecture 2014-11-05 17:17:58 +01:00
Jérôme Loï e401134466 cleanup 2014-11-05 15:10:07 +01:00
Jérôme Loï d298a57c22 adding 'secession from broadcast' talk 2014-11-05 15:09:52 +01:00
Jérôme Loï 5d3d7a6292 talk switch ! 2014-11-05 15:09:19 +01:00
gorhgorh 3f216db29d Merge pull request #22 from cjdelisle/master
United as one, divided by zero
2014-11-05 14:26:40 +01:00
Caleb James DeLisle c359a06bb7 United as one, divided by zero 2014-11-05 10:07:37 +01:00
Julian Oates 84d58f9f61 Merge pull request #21 from genjix/master
updated my talk
2014-11-05 07:31:21 +00:00
Amir Taaki 3eb09b871c updated my talk 2014-11-05 00:31:57 +00:00
gorhgorh 5e5e5b25e0 Merge pull request #20 from genjix/master
darkwallet!
2014-11-05 01:10:33 +01:00
Amir Taaki 6fc5dfd241 darkwallet! 2014-11-05 00:03:24 +00:00
Jérôme Loï 32e1ed68bc updated joates's talk move to confirmed 2014-11-03 11:18:11 +01:00