1
0
Fork 0
forked from Squatconf/Talks
Commit graph

39 commits

Author SHA1 Message Date
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
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
Bryan English 73fc1496a0 pirateradio.js proposal. yarrr!! 2014-10-01 19:17:30 -07:00
gorhgorh bab40c3887 Merge pull request #4 from dominictarr/master
viva la crypto
2014-10-01 19:54:57 +02:00
Dominic Tarr f10f15bf5e propose a _mysterious_ talk 2014-10-01 13:56:53 -02:00
gorhgorh f44f9ba70b Merge pull request #3 from hemanth/master
Few proposals from @hemanth
2014-09-30 07:40:35 +02:00
hemanth.hm 5713c4ff2d Few proposals from @hemanth 2014-09-29 18:01:44 +05:30
joates ad9d085fdd another tiny grammar change 2014-09-17 18:39:56 +01:00
Julian Oates 0f2883fa50 Merge pull request #2 from squatconf/grammar-spelling-formatting
Fix up grammar, spelling and reformat
2014-09-17 18:32:06 +01:00
joates 175324dcc1 2 tiny amendments (fixes #2) 2014-09-17 18:26:39 +01:00
Maciej Małecki 1fe2e734dc Fix up grammar, spelling and reformat 2014-09-17 00:20:17 +02:00
Julian Oates 601d049a35 Merge pull request #1 from joates/master
radio on.. <click> tuning in.. <static> more tuning.."Calling SquatConf Overlord, come in overlord !!"
2014-09-15 19:43:43 +01:00
joates cab2f82b42 moved images out of master branch (they will still work :) 2014-09-15 15:40:53 +01:00
joates 966b37af6e un peu plus d`informations :) 2014-09-15 15:35:41 +01:00
joates bd766958f6 added GLSL demo animation 2014-09-15 15:04:14 +01:00
joates a5a220b4ed initial draft (desc to be added) 2014-09-14 15:57:36 +01:00
joates f14fc81889 added logos 2014-09-14 15:52:18 +01:00
gorhgorh 26df85974f Update README.md
typo ...
2014-09-14 03:02:04 +02:00
Jérôme Loï 0c6418f923 first talk + disclaimer 2014-09-14 03:01:06 +02:00