Skip to content
This repository was archived by the owner on Nov 23, 2020. It is now read-only.
Merged
Changes from 1 commit
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
ccbf8fb
Make it possible to switch guards
jorenvanhee Apr 28, 2017
a592571
Use correct guard in views
jorenvanhee May 2, 2017
2fd3f86
Fix order of use statements
jorenvanhee May 2, 2017
08b9390
Make the admin middleware use the backpack guard
jorenvanhee May 2, 2017
feac647
Merge branch 'different-user-model-issue-fix' of git://github.com/jor…
tabacitu Jul 6, 2017
87839c9
fixed lloyd's review objections in implementing custom auth guard
tabacitu Jul 6, 2017
0f992ac
Auth\Login: allow username customization
kichetof Feb 13, 2018
7c3593f
alert messages can now have html
tabacitu Feb 28, 2018
6fe7690
added sidebar_content file; publish minimum amount of files
tabacitu Feb 28, 2018
86bff8c
move dashboard sidebar item to sidebar_contents file
tabacitu Feb 28, 2018
d7518ec
added command that adds code to sidebar_content blade file
tabacitu Feb 28, 2018
df9680e
polished addSidebarContent definition and description
tabacitu Feb 28, 2018
aa4356a
Apply fixes from StyleCI
tabacitu Feb 28, 2018
62a20a3
changelog
tabacitu Feb 28, 2018
16b76a2
Merge branch 'publish-minimum-amount-of-files' of https://github.com/…
tabacitu Feb 28, 2018
b723665
fixes #253 - added command to add code to custom route file
tabacitu Feb 28, 2018
e0fdeca
Apply fixes from StyleCI
tabacitu Feb 28, 2018
afe6de3
fixed custom routes file namespace
tabacitu Feb 28, 2018
cf5d435
Merge branch 'custom-routes-file' of https://github.com/Laravel-Backp…
tabacitu Feb 28, 2018
2813799
merged master and fixed conflicts:
tabacitu Mar 5, 2018
37b49e1
cleaner config helper usage for guards and passwords
tabacitu Mar 5, 2018
107c1f3
cleaned up admin middleware
tabacitu Mar 5, 2018
a5a8015
fixed logout logging out all sessions; applied custom guard to MyAcco…
tabacitu Mar 5, 2018
2e1eea2
added backpack_auth helpers and removed view composers
tabacitu Mar 5, 2018
83758c6
Apply fixes from StyleCI
tabacitu Mar 5, 2018
edb3e52
cleanup
tabacitu Mar 5, 2018
5cd6190
comment method
tabacitu Mar 5, 2018
353d230
added BackpackUser model and made it the default user_model_fqn
tabacitu Mar 5, 2018
5b50727
Apply fixes from StyleCI
tabacitu Mar 5, 2018
42d556c
Merge branch 'master' of git://github.com/kichetof/Base into kichetof…
tabacitu Mar 6, 2018
9a28e97
merged PR #246, renamed variables and made necessary login view modif…
tabacitu Mar 6, 2018
ed41e9f
added authentication_column_name config variable
tabacitu Mar 6, 2018
b53c0a0
authentication_column_name should default to language email
tabacitu Mar 6, 2018
b9cf5c7
Apply fixes from StyleCI
tabacitu Mar 6, 2018
35778df
authentication_column should default to email
tabacitu Mar 6, 2018
13a9de5
Merge branch 'allow-login-with-username' of https://github.com/Larave…
tabacitu Mar 6, 2018
880e770
Apply fixes from StyleCI
tabacitu Mar 6, 2018
f05430b
ability to customize admin middleware; fixes #67
tabacitu Mar 6, 2018
4d4bd8c
Apply fixes from StyleCI
tabacitu Mar 6, 2018
fc3a907
renamed Admin middleware class to CheckIfAdmin
tabacitu Mar 6, 2018
9d1649c
Merge branch 'custom-admin-middleware' of https://github.com/Laravel-…
tabacitu Mar 6, 2018
cb3b056
changed middleware to a middleware group, so that developers can incl…
tabacitu Mar 6, 2018
e485098
Apply fixes from StyleCI
tabacitu Mar 6, 2018
06bf447
cleaned up BaseServiceProvider
tabacitu Mar 6, 2018
52b895c
Merge branch 'custom-admin-middleware' of https://github.com/Laravel-…
tabacitu Mar 6, 2018
459d575
Apply fixes from StyleCI
tabacitu Mar 6, 2018
4ca7a19
register with username instead of email
tabacitu Mar 7, 2018
3ca67c4
fixed registration, my account and password reset when using username…
tabacitu Mar 7, 2018
33a9053
Merge branch 'allow-login-with-username' of https://github.com/Larave…
tabacitu Mar 7, 2018
1f82ace
Apply fixes from StyleCI
tabacitu Mar 7, 2018
d6ebf8d
improved backpack_avatar_url helper
tabacitu Mar 7, 2018
769abae
merged
tabacitu Mar 7, 2018
caa2cef
fixed review issues
tabacitu Mar 8, 2018
b153b4e
translated reset password email
tabacitu Mar 8, 2018
bb99618
Merge branch 'jorenvanhee-different-user-model-issue-fix' of https://…
tabacitu Mar 8, 2018
e6ac6e8
Apply fixes from StyleCI
tabacitu Mar 8, 2018
1952f3e
Merge branch 'jorenvanhee-different-user-model-issue-fix' into upgrade
tabacitu Mar 8, 2018
49e63e3
Merge branch 'upgrade' of https://github.com/Laravel-Backpack/Base in…
tabacitu Mar 8, 2018
6651a22
typo
tabacitu Mar 8, 2018
42a8c0a
Merge branch 'publish-minimum-amount-of-files' into upgrade
tabacitu Mar 8, 2018
8822a6a
Merge remote-tracking branch 'origin/custom-routes-file' into upgrade
tabacitu Mar 8, 2018
5c723cb
using helper to get backpack middleware in custom routes file
tabacitu Mar 8, 2018
e58ac9f
Merge branch 'html-alerts' into upgrade
tabacitu Mar 8, 2018
8fe173b
added license checks
tabacitu Mar 8, 2018
a959ebb
Apply fixes from StyleCI
tabacitu Mar 8, 2018
833091c
added stacks after sections in layout
tabacitu Mar 8, 2018
7da688d
cleanup
tabacitu Mar 8, 2018
f110170
changelog
tabacitu Mar 8, 2018
069aa50
Merge branch 'feature-stacks' into upgrade
tabacitu Mar 8, 2018
71a7ee7
changelog
tabacitu Mar 8, 2018
22b4427
Merge branch 'allow-login-with-username' into upgrade
tabacitu Mar 8, 2018
97bd1bf
cleanup
tabacitu Mar 8, 2018
6a235cb
Merge branch 'upgrade' of https://github.com/Laravel-Backpack/Base in…
tabacitu Mar 8, 2018
095418e
updated js dependencies to match new adminlte paths
tabacitu Mar 8, 2018
e69a3d5
license check takes into acount config file variable
tabacitu Mar 9, 2018
4825256
made root disk name configurable
tabacitu Mar 5, 2018
ce3c074
Apply fixes from StyleCI
tabacitu Mar 13, 2018
03241e9
Merge branch 'master' into upgrade
tabacitu Mar 22, 2018
5d68bfa
composer require updated adminlte
tabacitu Mar 22, 2018
5606018
Merge branch 'upgrade' into adminlte-update
tabacitu Mar 8, 2018
e6e8ece
Merge branch 'custom-admin-middleware' of https://github.com/Laravel-…
tabacitu Mar 22, 2018
2cbce1f
Update custom.php
tabacitu Mar 22, 2018
1a04f2c
Merge pull request #264 from Laravel-Backpack/adminlte-update
tabacitu Mar 22, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/BaseServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ public function register()
if (class_exists('Backpack\Generators\GeneratorsServiceProvider')) {
$this->app->register('Backpack\Generators\GeneratorsServiceProvider');
}
} else {
$this->checkLicenseCodeExists();
}

// register the artisan commands
Expand Down Expand Up @@ -206,4 +208,17 @@ public function publishFiles()
$this->publishes($gravatar_assets, 'gravatar');
$this->publishes($minimum, 'minimum');
}

/**
* Check to to see if a license code exists.
* If it does not, throw a notification bubble.
*
* @return void
*/
private function checkLicenseCodeExists()
{
if (! env('BACKPACK_LICENSE')) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't that be in a config?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. Totally! Done, thank you!

\Alert::add('warning', "<strong>You're using unlicensed software.</strong> Please ask your web developer to <a target='_blank' href='http://backpackforlaravel.com'>purchase a license code</a> to hide this message.");
}
}
}