Browse Source

Rename system directory to flarum

pull/9/head
Toby Zerner 9 years ago
parent
commit
552466bc2b
  1. 4
      .gitmodules
  2. 2
      admin.php
  3. 2
      api.php
  4. 0
      flarum/.gitignore
  5. 10
      flarum/bootstrap.php
  6. 3
      flarum/composer.json
  7. 0
      flarum/composer.lock
  8. 0
      flarum/error/404.html
  9. 0
      flarum/error/500.html
  10. 0
      flarum/flarum
  11. 0
      flarum/storage/.gitignore
  12. 0
      flarum/storage/app/.gitignore
  13. 0
      flarum/storage/framework/.gitignore
  14. 0
      flarum/storage/framework/cache/.gitignore
  15. 0
      flarum/storage/framework/sessions/.gitignore
  16. 0
      flarum/storage/framework/views/.gitignore
  17. 0
      flarum/storage/less/.gitignore
  18. 0
      flarum/storage/logs/.gitignore
  19. 0
      flarum/studio.json
  20. 0
      flarum/vagrant/aliases
  21. 0
      flarum/vagrant/environment.sh
  22. 17
      system/.env.example
  23. 1
      system/core

4
.gitmodules vendored

@ -1,3 +1,3 @@
[submodule "system/core"]
path = system/core
[submodule "flarum/core"]
path = flarum/core
url = https://github.com/flarum/core.git

2
admin.php

@ -7,7 +7,7 @@ use Zend\Diactoros\Server;
use Zend\Stratigility\MiddlewarePipe;
// Instantiate the application, register providers etc.
$app = require __DIR__.'/system/bootstrap.php';
$app = require __DIR__.'/flarum/bootstrap.php';
// Set up everything we need for the frontend
$app->register('Flarum\Admin\AdminServiceProvider');

2
api.php

@ -7,7 +7,7 @@ use Zend\Diactoros\Server;
use Zend\Stratigility\MiddlewarePipe;
// Instantiate the application, register providers etc.
$app = require __DIR__.'/system/bootstrap.php';
$app = require __DIR__.'/flarum/bootstrap.php';
// Set up everything we need for the API
$app->register('Flarum\Api\ApiServiceProvider');

0
system/.gitignore → flarum/.gitignore vendored

10
system/bootstrap.php → flarum/bootstrap.php

@ -28,12 +28,12 @@ $app->instance('config', $config = new \Illuminate\Config\Repository([
],
'mail' => [
'driver' => 'smtp',
'host' => 'smtp.mailgun.org',
'port' => 587,
'from' => ['address' => 'noreply@localhost', 'name' => 'Flarum Demo Forum'],
'host' => 'mailtrap.io',
'port' => 25,
'from' => ['address' => 'noreply@flarum.org', 'name' => 'Flarum Demo Forum'],
'encryption' => 'tls',
'username' => null,
'password' => null,
'username' => '3041435124c4c166c',
'password' => 'a6949720835285',
'sendmail' => '/usr/sbin/sendmail -bs',
'pretend' => false,
],

3
system/composer.json → flarum/composer.json

@ -7,7 +7,8 @@
"require": {
"laravel/framework": "5.1.*",
"zendframework/zend-stratigility": "^1.1",
"franzl/whoops-middleware": "dev-master"
"franzl/whoops-middleware": "dev-master",
"flarum/core": "0.1.x@dev"
},
"require-dev": {
"franzl/studio": "1.0.x@dev"

0
system/composer.lock → flarum/composer.lock generated

0
system/error/404.html → flarum/error/404.html

0
system/error/500.html → flarum/error/500.html

0
system/flarum → flarum/flarum

0
system/storage/.gitignore → flarum/storage/.gitignore vendored

0
system/storage/app/.gitignore → flarum/storage/app/.gitignore vendored

0
system/storage/framework/.gitignore → flarum/storage/framework/.gitignore vendored

0
system/storage/framework/cache/.gitignore → flarum/storage/framework/cache/.gitignore vendored

0
system/storage/framework/sessions/.gitignore → flarum/storage/framework/sessions/.gitignore vendored

0
system/storage/framework/views/.gitignore → flarum/storage/framework/views/.gitignore vendored

0
system/storage/less/.gitignore → flarum/storage/less/.gitignore vendored

0
system/storage/logs/.gitignore → flarum/storage/logs/.gitignore vendored

0
system/studio.json → flarum/studio.json

0
system/vagrant/aliases → flarum/vagrant/aliases

0
system/vagrant/environment.sh → flarum/vagrant/environment.sh

17
system/.env.example

@ -1,17 +0,0 @@
APP_ENV=local
APP_DEBUG=true
APP_KEY=SomeRandomString
DB_HOST=localhost
DB_DATABASE=flarum
DB_USERNAME=root
DB_PASSWORD=root
CACHE_DRIVER=file
SESSION_DRIVER=file
MAIL_DRIVER=smtp
MAIL_HOST=mailtrap.io
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null

1
system/core

@ -1 +0,0 @@
Subproject commit 0cb3378658b4a6ff3b4a8d5a06378ae8b6c5b87a
Loading…
Cancel
Save