diff --git a/.env.example b/.env.example index 2d5ec6c28f81..1e13fc0a24c3 100644 --- a/.env.example +++ b/.env.example @@ -6,16 +6,16 @@ APP_DEBUG=false APP_URL=http://localhost DB_CONNECTION=db-ninja-01 -MULTI_DB_ENABLED=true +MULTI_DB_ENABLED=false DB_HOST1=localhost -DB_DATABASE1=db-ninja-01 +DB_DATABASE1=ninja DB_USERNAME1=ninja DB_PASSWORD1=ninja DB_PORT1=3306 DB_HOST2=localhost -DB_DATABASE2=db-ninja-02 +DB_DATABASE2=ninja2 DB_USERNAME2=ninja DB_PASSWORD2=ninja DB_PORT2=3306 @@ -43,7 +43,7 @@ MAIL_FROM_ADDRESS='user@example.com' MAIL_FROM_NAME='Self Hosted User' POSTMARK_API_TOKEN= -REQUIRE_HTTPS=true +REQUIRE_HTTPS=false GOOGLE_MAPS_API_KEY= API_SECRET=superdoopersecrethere diff --git a/README.md b/README.md index 6e333aa72af8..b7575541f627 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![codecov](https://codecov.io/gh/invoiceninja/invoiceninja/branch/v2/graph/badge.svg)](https://codecov.io/gh/invoiceninja/invoiceninja) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d39acb4bf0f74a0698dc77f382769ba5)](https://www.codacy.com/app/turbo124/invoiceninja?utm_source=github.com&utm_medium=referral&utm_content=invoiceninja/invoiceninja&utm_campaign=Badge_Grade) -# Invoice Ninja version 2.0 is coming! +# Invoice Ninja version 5 is coming! We will be using the lessons learnt in Invoice Ninja 4.0 to build a bigger better platform to work from. If you would like to contribute to the project we will gladly accept contributions for code, user guides, bug tracking and feedback! Please consider the following guidelines prior to submitting a pull request: diff --git a/VERSION.txt b/VERSION.txt index 553fe87a05ea..0147f9e738aa 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.0.4 \ No newline at end of file +5.0.7 \ No newline at end of file diff --git a/app/Models/Company.php b/app/Models/Company.php index 89f3afaacb97..e0c4c66ce8bb 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -96,6 +96,7 @@ class Company extends BaseModel 'first_month_of_year', 'slack_webhook_url', 'google_analytics_key', + 'client_can_register', ]; diff --git a/config/ninja.php b/config/ninja.php index 61cfd167f2cb..211f93fa663f 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -12,7 +12,7 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => env('APP_URL', ''), 'app_domain' => env('APP_DOMAIN', ''), - 'app_version' => '5.0.5', + 'app_version' => '5.0.7', 'minimum_client_version' => '5.0.11', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''), diff --git a/tests/Unit/SystemHealthTest.php b/tests/Unit/SystemHealthTest.php index 8624ca4e5bc3..b8698ed93265 100644 --- a/tests/Unit/SystemHealthTest.php +++ b/tests/Unit/SystemHealthTest.php @@ -26,7 +26,7 @@ class SystemHealthTest extends TestCase $this->assertTrue(count($results) > 1); - $this->assertTrue($results['system_health']); + $this->assertTrue((bool)$results['system_health']); $this->assertTrue($results['extensions'][0]['mysqli']); $this->assertTrue($results['extensions'][1]['gd']);