Skip to content

Commit b1c1180

Browse files
Silic0nS0ldierSilic0nS0ldier
committed
Merge branch 'develop' of https://github.com/userfrosting/UserFrosting into develop
2 parents ae32e59 + 91dcf41 commit b1c1180

343 files changed

Lines changed: 696 additions & 354 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.php_cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
$header = 'UserFrosting (http://www.userfrosting.com)
44
55
@link https://github.com/userfrosting/UserFrosting
6-
@license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)';
6+
@copyright Copyright (c) 2019 Alexander Weissman
7+
@license https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)';
78

89
$rules = [
910
'@PSR2' => true,

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2018 by Alexander Weissman (https://alexanderweissman.com)
1+
Copyright (c) 2019 by Alexander Weissman (https://alexanderweissman.com)
22

33
UserFrosting is 100% free and open-source.
44

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ If you simply want to show that you like this project, or want to remember it fo
1515

1616
## By [Alex Weissman](https://alexanderweissman.com)
1717

18-
Copyright (c) 2018, free to use in personal and commercial software as per the [license](LICENSE.md).
18+
Copyright (c) 2019, free to use in personal and commercial software as per the [license](LICENSE.md).
1919

2020
UserFrosting is a secure, modern user management system written in PHP and built on top of the [Slim Microframework](http://www.slimframework.com/), [Twig](http://twig.sensiolabs.org/) templating engine, and [Eloquent](https://laravel.com/docs/5.4/eloquent#introduction) ORM.
2121

‎STYLE-GUIDE.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ In addition:
1616
* UserFrosting (http://www.userfrosting.com)
1717
*
1818
* @link https://github.com/userfrosting/UserFrosting
19-
* @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
19+
* @copyright Copyright (c) 2019 Alexander Weissman
20+
* @license https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
2021
*/
2122
```
2223

‎app/defines.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* UserFrosting (http://www.userfrosting.com)
44
*
55
* @link https://github.com/userfrosting/UserFrosting
6-
* @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
6+
* @copyright Copyright (c) 2019 Alexander Weissman
7+
* @license https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
78
*/
89

910
namespace UserFrosting;

‎app/sprinkles/account/config/debug.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* UserFrosting (http://www.userfrosting.com)
44
*
55
* @link https://github.com/userfrosting/UserFrosting
6-
* @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
6+
* @copyright Copyright (c) 2019 Alexander Weissman
7+
* @license https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
78
*/
89

910
/*

‎app/sprinkles/account/config/default.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* UserFrosting (http://www.userfrosting.com)
44
*
55
* @link https://github.com/userfrosting/UserFrosting
6-
* @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
6+
* @copyright Copyright (c) 2019 Alexander Weissman
7+
* @license https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
78
*/
89

910
/*

‎app/sprinkles/account/config/production.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* UserFrosting (http://www.userfrosting.com)
44
*
55
* @link https://github.com/userfrosting/UserFrosting
6-
* @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
6+
* @copyright Copyright (c) 2019 Alexander Weissman
7+
* @license https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
78
*/
89

910
/*

‎app/sprinkles/account/factories/Permissions.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
* UserFrosting (http://www.userfrosting.com)
44
*
55
* @link https://github.com/userfrosting/UserFrosting
6-
* @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
6+
* @copyright Copyright (c) 2019 Alexander Weissman
7+
* @license https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
78
*/
9+
810
use League\FactoryMuffin\Faker\Facade as Faker;
911

1012
/*

‎app/sprinkles/account/factories/Roles.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
* UserFrosting (http://www.userfrosting.com)
44
*
55
* @link https://github.com/userfrosting/UserFrosting
6-
* @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
6+
* @copyright Copyright (c) 2019 Alexander Weissman
7+
* @license https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
78
*/
9+
810
use League\FactoryMuffin\Faker\Facade as Faker;
911

1012
/*

0 commit comments

Comments
 (0)