Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve documentation for Git users #957

Merged
merged 2 commits into from
Jun 27, 2017
Merged

Improve documentation for Git users #957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
016485d
readme: Link to development section
jtojnar Jun 15, 2017
ed0e05f
Add warning when autoload file is missing
jtojnar Jun 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ DOWNLOAD

* [Stable releases](https://github.com/SSilence/selfoss/releases) – if you just want to use selfoss.
* [Development builds](https://bintray.com/fossar/selfoss/selfoss-git) ([latest](https://bintray.com/fossar/selfoss/selfoss-git/_latestVersion#files)) – if you want to try unreleased features or bug fixes, or help testing them.
* [Git-tracked source code](https://github.com/SSilence/selfoss) – if you want to join selfoss development. Some assembly required.
* [Git-tracked source code](https://github.com/SSilence/selfoss) – if you want to join selfoss development. Some [assembly](#development) required.

INSTALLATION
------------
Expand All @@ -22,6 +22,8 @@ INSTALLATION
3. You don't have to install the database, it will be created automatically (ensure that your database has enought rights for creating triggers)
4. Create cronjob for updating feeds and point it to https://yourselfossurl.com/update via wget or curl. You can also execute the cliupdate.php from commandline.

If you obtained selfoss using Git, some more steps will be required. See the [development](#development) section.

For further questions or on any problem use our support forum: https://selfoss.aditu.de/forum/

CONFIGURATION
Expand All @@ -45,6 +47,8 @@ UPDATE
7. Insert your current database connection and your individual configuration in config.ini. Important: we change the config.ini and add new options in newer versions. You have to update the config.ini too.
8. The database will be updated automatically (ensure that your database has enought rights for creating triggers)

If you obtained selfoss using Git, some more steps might be required. See the [development](#development) section.

For further questions or on any problem use our support forum: https://selfoss.aditu.de/forum


Expand Down
6 changes: 5 additions & 1 deletion common.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
use Monolog\Formatter\LineFormatter;
use Monolog\Handler\StreamHandler;

require __DIR__ . '/vendor/autoload.php';
$autoloader = @include __DIR__ . '/vendor/autoload.php'; // we will show custom error
if ($autoloader === false) {
echo 'The PHP dependencies are missing. Did you run `composer install` in the selfoss directory?';
exit;
}

$f3 = $f3 = Base::instance();

Expand Down