From 2d604674b04d343b609c7db85e2bf25ce990297f Mon Sep 17 00:00:00 2001 From: Wruczek Date: Fri, 26 Jan 2018 03:02:24 +0100 Subject: [PATCH] Updated the year + a few small changes --- .gitignore | 1 + .htaccess | 2 +- LICENSE.md | 2 +- README.md | 19 ++++++++++--------- config/config.template.php | 6 +++--- css/christmas-theme.css | 2 +- include/footer.php | 2 +- include/header.php | 2 +- include/modulecheck.php | 2 +- 9 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index cd71c5c..43a33a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ config/config.php prototypes/ admin/ +.idea/ cache/ !/cache/.htaccess diff --git a/.htaccess b/.htaccess index 483a08a..d8d96a1 100644 --- a/.htaccess +++ b/.htaccess @@ -1,4 +1,4 @@ -# (c) 2015 - 2017 Wruczek and Contributors +# (c) 2015 - 2018 Wruczek and contributors AddDefaultCharset UTF-8 diff --git a/LICENSE.md b/LICENSE.md index b9f4a51..2546294 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016 - 2017 Wruczek and Contributors +Copyright (c) 2016 - 2018 Wruczek and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index c44db7d..aff8400 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -

Für ein Deutsches Readme klicke hier

@@ -8,27 +7,29 @@ [![Website screenshot](http://i.imgur.com/9UZV6NG.png)](http://imgur.com/a/RUSi2) -

More screenshots

+

More screenshots | :de: Für ein Deutsches Readme klicke hier

-Need help? Join our telegram group for news, announcements, help and general chat about ts-website. +Need help? Join our telegram group for news, announcements, help and general chat about ts-website.

-
+
**ts-website** - free website for your TeamSpeak 3 server
+
+ #### Useful links - [Demo](https://ts.wruczek.tech/) -- [Installation instructions](https://github.com/Wruczek/ts-website/wiki/Website-Installation) +- [Installation instructions](https://github.com/Wruczek/ts-website/wiki/%5BEN%5D-Website-Installation) - [Wiki](https://github.com/Wruczek/ts-website/wiki) - [Report Issues / Suggestions](https://github.com/Wruczek/ts-website/issues/new) -- **[ts-website Telegram group](https://telegram.me/tswebsite) - help, announcements, and general chat** +- **[ts-website Telegram group](https://t.me/tswebsite) - help, announcements, and general chat** #### Main Features - News page, dynamic server status, admin list with status, server viewer, ban list and rules page - Multiple languages with auto-detection for default language -- PHP 7.0, Apache 2 and nginx support +- Supports for PHP 5 and 7, Apache 2 and nginx - Modern and responsive design - Caching - Free and Open source, under MIT license @@ -38,7 +39,7 @@ I am happy to take any programming-related requests, add additional features or For business enquiries only: **wruczekk** at **gmail.com**, for anything else please join our [Telegram group](https://t.me/ts-website). -

+ diff --git a/config/config.template.php b/config/config.template.php index 10e2e3a..a0f359c 100644 --- a/config/config.template.php +++ b/config/config.template.php @@ -8,7 +8,7 @@ For business enquiries only: wruczekk at gmail.com, for anything else please join Telegram chat. - Need help? Join our telegram group for news, announcements, help and general chat about ts-website: https://telegram.me/tswebsite + Need help? Join our telegram group for news, announcements, help and general chat about ts-website: https://t.me/tswebsite */ @@ -68,10 +68,10 @@ CONTACT PANEL SYNTAX: $config['contact']['items'][] = ["name", "link description", "link"]; FOR EXAMPLE: -$config['contact']['items'][] = ["Telegram", "@Wruczek", "https://telegram.me/Wruczek"]; +$config['contact']['items'][] = ["Telegram", "@Wruczek", "https://t.me/Wruczek"]; */ $config['contact']['items'][] = ["TeamSpeak", "Support channel", "ts3server://teamspeakip?cid=30"]; $config['contact']['items'][] = ["Email", "contact@email.com", "mailto:contact@email.com"]; -$config['contact']['items'][] = ["Telegram", "@Telegram", "https://telegram.me/Telegram"]; +$config['contact']['items'][] = ["Telegram", "@Telegram", "https://t.me/Telegram"]; $config['contact']['items'][] = ["Twitter", "@Twitter", "https://twitter.com/Twitter"]; diff --git a/css/christmas-theme.css b/css/christmas-theme.css index ac537a6..253e14c 100644 --- a/css/christmas-theme.css +++ b/css/christmas-theme.css @@ -1,7 +1,7 @@ /*! * Christmas theme for ts-website * https://github.com/Wruczek/ts-website - * (c) Wruczek 2016 - 2017 + * (c) Wruczek 2016 - 2018 * The MIT License */ diff --git a/include/footer.php b/include/footer.php index ceee11b..0c6ca21 100644 --- a/include/footer.php +++ b/include/footer.php @@ -12,7 +12,7 @@

  • - ts-website v 1.4.5 — © Wruczek and Contributors 2016 - 2017 + ts-website v 1.4.5 — © Wruczek and contributors 2016 - 2018

    diff --git a/include/header.php b/include/header.php index 744b83b..67ef01e 100644 --- a/include/header.php +++ b/include/header.php @@ -16,7 +16,7 @@ $htalink = $config["general"]["enablehta"] ? "" : ".php"; "> - + <?php echo $config["general"]["title"] . $config["general"]["subtitle"]; ?> diff --git a/include/modulecheck.php b/include/modulecheck.php index fee32a0..93e4a66 100644 --- a/include/modulecheck.php +++ b/include/modulecheck.php @@ -89,7 +89,7 @@ function showError($title, $text) { ?>

    - © Wruczek 2016 - 2017 | ts-website v 1.4.5 | MIT License + © Wruczek 2016 - 2018 | ts-website v 1.4.5 | MIT License