docgalaxyblock/chaospott-site
1
0
Fork 0
forked from Chaospott/site
Code Pull Requests Activity
92 Commits 2 Branches 0 Tags
3f61bd99b83614523448d6c3ba8cf628b3f9e7cf
Commit Graph
47 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Timm Szigat 0b657b9791 added status 2014-11-02 23:34:24 +01:00
Timm Szigat 5cf52d923a Merge branch 'master' of github.com:chaospott/site 
Conflicts:
	_config.yml
 2014-11-02 23:23:41 +01:00
Timm Szigat d9ca936dac changed url 2014-11-02 23:22:52 +01:00
Timm Szigat aeb04597ff Merge branch 'master' of github.com:chaospott/site 2014-10-30 21:23:52 +01:00
Timm Szigat da685417e4 favicons and shit! 2014-10-30 21:22:29 +01:00
Timm Szigat c866f9ea12 changed OSM link 2014-10-30 20:21:31 +01:00
Timm Szigat 00124fffe5 ripped out external sources 2014-10-30 20:00:25 +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 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
Timm Szigat c7e717495f mend 2014-10-26 15:01:10 +01:00
Timm Szigat d1a6ee3091 mend 2014-10-26 15:01:10 +01:00
Timm Szigat b51339fb98 mend 2014-10-26 14:56:51 +01:00
Timm Szigat 162748b1d1 mend 2014-10-26 14:56:51 +01:00
Timm Szigat b4415b675e Design and Jekyll added 2014-10-26 14:11:10 +01:00
Timm Szigat 3c565f0574 Design and Jekyll added 2014-10-26 14:11:10 +01:00
Timm Szigat 4ecb1e7cae added readme 2014-10-20 23:30:51 +02:00
Timm Szigat f20313c7b9 added readme 2014-10-20 23:30:51 +02:00
Timm Szigat 39c5f87b66 2014-10-20 22:33:40 +02:00
Timm Szigat 14b52dc963 2014-10-20 22:33:40 +02:00