Skip to content

Commit b8faa3e

Browse files
amosfolzamosfolz
committed
Merge remote-tracking branch 'upstream/develop' into user-set-password
2 parents acf4d60 + 827ab6b commit b8faa3e

58 files changed

Lines changed: 1632 additions & 1105 deletions

Some content is hidden

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

‎CHANGELOG.md‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1010
### Changed Requirements
1111
- Changed minimum PHP Version to 7.1
1212

13-
### Changed Dependencies
13+
### Changed Composer Dependencies
1414
- Updated Laravel Illuminate packages to 5.8
1515
- Updated Twig to 2.11
1616
- Updated PHPUnit to 7.5
@@ -21,21 +21,29 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
2121
- Updated symfony/console to 4.3
2222
- Updated vlucas/phpdotenv to 3.4.0
2323

24+
### Changed Frontend Dependencies
25+
- Updated handlebar from 3.0.x to 4.1.2
26+
- Updated AdminLTE theme to 2.4.15 ([#994; #1014; #1015])
27+
- Updated Font Awesome to 5.9 ([#957]; [#870])
28+
2429
### Added
2530
- Separated `BakeCommand` class into multiple methods to make it easier for sprinkle to add custom command to the `bake` command.
2631
- Allow null group assignment for users ([#867]; [#964])
2732

2833
### Fix
2934
- `bake` command return error if account sprinkle is not included ([#944])
3035
- Email is case-sensitive ([#881]; [#1012])
36+
- Update vulnerable handlebars@^3.0.3 to ^4.0.12 ([#921])
37+
- Moved `handlebars-helpers.js` from `core` to `admin` sprinkle ([#897])
38+
- Remove `Package guzzle/guzzle is abandoned, you should avoid using it. Use guzzlehttp/guzzle instead` message ([#1016])
3139

3240
### Changed
3341
- Account sprinkle now extend the Core `BakeCommand` class to add the `create-admin` to the general bake command. Any sprinkle already extending the Core `BakeCommand` might need adjustments.
3442
- Updated custom Eloquent relations (`belongsToManyThrough`, `morphToManyUnique`, `belongsToManyUnique`, `morphToManyUnique`, etc.) to support Laravel 5.8. See [The `belongsToMany` Method](https://laravel.com/docs/5.5/upgrade#upgrade-5.5.0).
35-
- Update to AdminLTE 2.3.11 ([#1014])
3643

3744
### Removed
3845
- Removed `belongsToManyConstrained` (deprecated in 4.1.6)
46+
- Remove `league/flysystem-aws-s3-v3` and `league/flysystem-rackspace` as core dependencies ([#1018])
3947

4048
## [v4.2.3]
4149

@@ -788,16 +796,20 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
788796
[#854]: https://github.com/userfrosting/UserFrosting/issues/854
789797
[#867]: https://github.com/userfrosting/UserFrosting/issues/867
790798
[#869]: https://github.com/userfrosting/UserFrosting/issues/869
799+
[#870]: https://github.com/userfrosting/UserFrosting/issues/870
791800
[#872]: https://github.com/userfrosting/UserFrosting/issues/872
792801
[#881]: https://github.com/userfrosting/UserFrosting/issues/881
793802
[#888]: https://github.com/userfrosting/UserFrosting/issues/888
794803
[#893]: https://github.com/userfrosting/UserFrosting/issues/893
804+
[#897]: https://github.com/userfrosting/UserFrosting/issues/897
795805
[#919]: https://github.com/userfrosting/UserFrosting/issues/919
806+
[#921]: https://github.com/userfrosting/UserFrosting/issues/921
796807
[#940]: https://github.com/userfrosting/UserFrosting/issues/940
797808
[#950]: https://github.com/userfrosting/UserFrosting/issues/950
798809
[#951]: https://github.com/userfrosting/UserFrosting/issues/951
799810
[#952]: https://github.com/userfrosting/UserFrosting/issues/952
800811
[#953]: https://github.com/userfrosting/UserFrosting/issues/953
812+
[#957]: https://github.com/userfrosting/UserFrosting/issues/957
801813
[#958]: https://github.com/userfrosting/UserFrosting/issues/958
802814
[#963]: https://github.com/userfrosting/UserFrosting/issues/963
803815
[#964]: https://github.com/userfrosting/UserFrosting/issues/964
@@ -811,9 +823,13 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
811823
[#990]: https://github.com/userfrosting/UserFrosting/issues/990
812824
[#991]: https://github.com/userfrosting/UserFrosting/issues/991
813825
[#993]: https://github.com/userfrosting/UserFrosting/issues/993
826+
[#994]: https://github.com/userfrosting/UserFrosting/issues/994
814827
[#998]: https://github.com/userfrosting/UserFrosting/issues/998
815828
[#1012]: https://github.com/userfrosting/UserFrosting/issues/1012
816829
[#1014]: https://github.com/userfrosting/UserFrosting/issues/1014
830+
[#1015]: https://github.com/userfrosting/UserFrosting/issues/1015
831+
[#1016]: https://github.com/userfrosting/UserFrosting/issues/1016
832+
[#1018]: https://github.com/userfrosting/UserFrosting/issues/1018
817833

818834
[v4.2.0]: https://github.com/userfrosting/UserFrosting/compare/v4.1.22...v4.2.0
819835
[v4.2.1]: https://github.com/userfrosting/UserFrosting/compare/v4.2.0...v.4.2.1

‎app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function up()
3636
$table->string('slug');
3737
$table->string('name');
3838
$table->text('description')->nullable();
39-
$table->string('icon', 100)->nullable(false)->default('fa fa-user')->comment('The icon representing users in this group.');
39+
$table->string('icon', 100)->nullable(false)->default('fas fa-user')->comment('The icon representing users in this group.');
4040
$table->timestamps();
4141

4242
$table->engine = 'InnoDB';

‎app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?php
2+
3+
/*
4+
* UserFrosting (http://www.userfrosting.com)
5+
*
6+
* @link https://github.com/userfrosting/UserFrosting
7+
* @copyright Copyright (c) 2019 Alexander Weissman
8+
* @license https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
9+
*/
10+
11+
namespace UserFrosting\Sprinkle\Account\Database\Migrations\v430;
12+
13+
use Illuminate\Database\Schema\Blueprint;
14+
use UserFrosting\Sprinkle\Core\Database\Migration;
15+
16+
/**
17+
* Groups table migration
18+
* Changes the `icon` column property of `default` to NULL to align with new Font Awesome 5 tag convention.
19+
* Version 4.3.0.
20+
*
21+
* See https://laravel.com/docs/5.4/migrations#tables
22+
*
23+
* @author Alex Weissman (https://alexanderweissman.com)
24+
*/
25+
class UpdateGroupsTable extends Migration
26+
{
27+
/**
28+
* {@inheritdoc}
29+
*/
30+
public static $dependencies = [
31+
'\UserFrosting\Sprinkle\Account\Database\Migrations\v400\GroupsTable',
32+
];
33+
34+
/**
35+
* {@inheritdoc}
36+
*/
37+
public function up()
38+
{
39+
if ($this->schema->hasTable('groups')) {
40+
$this->schema->table('groups', function (Blueprint $table) {
41+
$table->string('icon', 100)->nullable()->change();
42+
});
43+
}
44+
}
45+
46+
/**
47+
* {@inheritdoc}
48+
*/
49+
public function down()
50+
{
51+
$this->schema->table('groups', function (Blueprint $table) {
52+
$table->string('icon', 100)->default('fa fa-user')->nullable(false)->change();
53+
});
54+
}
55+
}

‎app/sprinkles/account/templates/forms/settings-account.html.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<form id="account-settings" role="form" action="{{site.uri.public}}/account/settings" method="post">
22
<div class="box-header">
3-
<h3 class="box-title"><i class="fa fa-gear fa-fw"></i> {{translate("ACCOUNT.SETTINGS")}}</h3>
3+
<h3 class="box-title"><i class="fas fa-cog fa-fw"></i> {{translate("ACCOUNT.SETTINGS")}}</h3>
44
</div>
55
<div class="box-body">
66
{% include "forms/csrf.html.twig" %}
@@ -34,4 +34,4 @@
3434
<button type="reset" class="btn btn-default">{{translate('RESET')}}</button>
3535
<button type="submit" class="btn btn-primary js-submit">{{translate('SAVE')}}</button>
3636
</div>
37-
</form>
37+
</form>

‎app/sprinkles/account/templates/forms/settings-profile.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<form id="profile-settings" role="form" action="{{site.uri.public}}/account/settings/profile" method="post">
22
<div class="box-header">
3-
<h3 class="box-title"><i class="fa fa-user fa-fw"></i> {{translate("PROFILE.SETTINGS")}}</h3>
3+
<h3 class="box-title"><i class="fas fa-user fa-fw"></i> {{translate("PROFILE.SETTINGS")}}</h3>
44
</div>
55
<div class="box-body">
66
{% include "forms/csrf.html.twig" %}

‎app/sprinkles/account/templates/navigation/user-card.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
55
<img src="{{ current_user.avatar }}" class="user-image" alt="User Image">
66
<span class="hidden-xs">{{current_user.first_name}} {{current_user.last_name}}</span>
7-
<i class="fa fa-chevron-down"></i>
7+
<i class="fas fa-chevron-down"></i>
88
</a>
99
{% endblock %}
1010
<ul class="dropdown-menu">

‎app/sprinkles/account/templates/pages/error/compromised.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% block page_description %}{{ translate('ACCOUNT.SESSION_COMPROMISED.TITLE') }}{% endblock %}
66

77
{% block heading %}
8-
<i class="fa fa-warning text-yellow"></i> {{ translate('ACCOUNT.SESSION_COMPROMISED.TEXT', {
8+
<i class="fas fa-warning text-yellow"></i> {{ translate('ACCOUNT.SESSION_COMPROMISED.TEXT', {
99
'url' : site.uri.public ~ '/account/sign-in'
1010
}) | raw }}
1111
{% endblock %}

‎app/sprinkles/admin/asset-bundles.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,4 @@
167167
}
168168
}
169169
}
170-
}
170+
}

app/sprinkles/core/assets/userfrosting/js/handlebars-helpers.js renamed to app/sprinkles/admin/assets/userfrosting/js/handlebars-helpers.js

File renamed without changes.

‎app/sprinkles/admin/src/Controller/GroupController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ public function getModalCreate(Request $request, Response $response, $args)
396396
// Create a dummy group to prepopulate fields
397397
$group = $classMapper->createInstance('group', []);
398398

399-
$group->icon = 'fa fa-user';
399+
$group->icon = 'fas fa-user';
400400

401401
$fieldNames = ['name', 'slug', 'icon', 'description'];
402402
$fields = [

0 commit comments

Comments
 (0)