Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3858 from turbo124/v2

Browse Source 
Fixes for build .env
This commit is contained in:
David Bomba 2020-06-28 20:46:48 +10:00 committed by GitHub
commit c890fd5e65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.env.example
View File

@ -6,16 +6,16 @@ APP_DEBUG=false
APP_URL=http://localhost APP_URL=http://localhost
DB_CONNECTION=db-ninja-01 DB_CONNECTION=db-ninja-01
MULTI_DB_ENABLED=true MULTI_DB_ENABLED=false
DB_HOST1=localhost DB_HOST1=localhost
DB_DATABASE1=db-ninja-01 DB_DATABASE1=ninja
DB_USERNAME1=ninja DB_USERNAME1=ninja
DB_PASSWORD1=ninja DB_PASSWORD1=ninja
DB_PORT1=3306 DB_PORT1=3306
DB_HOST2=localhost DB_HOST2=localhost
DB_DATABASE2=db-ninja-02 DB_DATABASE2=ninja2
DB_USERNAME2=ninja DB_USERNAME2=ninja
DB_PASSWORD2=ninja DB_PASSWORD2=ninja
DB_PORT2=3306 DB_PORT2=3306
@ -43,7 +43,7 @@ MAIL_FROM_ADDRESS='user@example.com'
MAIL_FROM_NAME='Self Hosted User' MAIL_FROM_NAME='Self Hosted User'
POSTMARK_API_TOKEN= POSTMARK_API_TOKEN=
REQUIRE_HTTPS=true REQUIRE_HTTPS=false
GOOGLE_MAPS_API_KEY= GOOGLE_MAPS_API_KEY=
API_SECRET=superdoopersecrethere API_SECRET=superdoopersecrethere

2
README.md
View File

@ -7,7 +7,7 @@
[![codecov](https://codecov.io/gh/invoiceninja/invoiceninja/branch/v2/graph/badge.svg)](https://codecov.io/gh/invoiceninja/invoiceninja) [![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) [![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: 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:

2
VERSION.txt
View File

@ -1 +1 @@
5.0.4 5.0.7

1
app/Models/Company.php
View File

@ -96,6 +96,7 @@ class Company extends BaseModel
'first_month_of_year', 'first_month_of_year',
'slack_webhook_url', 'slack_webhook_url',
'google_analytics_key', 'google_analytics_key',
'client_can_register',
]; ];

2
config/ninja.php
View File

@ -12,7 +12,7 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => env('APP_URL', ''), 'app_url' => env('APP_URL', ''),
'app_domain' => env('APP_DOMAIN', ''), 'app_domain' => env('APP_DOMAIN', ''),
'app_version' => '5.0.5', 'app_version' => '5.0.7',
'minimum_client_version' => '5.0.11', 'minimum_client_version' => '5.0.11',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', ''),

2
tests/Unit/SystemHealthTest.php
View File

@ -26,7 +26,7 @@ class SystemHealthTest extends TestCase
$this->assertTrue(count($results) > 1); $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'][0]['mysqli']);
$this->assertTrue($results['extensions'][1]['gd']); $this->assertTrue($results['extensions'][1]['gd']);