Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 08:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for conflicts (#3743)

Browse Source 
* Add checks for duplicate contacts in invitations

* Fixes for self updater

* homebrew self updater

* remove self-updater
This commit is contained in:
David Bomba 2020-05-25 11:57:08 +10:00 committed by GitHub
parent 6cc47fbcad
commit 3e77612210
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Http/Controllers/SelfUpdateController.php
View File

@ -69,27 +69,8 @@ class SelfUpdateController extends BaseController
$repo = new GitRepository(base_path()); $repo = new GitRepository(base_path());
//info($repo->getCurrentBranchName());
$repo->pull('origin');
// info("is new version available = ". $updater->source()->isNewVersionAvailable()); $res = $repo->pull();
// // Get the new version available
// $versionAvailable = $updater->source()->getVersionAvailable();
// info($versionAvailable);
// // Create a release
// $release = $updater->source()->fetch($versionAvailable);
// info(print_r($release,1));
// // Run the update process
// $res = $updater->source()->update($release);
// info(print_r($res,1));
Artisan::call('ninja:post-update');
Artisan::call('ninja:post-update'); Artisan::call('ninja:post-update');

2
app/Http/Requests/PaymentTerm/EditPaymentTermRequest.php
View File

@ -14,7 +14,7 @@ namespace App\Http\Requests\PaymentTerm;
use App\Http\Requests\Request; use App\Http\Requests\Request;
use App\Models\PaymentTerm; use App\Models\PaymentTerm;
class EditPaymentRequest extends Request class EditPaymentTermRequest extends Request
{ {
/** /**
* Determine if the user is authorized to make this request. * Determine if the user is authorized to make this request.

1
composer.json
View File

@ -23,7 +23,6 @@
"asgrim/ofxparser": "^1.2", "asgrim/ofxparser": "^1.2",
"beganovich/omnipay-checkout": "dev-master", "beganovich/omnipay-checkout": "dev-master",
"cleverit/ubl_invoice": "^1.3", "cleverit/ubl_invoice": "^1.3",
"codedge/laravel-selfupdater": "~3.0",
"composer/composer": "^1.10", "composer/composer": "^1.10",
"czproject/git-php": "^3.17", "czproject/git-php": "^3.17",
"dacastro4/laravel-gmail": "^3.2", "dacastro4/laravel-gmail": "^3.2",

1
config/app.php
View File

@ -178,7 +178,6 @@ return [
App\Providers\EventServiceProvider::class, App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class, App\Providers\RouteServiceProvider::class,
App\Providers\ComposerServiceProvider::class, App\Providers\ComposerServiceProvider::class,
Codedge\Updater\UpdaterServiceProvider::class,
App\Providers\MultiDBProvider::class, App\Providers\MultiDBProvider::class,
App\Providers\ClientPortalServiceProvider::class, App\Providers\ClientPortalServiceProvider::class,
], ],

148
config/self-update.php
View File

@ -1,148 +0,0 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Default source repository type
|--------------------------------------------------------------------------
|
| The default source repository type you want to pull your updates from.
|
*/
'default' => env('SELF_UPDATER_SOURCE', 'github'),
/*
|--------------------------------------------------------------------------
| Version installed
|--------------------------------------------------------------------------
|
| Set this to the version of your software installed on your system.
|
*/
'version_installed' => env('SELF_UPDATER_VERSION_INSTALLED', ''),
/*
|--------------------------------------------------------------------------
| Repository types
|--------------------------------------------------------------------------
|
| A repository can be of different types, which can be specified here.
| Current options:
| - github
| - http
|
*/
'repository_types' => [
'github' => [
'type' => 'github',
'repository_vendor' => env('SELF_UPDATER_REPO_VENDOR', ''),
'repository_name' => env('SELF_UPDATER_REPO_NAME', ''),
'repository_url' => '',
'download_path' => env('SELF_UPDATER_DOWNLOAD_PATH', '/tmp'),
'private_access_token' => env('SELF_UPDATER_GITHUB_PRIVATE_ACCESS_TOKEN', ''),
'use_branch' => env('SELF_UPDATER_BRANCH_NAME', 'v2'),
],
'http' => [
'type' => 'http',
'repository_url' => env('SELF_UPDATER_REPO_URL', ''),
'pkg_filename_format' => env('SELF_UPDATER_PKG_FILENAME_FORMAT', 'v_VERSION_'),
'download_path' => env('SELF_UPDATER_DOWNLOAD_PATH', '/tmp'),
'private_access_token' => env('SELF_UPDATER_HTTP_PRIVATE_ACCESS_TOKEN', ''),
],
],
/*
|--------------------------------------------------------------------------
| Exclude folders from update
|--------------------------------------------------------------------------
|
| Specifiy folders which should not be updated and will be skipped during the
| update process.
|
| Here's already a list of good examples to skip. You may want to keep those.
|
*/
'exclude_folders' => [
'node_modules',
'bootstrap/cache',
'bower',
'storage/app',
'storage/framework',
'storage/logs',
'storage/self-update',
'vendor',
],
/*
|--------------------------------------------------------------------------
| Event Logging
|--------------------------------------------------------------------------
|
| Configure if fired events should be logged
|
*/
'log_events' => env('SELF_UPDATER_LOG_EVENTS', true),
/*
|--------------------------------------------------------------------------
| Mail To Settings
|--------------------------------------------------------------------------
|
| Configure if fired events should be logged
|
*/
'notifications' => [
'notifications' => [
\Codedge\Updater\Notifications\Notifications\UpdateSucceeded::class => ['mail'],
\Codedge\Updater\Notifications\Notifications\UpdateFailed::class => ['mail'],
\Codedge\Updater\Notifications\Notifications\UpdateAvailable::class => ['mail'],
],
/*
* Here you can specify the notifiable to which the notifications should be sent. The default
* notifiable will use the variables specified in this config file.
*/
'notifiable' => \Codedge\Updater\Notifications\Notifiable::class,
'mail' => [
'to' => [
'address' => env('SELF_UPDATER_MAILTO_ADDRESS', 'notifications@example.com'),
'name' => env('SELF_UPDATER_MAILTO_NAME', ''),
],
'from' => [
'address' => env('SELF_UPDATER_MAIL_FROM_ADDRESS', 'updater@example.com'),
'name' => env('SELF_UPDATER_MAIL_FROM_NAME', 'Update'),
],
],
],
/*
|---------------------------------------------------------------------------
| Register custom artisan commands
|---------------------------------------------------------------------------
*/
'artisan_commands' => [
'pre_update' => [
//'command:signature' => [
// 'class' => Command class
// 'params' => []
//]
],
'post_update' => [
'ninja:post-update' => [
'class' => \App\Console\Commands\PostUpdate::class,
'params' => []
],
],
],
];