sterzy/sterzycom
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Shannon Sterz 2016-12-26 15:17:39 +01:00
commit 5d62f058c3
9 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.gitmodules vendored
View file

@ -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"] [submodule "site/fields/markdown"]
path = site/fields/markdown path = site/fields/markdown
url = https://github.com/JonasDoebertin/kirby-visual-markdown.git 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

1
.htaccess
View file

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

1
README.md
View file

@ -1,6 +1,5 @@
# Sterzy.com # 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)). 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/). 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 # Installing

2
kirby

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

2
panel

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

2
site/fields/markdown

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

2
site/plugins/feed/template.php
View file

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

2
site/templates/home.php
View file

@ -17,7 +17,7 @@
</article> </article>
</div> </div>
<div> </div>
</main> </main>
<?php snippet('footer') ?> <?php snippet('footer') ?>