diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7271ecc..7e59e6d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -54,17 +54,7 @@ $ cd vendor/flarum/core $ ./scripts/compile.sh ``` -## Development tools - -Most Flarum contributors use [PHPStorm](https://www.jetbrains.com/phpstorm/download/) with an educational or open source license. - -For serving a local forum, [Laravel Valet](https://laravel.com/docs/master/valet) (Mac), [XAMPP](https://www.apachefriends.org/index.html) (Win) and [Docker-Flarum](https://github.com/mondediefr/docker-flarum) (Linux) are popular choices. - -See also the [First Read for Extension Developers](https://discuss.flarum.org/d/1662-extension-developer-first-read) and the great [Flarum Development Workflow](https://discuss.flarum.org/d/6320-extension-developers-show-us-your-workflow) discussion. - -## What to work on - -Check out the [Roadmap](http://flarum.org/roadmap/) and [Milestones](https://github.com/flarum/core/milestones) for an overview of what needs to be done. See the [Good first issue](https://github.com/flarum/core/labels/Good%20first%20issue) label for a list of issues that should be relatively easy to get started with. +Check out the [Roadmap](https://github.com/flarum/core/issues/74) for an overview of what needs to be done. See the [Good For New Contributors](https://github.com/flarum/core/labels/Good%20for%20New%20Contributors) label for a list of issues that should be relatively easy to get started with. ## Contributor License Agreement diff --git a/LICENSE b/LICENSE index e6288c6..1e346ea 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014-2018 Toby Zerner +Copyright (c) 2014-2017 Toby Zerner 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/composer.json b/composer.json index 47a5c99..4988969 100644 --- a/composer.json +++ b/composer.json @@ -13,6 +13,14 @@ { "name": "Franz Liedke", "email": "franz@develophp.org" + }, + { + "name": "David Zuelke", + "email": "dz@heroku.com" + }, + { + "name": "Jamie Moore", + "email": "hypersudo@gmail.com" } ], "support": { @@ -21,6 +29,7 @@ "docs": "http://flarum.org/docs" }, "require": { + "heroku/heroku-buildpack-php": "^132", "flarum/core": "^0.1.0", "flarum/flarum-ext-akismet": "^0.1.0", "flarum/flarum-ext-approval": "^0.1.0", @@ -36,12 +45,14 @@ "flarum/flarum-ext-markdown": "^0.1.0", "flarum/flarum-ext-mentions": "^0.1.0", "flarum/flarum-ext-pusher": "^0.1.0", - "flarum/flarum-ext-statistics": "^0.1.0", "flarum/flarum-ext-sticky": "^0.1.0", "flarum/flarum-ext-subscriptions": "^0.1.0", "flarum/flarum-ext-suspend": "^0.1.0", "flarum/flarum-ext-tags": "^0.1.0" }, + "require-dev": { + "franzl/studio": "^0.11.0" + }, "config": { "preferred-install": "dist" }, diff --git a/flarum b/flarum index ae12c33..fffdd15 100644 --- a/flarum +++ b/flarum @@ -13,8 +13,6 @@ define('FLARUM_START', microtime(true)); require 'vendor/autoload.php'; -Flarum\Console\Server::fromSite( - (new Flarum\Foundation\Site) - ->setBasePath(__DIR__) - ->setPublicPath(__DIR__) -)->listen(); +$server = new Flarum\Console\Server(__DIR__); + +$server->listen(); diff --git a/readme.md b/readme.md index 5896a6e..221dbdf 100644 --- a/readme.md +++ b/readme.md @@ -20,14 +20,9 @@ composer create-project flarum/flarum . --stability=beta Read the [Installation Guide](http://flarum.org/docs/installation) for more information. -## Development - -This repository holds the Flarum skeleton application. -Its dependencies, such as [flarum/core](https://github.com/flarum/core) (where most development happens), have to be installed using [Composer](https://getcomposer.org/). - ## Support -Refer to the [FAQ](http://flarum.org/docs/faq), [Documentation](http://flarum.org/docs), and ask questions on the [Community Forum](http://discuss.flarum.org) or [Discord Chat](http://flarum.org/discord). +Refer to the [FAQ](http://flarum.org/docs/faq), [Documentation](http://flarum.org/docs), and ask questions on the [Community Forum](http://discuss.flarum.org) or [Gitter Chat](https://gitter.im/flarum/flarum). ## Contributing