-
-
Notifications
You must be signed in to change notification settings - Fork 20
winter 1.2.8 support #57
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
449faa0
convert UserGroups controller
mjauvin 4bf5e1d
convert users controller
mjauvin d9d826c
fix docstring
mjauvin c86ff65
reuse markup from default views
mjauvin 3b1dc25
remove empty lines
mjauvin 7a82c8b
remove layout div
mjauvin 40b12cf
add configs back in case the plugin is extended
mjauvin 5415a6a
add winter 1.2.8 dependency
mjauvin 367b873
Try out new Setup Winter action
mjauvin e167ecd
use partial in form model fields definition
mjauvin da492c1
Merge branch 'main' into wip/winter-1.2.8-support
mjauvin 76a5fc7
Update controllers/users/_preview_status.php
LukeTowers dc144a9
Update controllers/users/_preview_toolbar.php
LukeTowers 1530bce
Remove unnecessary bodyClass property
LukeTowers bdf629f
Update composer.json
LukeTowers File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| <div class="scoreboard"> | ||
| <div data-control="toolbar"> | ||
| <div class="scoreboard-item title-value"> | ||
| <h4><?= e(trans('winter.user::lang.user.label')) ?></h4> | ||
| <?php if ($formModel->name): ?> | ||
| <p><?= e($formModel->name) ?></p> | ||
| <?php else: ?> | ||
| <p><em><?= e(trans('winter.user::lang.user.name_empty')) ?></em></p> | ||
| <?php endif ?> | ||
| <p class="description"> | ||
| <a href="mailto:<?= e($formModel->email) ?>"> | ||
| <?= e($formModel->email) ?> | ||
| </a> | ||
| </p> | ||
| </div> | ||
| <?php if ($formModel->created_at): ?> | ||
| <div class="scoreboard-item title-value"> | ||
| <h4><?= e(trans('winter.user::lang.user.joined')) ?></h4> | ||
| <p title="<?= $formModel->created_at->diffForHumans() ?>"> | ||
| <?= $formModel->created_at->toFormattedDateString() ?> | ||
| </p> | ||
| <p class="description"> | ||
| Status: | ||
| <?php if ($formModel->is_guest): ?> | ||
| <?= e(trans('winter.user::lang.user.status_guest')) ?> | ||
| <?php elseif ($formModel->is_activated): ?> | ||
| <?= e(trans('winter.user::lang.user.status_activated')) ?> | ||
| <?php else: ?> | ||
| <?= e(trans('winter.user::lang.user.status_registered')) ?> | ||
| <?php endif ?> | ||
| </p> | ||
| </div> | ||
| <?php endif ?> | ||
| <?php if ($formModel->last_seen): ?> | ||
| <div class="scoreboard-item title-value"> | ||
| <h4><?= e(trans('winter.user::lang.user.last_seen')) ?></h4> | ||
| <p><?= $formModel->last_seen->diffForHumans() ?></p> | ||
| <p class="description"> | ||
| <?= $formModel->isOnline() ? e(trans('winter.user::lang.user.is_online')) : e(trans('winter.user::lang.user.is_offline')) ?> | ||
| </p> | ||
| </div> | ||
| <?php endif ?> | ||
| </div> | ||
| </div> | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <?php if ($formModel->is_guest): ?> | ||
| <?= $this->makePartial('hint_guest') ?> | ||
| <?php elseif ($formModel->isBanned()): ?> | ||
| <?= $this->makePartial('hint_banned') ?> | ||
| <?php elseif ($formModel->trashed()): ?> | ||
| <?= $this->makePartial('hint_trashed') ?> | ||
| <?php elseif (!$formModel->is_activated): ?> | ||
| <?= $this->makePartial('hint_activate') ?> | ||
| <?php endif ?> |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.