1
0
Fork 0
forked from Squatconf/Talks
Commit graph

67 commits

Author SHA1 Message Date
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
Jérôme Loï 2d36732ba5 moved leap talk to confirmed 2014-11-03 11:17:25 +01:00
gorhgorh 4cbf9d69ad Merge pull request #19 from joates/master
changed presentation title
2014-11-03 11:14:55 +01:00
joates 77887a26c6 changed presentation title 2014-11-03 10:02:01 +00:00
Jérôme Loï af1345c7ba move removed the web to confirmed 2014-11-01 08:07:46 +01:00
joates 92d14c4149 01-Nov-2014: closing CfP 2014-11-01 06:15:56 +00:00
Julian Oates 114a68a70b Merge pull request #17 from substack/master
reboot the web
2014-11-01 06:07:15 +00:00
James Halliday 8a8635354f reboot the web 2014-10-31 17:33:00 -07:00
gorhgorh 95413add6d Merge pull request #15 from frankrousseau/master
Cozy talk proposal
2014-10-31 19:54:54 +01:00
Jérôme Loï c651f03f57 added ble talk to accepted 2014-10-31 19:41:56 +01:00
gorhgorh 99544020ce Merge pull request #16 from programmarchy/master
bluetooth le talk
2014-10-31 09:30:29 +01:00
Donald Ness 47ff157ff3 edit bluetooth le talk proposal 2014-10-30 23:08:45 -06:00
Donald Ness 562f04fddb propose bluetooth le talk 2014-10-30 22:55:01 -06:00
Jérôme Loï 22061b2870 Updated confirmed talks 2014-10-27 13:28:14 +01:00
Jérôme Loï f345a00aff Merge branch 'master' of https://github.com/squatconf/talks
# By holger krekel (2) and others
# Via gorhgorh (3) and Dominic Tarr (2)
* 'master' of https://github.com/squatconf/talks:
  actually add some content to my proposal
  add LEAP talk proposal
  some refinements
  added my talk
  Added edgenet proposal
2014-10-26 23:39:20 +01:00
Jérôme Loï b48404a964 update accepted talks 2014-10-26 23:38:49 +01:00
Frank e0ff3f0e46 Add Cozy proposal 2014-10-25 15:56:37 +02:00
Dominic Tarr 40467abc2c Merge pull request #14 from dominictarr/master
actually add some content to my proposal
2014-10-23 16:46:17 +01:00
Dominic Tarr 54e24be6f2 actually add some content to my proposal 2014-10-23 16:42:21 +01:00
gorhgorh 936d565172 Merge pull request #13 from kalikaneko/master
add LEAP talk proposal
2014-10-20 14:36:25 +02:00
Kali Kaneko 7199ee5566 add LEAP talk proposal 2014-10-20 14:25:24 +02:00
gorhgorh cb4af0d714 Merge pull request #12 from hpk42/master
Secession from the broadcast
2014-10-20 12:44:27 +02:00
holger krekel 1bac7486a3 some refinements 2014-10-20 12:34:42 +02:00
holger krekel 5af729f36b added my talk 2014-10-20 12:10:35 +02:00
gorhgorh 74070a0c87 Merge pull request #11 from hintjens/master
Added edgenet proposal
2014-10-19 22:59:24 +02:00
Pieter Hintjens 4376ca2d5a Added edgenet proposal 2014-10-19 20:57:51 +02:00
Julian Oates 6b397c2f62 Merge pull request #10 from hhalpin/mytalk
added W3C Web Crypto talk
2014-10-18 20:23:52 +01:00
hhalpin c702406936 added W3C Web Crypto talk 2014-10-18 11:53:42 +02:00
joates 483c05a39f fruit 2014-10-17 20:46:05 +01:00
joates eff7a3d3b8 vegetables 2014-10-17 20:45:47 +01:00
Julian Oates 3d6609a04f Merge pull request #8 from layerzerolabs/master
AquaPionics proposal
2014-10-07 20:01:44 +01:00
layerzerolabs fe7418b11f AquaPIonics proposal 2014-10-07 18:51:21 +01:00
gorhgorh b6da3a28fc Merge pull request #6 from No9/master
proposal no9
2014-10-03 13:08:00 +02:00
gorhgorh aaadafc82d Merge pull request #5 from bengl/master
pirateradio.js proposal. yarrr!!
2014-10-03 13:07:06 +02:00
Anton Whalley 1fce455051 Added Live Demo for the craic 2014-10-03 02:16:38 +01:00
no9 43874a31c6 Proposal for UDT Talk 2014-10-03 02:00:05 +01:00