From 94b52504145ed5c889093421167306aa7a45d385 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Mon, 2 Jan 2017 02:19:17 +0100 Subject: Added composer with parsedown requirement --- README.md | 2 ++ 1 file changed, 2 insertions(+) (limited to 'README.md') diff --git a/README.md b/README.md index 57d81d52..7ee7320a 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,8 @@ ## Vorgehen: * Klonen des `master` inkl. submodules in lokales Verzeichnis: `git clone --recursive https://github.com/engelsystem/engelsystem.git` + * [Composer](https://getcomposer.org/download/) installieren + * Abhängigkeiten installieren: `composer install` * Der Webserver muss Schreibrechte auf das Verzeichnis `import` bekommen, für alle anderen Dateien reichen Leserechte. * Der Webserver muss auf `public` als http-root zeigen. -- cgit v1.2.3-54-g00ecf From b839e401062b294292fdcbd7e30b79bc149fab6f Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Mon, 2 Jan 2017 03:15:57 +0100 Subject: Require twbs/bootstrap via composer --- .gitmodules | 3 --- README-ENG.md | 2 +- README.md | 2 +- composer.json | 3 ++- public/vendor/bootstrap | 2 +- themes/assets/bootstrap | 1 - themes/base.less | 4 ++-- themes/theme1.less | 2 +- themes/theme2.less | 2 +- themes/theme3.less | 2 +- themes/theme4.less | 2 +- 11 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 .gitmodules delete mode 160000 themes/assets/bootstrap (limited to 'README.md') diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 2d19e8e9..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vendor/bootstrap"] - path = themes/assets/bootstrap - url = https://github.com/twbs/bootstrap.git \ No newline at end of file diff --git a/README-ENG.md b/README-ENG.md index d379e192..0c39ba45 100644 --- a/README-ENG.md +++ b/README-ENG.md @@ -6,7 +6,7 @@ * Webserver, i.e. lighttpd, nginx, or Apache ## Directions: - * Clone the master branch with the submodules: `git clone --recursive https://github.com/engelsystem/engelsystem.git` + * Clone the master branch: `git clone https://github.com/engelsystem/engelsystem.git` * Install [Composer](https://getcomposer.org/download/) * Install project dependencies: `composer install` * Webserver must have write access to the 'import' directory and read access for all other directories diff --git a/README.md b/README.md index 7ee7320a..1bb0f694 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ * Webserver mit PHP-Anbindung, z.B. lighttpd, nginx oder Apache ## Vorgehen: - * Klonen des `master` inkl. submodules in lokales Verzeichnis: `git clone --recursive https://github.com/engelsystem/engelsystem.git` + * Klonen des `master` in lokales Verzeichnis: `git clone https://github.com/engelsystem/engelsystem.git` * [Composer](https://getcomposer.org/download/) installieren * Abhängigkeiten installieren: `composer install` * Der Webserver muss Schreibrechte auf das Verzeichnis `import` bekommen, für alle anderen Dateien reichen Leserechte. diff --git a/composer.json b/composer.json index 5b56395b..5b2498da 100644 --- a/composer.json +++ b/composer.json @@ -15,6 +15,7 @@ ], "require": { "php": ">=5.4", - "erusev/parsedown": "1.6.*" + "erusev/parsedown": "1.6.*", + "twbs/bootstrap": "^3.3" } } diff --git a/public/vendor/bootstrap b/public/vendor/bootstrap index 250b0a66..c4f820a9 120000 --- a/public/vendor/bootstrap +++ b/public/vendor/bootstrap @@ -1 +1 @@ -../../themes/assets/bootstrap/dist \ No newline at end of file +../../vendor/twbs/bootstrap/dist \ No newline at end of file diff --git a/themes/assets/bootstrap b/themes/assets/bootstrap deleted file mode 160000 index ad716b9e..00000000 --- a/themes/assets/bootstrap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ad716b9ea9506456f28e2c1bcdd7b4a81b44c11c diff --git a/themes/base.less b/themes/base.less index a4fa7e77..c866e50e 100644 --- a/themes/base.less +++ b/themes/base.less @@ -1,6 +1,6 @@ -@import "assets/bootstrap/less/bootstrap"; +@import "../vendor/twbs/bootstrap/less/bootstrap"; -@icon-font-path: "../fonts/"; +@icon-font-path: "../vendor/bootstrap/fonts/"; body { padding-top: 50px; diff --git a/themes/theme1.less b/themes/theme1.less index 134e79b7..7a893951 100644 --- a/themes/theme1.less +++ b/themes/theme1.less @@ -1,4 +1,4 @@ -@import "assets/bootstrap/less/variables"; +@import "../vendor/twbs/bootstrap/less/variables"; /* The MIT License (MIT) diff --git a/themes/theme2.less b/themes/theme2.less index 344e23c6..c4486444 100644 --- a/themes/theme2.less +++ b/themes/theme2.less @@ -1,4 +1,4 @@ -@import "assets/bootstrap/less/variables"; +@import "../vendor/twbs/bootstrap/less/variables"; @brand-primary: #758499; @brand-success: #7b9c41; diff --git a/themes/theme3.less b/themes/theme3.less index 7e7e0f69..e6be3637 100644 --- a/themes/theme3.less +++ b/themes/theme3.less @@ -1,4 +1,4 @@ -@import "assets/bootstrap/less/variables"; +@import "../vendor/twbs/bootstrap/less/variables"; @brand-primary: #f19224; @brand-success: #39AB50; diff --git a/themes/theme4.less b/themes/theme4.less index 2ad8593d..4234de9c 100644 --- a/themes/theme4.less +++ b/themes/theme4.less @@ -1,4 +1,4 @@ -@import "assets/bootstrap/less/variables"; +@import "../vendor/twbs/bootstrap/less/variables"; /* The MIT License (MIT) -- cgit v1.2.3-54-g00ecf From 20e0765f571ed60aa21c07502ee7efcbe9995a6e Mon Sep 17 00:00:00 2001 From: msquare Date: Sun, 16 Jul 2017 18:41:57 +0200 Subject: remove german readme and add development readme #269 --- README-ENG.md | 27 ------------------------ README.md | 50 +++++++++++++++++++++++++++----------------- templates/guest_credits.html | 14 +++++++------ 3 files changed, 39 insertions(+), 52 deletions(-) delete mode 100644 README-ENG.md (limited to 'README.md') diff --git a/README-ENG.md b/README-ENG.md deleted file mode 100644 index 0c39ba45..00000000 --- a/README-ENG.md +++ /dev/null @@ -1,27 +0,0 @@ -# Installation of Engelsystem - -## Requirements: - * PHP 5.4.x (cgi-fcgi) - * MySQL-Server 5.5.x - * Webserver, i.e. lighttpd, nginx, or Apache - -## Directions: - * Clone the master branch: `git clone https://github.com/engelsystem/engelsystem.git` - * Install [Composer](https://getcomposer.org/download/) - * Install project dependencies: `composer install` - * Webserver must have write access to the 'import' directory and read access for all other directories - * Webserver must be public. - - * Recommended: Directory Listing should be disabled. - * There must a be MySQL database created with a user who has full rights to that database. - * It must be created by the db/install.sql and db/update.sql files. - * If necessary, create a config/config.php to override values from config/config.default.php. - * In the browser, login with credentials admin:asdfasdf and change the password. - -Engelsystem can now be used. - -## Session Settings: - * Make sure the config allows for sessions. - * Both Apache and Nginx allow for different VirtualHost configurations. - -Report Bugs: https://github.com/engelsystem/engelsystem/issues diff --git a/README.md b/README.md index 1bb0f694..aa418e4f 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,42 @@ [![Codacy Badge](https://api.codacy.com/project/badge/Grade/20b3b0b4e93344a29da6bec77f329e7a)](https://www.codacy.com/app/engelsystem/engelsystem) [![GPL](https://img.shields.io/github/license/engelsystem/engelsystem.svg?maxAge=2592000)]() -# Installation eines frischen Engelsystems +# Engelsystem -## Mindestvorrausetzungen (bzw. getestet unter): +Please visit https://engelsystem.de for a feature list. + +## Installation + +### Requirements: * PHP 5.4.x (cgi-fcgi) * MySQL-Server 5.5.x - * Webserver mit PHP-Anbindung, z.B. lighttpd, nginx oder Apache + * Webserver, i.e. lighttpd, nginx, or Apache + +### Directions: + * Clone the master branch: `git clone https://github.com/engelsystem/engelsystem.git` + * Install [Composer](https://getcomposer.org/download/) + * Install project dependencies: `composer install` + * Webserver must have write access to the 'import' directory and read access for all other directories + * Webserver must be public. + + * Recommended: Directory Listing should be disabled. + * There must a be MySQL database created with a user who has full rights to that database. + * It must be created by the db/install.sql and db/update.sql files. + * If necessary, create a config/config.php to override values from config/config.default.php. + * In the browser, login with credentials admin:asdfasdf and change the password. + +Engelsystem can now be used. -## Vorgehen: - * Klonen des `master` in lokales Verzeichnis: `git clone https://github.com/engelsystem/engelsystem.git` - * [Composer](https://getcomposer.org/download/) installieren - * Abhängigkeiten installieren: `composer install` - * Der Webserver muss Schreibrechte auf das Verzeichnis `import` bekommen, für alle anderen Dateien reichen Leserechte. - * Der Webserver muss auf `public` als http-root zeigen. +### Session Settings: + * Make sure the config allows for sessions. + * Both Apache and Nginx allow for different VirtualHost configurations. - * Empfehlung: Dirlisting sollte deaktiviert sein. - * Es muss eine MySQL-Datenbank angelegt werden und ein User existieren, der alle Rechte auf dieser Datenbank besitzt. - * Es muss die db/install.sql und die db/update.sql importiert/ausgeführt werden. - * Erstelle bei Bedarf eine config/config.php, die die Werte (z.B. DB-Zugang) aus der config/config.default.php überschreibt. - * Engelsystem im Browser aufrufen, Anmeldung mit admin:asdfasdf vornehmen und Admin-Passwort ändern. +Report Bugs: https://github.com/engelsystem/engelsystem/issues -Das Engelsystem ist jetzt einsatzbereit. +## Development +Since the engelsystem is open source, you can help to improve the system. We really love to get pull requests containing fixes or implementations of our Github issues. -## Session Einstellungen: - * Einstellungen für Cookies und Sessions bitte in der PHP Config des Servers vornehmen. - * Sowohl Apache als auch nginx bieten Möglichkeiten für verschiedene Konfigurationen pro VirtualHost an +Please create single pull requests for every feature instead of creating one big monster of pull request containing a complete rewrite. -Fehler bitte auf Github melden: https://github.com/engelsystem/engelsystem/issues +### Codestyle +Please ensure that your pull requests follow [PSR-2](http://www.php-fig.org/psr/psr-2/) and [PSR-4](http://www.php-fig.org/psr/psr-4/). diff --git a/templates/guest_credits.html b/templates/guest_credits.html index ffde2fba..ba746d6a 100644 --- a/templates/guest_credits.html +++ b/templates/guest_credits.html @@ -5,10 +5,12 @@

Source code

The original system was written by cookie. - It was then completely rewritten and greatly enhanced by msquare - and MyIgel, - mortzu of planet cyborg, - jplitza and gnomus. + It was then completely rewritten and enhanced by + msquare (maintainer), + MyIgel, + mortzu, + jplitza and + gnomus.

Please look at the contributor @@ -18,8 +20,8 @@

Hosting

- Webspace, development platform and domain is currently provided by - would you buy this? (ichdasich)
+ Webspace, development platform and domain on engelsystem.de is currently provided by + would you buy this? (ichdasich) and adminstrated by mortzu, derf and ichdasich. -- cgit v1.2.3-54-g00ecf From 6cfd309bef050fbf9b9e2eba0af32962485f840a Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Wed, 19 Jul 2017 11:48:28 +0200 Subject: Changed recommended PHP Version to >= 7.0 --- README.md | 4 ++-- composer.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index aa418e4f..fdd20df7 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ Please visit https://engelsystem.de for a feature list. ## Installation ### Requirements: - * PHP 5.4.x (cgi-fcgi) - * MySQL-Server 5.5.x + * PHP >= 5.6.4, PHP >= 7.0.0 recommended + * MySQL-Server >= 5.5.x * Webserver, i.e. lighttpd, nginx, or Apache ### Directions: diff --git a/composer.json b/composer.json index 0605bcf3..d2e0108b 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": ">=5.4", + "php": ">=5.6.4", "erusev/parsedown": "1.6.*", "twbs/bootstrap": "^3.3" }, -- cgit v1.2.3-54-g00ecf From 341c076d98209b19f8360486ca41ac62e506db7b Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Tue, 29 Aug 2017 23:26:26 +0200 Subject: Bumped PHP version to min. 7.0.0 (see 440ed74c) --- README.md | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index fdd20df7..30c52039 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Please visit https://engelsystem.de for a feature list. ## Installation ### Requirements: - * PHP >= 5.6.4, PHP >= 7.0.0 recommended + * PHP >= 7.0.0 * MySQL-Server >= 5.5.x * Webserver, i.e. lighttpd, nginx, or Apache diff --git a/composer.json b/composer.json index e6d20108..45dce626 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": ">=5.6.4", + "php": ">=7.0.0", "erusev/parsedown": "1.6.*", "twbs/bootstrap": "^3.3", "symfony/http-foundation": "^3.3" -- cgit v1.2.3-54-g00ecf From f58a46603cecebb3737feedc0088091df44412dc Mon Sep 17 00:00:00 2001 From: msquare Date: Fri, 24 Nov 2017 09:33:10 +0100 Subject: fix readme regarding webserver root dir --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index 30c52039..2b61ebe8 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Please visit https://engelsystem.de for a feature list. * Install [Composer](https://getcomposer.org/download/) * Install project dependencies: `composer install` * Webserver must have write access to the 'import' directory and read access for all other directories - * Webserver must be public. + * Webserver must point to the public directory. * Recommended: Directory Listing should be disabled. * There must a be MySQL database created with a user who has full rights to that database. -- cgit v1.2.3-54-g00ecf