Lazalatin/chaospott-site
1
0
Fork 0
forked from Chaospott/site
Code Issues Pull Requests Projects Releases Wiki Activity
1,116 Commits 1 Branch 0 Tags 172 MiB
7a895a27b4
Commit Graph

1116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Timm Szigat
da685417e4 favicons and shit! 2014-10-30 21:22:29 +01:00
Christian
2c81173d59 Merge branch 'master' of github.com:c3e/site 2014-10-30 21:20:54 +01:00
Christian
5708179e1f ADD Post CmS Bundestreffen 13 2014-10-30 21:17:05 +01:00
Timm
fb2efd191a Merge pull request #4 from c3e/howto 
changed OSM link
 2014-10-30 21:15:11 +01:00
Christian
b44476d282 ADD Post 30C3 2014-10-30 21:08:57 +01:00
Christian
8680e4fd0d ADD Post Hackover 2013 2014-10-30 20:55:13 +01:00
Christian
8650296cd9 Merge branch 'master' of github.com:c3e/site 2014-10-30 20:44:53 +01:00
Christian
f163a7fdaa ADD Post Freifunktag im NL 2014-10-30 20:44:33 +01:00
Christian
1756676dab ADD Post ORR 14 2014-10-30 20:40:15 +01:00
Timm
ab843d8bfe Merge pull request #3 from c3e/howto 
Howto
 2014-10-30 20:25:38 +01:00
Timm Szigat
c866f9ea12 changed OSM link 2014-10-30 20:21:31 +01:00
Christian
7a3d567553 ADD Post CMS Viersen 2014-10-30 20:04:11 +01:00
Timm Szigat
00124fffe5 ripped out external sources 2014-10-30 20:00:25 +01:00
Christian
5a977e399c ADD Post CMS Viersen 2014-10-30 19:55:47 +01:00
Christian
a188cb586d ADD Post CMS Bonn 2014-10-30 19:50:56 +01:00
Christian
3709b8cb7d ADD Post CMS RWB 2014-10-30 19:35:48 +01:00
Timm Szigat
439f7c6d85 Merge branch 'master' of github.com:chaospott/site into howto 2014-10-30 19:18:24 +01:00
Timm Szigat
3a80347082 changed servername 2014-10-30 18:29:26 +01:00
Timm Szigat
a4135169a2 changed servername 2014-10-29 00:26:48 +01:00
Timm Szigat
757c93c7d8 fixxed navigation, repaired picture links 2014-10-29 00:17:20 +01:00
Timm
78cbc9ddff Merge pull request #1 from Dentax/patch-1 
Update default.html
 2014-10-28 13:47:28 +01:00
Dentax
a5c6442e79 Update default.html 
Overflow fix
 2014-10-28 12:03:33 +01:00
Timm
60b44514f5 Update 2010-09-05-mrmcd1001b.markdown 2014-10-28 10:28:27 +01:00
Timm
7693831289 repaired image path 2014-10-28 10:27:56 +01:00
Timm Szigat
1631d50daf imported media folder, again. 2014-10-28 01:04:20 +01:00
Timm Szigat
11f3f619a8 Merge branch 'master' of github.com:chaospott/site 2014-10-27 19:41:47 +01:00
Timm Szigat
f46e4397f3 Merge branch 'master' of github.com:chaospott/site 2014-10-27 19:41:39 +01:00
Timm Szigat
8e1e5d40ca Merge branch 'master' of github.com:chaospott/site 2014-10-27 19:39:17 +01:00
Timm Szigat
8346340166 Merge branch 'master' of github.com:chaospott/site 2014-10-27 19:38:58 +01:00
Timm Szigat
b291fc0ad4 Merge branch 'master' of github.com:chaospott/site 2014-10-27 19:33:50 +01:00
Timm Szigat
26753126b1 logo shrinked 2014-10-27 19:33:42 +01:00
Timm Szigat
f2fec9f9b4 logo shrinked 2014-10-27 19:27:54 +01:00
Timm Szigat
f241e1a585 removed doublet articles 2014-10-27 00:29:22 +01:00
Timm Szigat
c02843589e Merge branch 'master' of github.com:chaospott/site 2014-10-27 00:20:50 +01:00
Timm Szigat
35bf0416c2 Merge branch 'master' of github.com:chaospott/site 2014-10-27 00:20:34 +01:00
Timm Szigat
a77d6053a7 Merge branch 'master' of github.com:chaospott/site 2014-10-27 00:14:20 +01:00
Timm Szigat
a0afea6c7e Merge branch 'master' of github.com:chaospott/site 
Conflicts:
	_posts/2014-07-04-cryptoparty.markdown
	css/style.css
 2014-10-27 00:10:47 +01:00
Timm Szigat
ef538eb7a2 Merge branch 'master' of github.com:chaospott/site 
Conflicts:
	_posts/2014-07-04-cryptoparty.markdown
	css/style.css
 2014-10-27 00:10:47 +01:00
Timm Szigat
816a3516e9 Merge branch 'master' of github.com:chaospott/site 
Conflicts:
	_posts/2014-07-04-cryptoparty.markdown
	css/style.css
 2014-10-26 23:48:43 +01:00
Timm Szigat
0580a3851e Merge branch 'master' of github.com:chaospott/site 
Conflicts:
	_posts/2014-07-04-cryptoparty.markdown
	css/style.css
 2014-10-26 23:48:43 +01:00
Timm Szigat
1e0e4ee5b4 resized pictures 2014-10-26 23:43:30 +01:00
Timm Szigat
982d21b399 resized pictures 2014-10-26 23:43:30 +01:00
Timm Szigat
3b20b2e6a4 resized pictures 2014-10-26 23:43:30 +01:00
Timm Szigat
430f6898e6 Merge branch 'master' of github.com:chaospott/site 2014-10-26 19:35:54 +01:00
Timm Szigat
9ef2d8c399 Merge branch 'master' of github.com:chaospott/site 2014-10-26 19:35:54 +01:00
Timm Szigat
acd386ae1f Merge branch 'master' of github.com:chaospott/site 2014-10-26 19:35:54 +01:00
Timm Szigat
af8e095bf4 added a few articles, added media 2014-10-26 19:35:05 +01:00
Timm Szigat
68bb02d6b2 added a few articles, added media 2014-10-26 19:35:05 +01:00
Timm Szigat
bf6537ef5d added a few articles, added media 2014-10-26 19:35:05 +01:00
Timm Szigat
6498447b0d mend 2014-10-26 19:30:41 +01:00