Merging

Merge branch 'master' of https://git.posweg.es/posweg/librecat
2020-08-16 05:39:09 +00:00 · 2020-08-16 05:39:09 +00:00 · 264b6f3500
parent 432bb36691 b4f4dfa085
commit 264b6f3500
4 changed files with 47 additions and 0 deletions
--- a/.config.php.swp
+++ b/.config.php.swp
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,28 @@
 *.db
 *~
+*.secret
+
+### Vim ###
+# Swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+Sessionx.vim
+
+# Temporary
+.netrwhist
+*~
+
+# Auto-generated tag files
+tags
+
+# Persistent undo
+[._]*.un~
+
+# Coc configuration directory
+.vim
--- a/config.php
+++ b/config.php
@ -1,8 +1,26 @@
 <?php
 include("include/header.php");
+include("include/settings.php");
 session_start();

 ?>
+<!DOCTYPE html>
 <html>
+<head>
+
+<title>Config | LibreCat</title>
+<?php include("themes/$theme_name/config.php"); ?>
+
+</head>
+<body>
+
 <h1>Config</h1>
+
+<p>
+	For now this section is under construction, but
+	I have activated it to log vinculate accounts with
+	Twitter.
+</p>
+
+</body>
 </html>
--- a/themes/minimalpunk/config.php
+++ b/themes/minimalpunk/config.php
@ -0,0 +1,3 @@
+<?php
+include("main.php");
+?>