Merge branch 'master' into develop

.gitmodules

@@ -1,9 +1,9 @@
-[submodule "panel"]
-	path = panel
-	url = https://github.com/getkirby/panel.git
-[submodule "kirby"]
-	path = kirby
-	url = https://github.com/getkirby/kirby.git
 [submodule "site/fields/markdown"]
 	path = site/fields/markdown
 	url = https://github.com/JonasDoebertin/kirby-visual-markdown.git
+[submodule "kirby"]
+	path = kirby
+	url = https://github.com/getkirby/kirby.git
+[submodule "panel"]
+	path = panel
+	url = https://github.com/getkirby/panel.git

.htaccess

@@ -3,6 +3,7 @@
 # rewrite rules
 <IfModule mod_rewrite.c>
 Redirect 301 /.well-known/carddav /owncloud/remote.php/carddav
+Redirect 301 /.well-known/caldav /owncloud/remote.php/caldav
 
 # enable awesome urls. i.e.:
 # http://yourdomain.com/about-us/team

README.md

@@ -1,6 +1,5 @@
 # Sterzy.com    
 This is the code for the http://sterzy.com website. It is based on the kirby cms (http://getkirby.com), which has it's own license agreement ([Kirby End User License Agreement](https://github.com/getkirby/starterkit/blob/master/license.md)).
-
 The rest of the code is under this license: [License](https://svs.ankaa.uberspace.de/sterzy/sterzycom/blob/master/LICENSE "license"), [CC BY 4.0](http://creativecommons.org/licenses/by/4.0/).
 
 # Installing 

kirby

@@ -1 +1 @@
-Subproject commit b45f01ba6a6cd56781a7d091a423beb04b0d0eea
+Subproject commit 1d93437c3dd73432567f8d080723e3b574754781

panel

@@ -1 +1 @@
-Subproject commit 53ebd4b6964c02aab5671d2735f59ccc0178f144
+Subproject commit 595b7c7a18e61c1d6b4138e4a75613cd774989a1

site/fields/markdown

@@ -1 +1 @@
-Subproject commit 764277d523dfe286995cf5854c70ce8854637a5b
+Subproject commit 785fb4f37b98ebabb2e95ea717b47ca3e814c0fb

site/plugins/feed/template.php

@@ -5,7 +5,7 @@
     <title><?php echo xml($title) ?></title>
     <link><?php echo xml($link) ?></link>
     <generator><?php echo c::get('feed.generator', 'Kirby') ?></generator>
-    <lastBuildDate><?php echo date('r', $modified) ?></lastBuildDate>
+    <lastBuildDate><?php echo date('r', strtotime($modified)) ?></lastBuildDate>
     <atom:link href="<?php echo xml($url) ?>" rel="self" type="application/rss+xml" />
 
     <?php if(!empty($description)): ?>

site/templates/home.php

@@ -4,20 +4,20 @@
         <div class="mainwrapper text">
 
             <div class="bp left" >
-    	       <article class="front" >
+               <article class="front" >
                     <a href="<?php echo url('notes') ?>"><div class="notesf" ><h1><?php echo page('notes')->title()->html() ?></h1></div></a>
-        	       <?php echo page('notes')->text()->kirbytext() ?>
+                   <?php echo page('notes')->text()->kirbytext() ?>
                 </article>
             </div>
     
             <div class="bp" >
-    	        <article class="front" >
+                <article class="front" >
                     <a href="<?php echo url('projects') ?>"><div class="projectsf" ><h1><?php echo page('projects')->title()->html() ?></h1></div></a>
                     <?php echo page('projects')->intro()->kirbytext() ?>
-    	        </article>	
+                </article>  
             </div>
             
-        <div>
+        </div>
     </main>
 
 <?php snippet('footer') ?>